Skip to content

X
xv6-public
提交 7bb73cdb 创建 作者: rsc's avatar rsc
浏览文件
操作

nits

上级 8e670053
隐藏空白字符变更
内嵌 并排
正在显示 包含 5 行增加 和 3 行删除
bootother.S
浏览文件 @ 7bb73cdb
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
# #
# This code is identical to bootasm.S except: # This code is identical to bootasm.S except:
# - it does not need to enable A20 # - it does not need to enable A20
# - it uses 0(start-4) for the %esp # - it uses the address at start-4 for the %esp
# - it jumps to 0(start-8) instead of calling cmain # - it jumps to the address at start-8 instead of calling cmain
.set PROT_MODE_CSEG, 0x8 # kernel code segment selector .set PROT_MODE_CSEG, 0x8 # kernel code segment selector
.set PROT_MODE_DSEG, 0x10 # kernel data segment selector .set PROT_MODE_DSEG, 0x10 # kernel data segment selector
......
defs.h
浏览文件 @ 7bb73cdb
...@@ -23,7 +23,7 @@ void kbd_intr(void); ...@@ -23,7 +23,7 @@ void kbd_intr(void);
void panic(char*) __attribute__((noreturn)); void panic(char*) __attribute__((noreturn));
// exec.c // exec.c
int exec(char*, char**); int exec(char*, char**);
// file.c // file.c
struct file* filealloc(void); struct file* filealloc(void);
......
x86.h
浏览文件 @ 7bb73cdb
...@@ -5,6 +5,7 @@ static inline uchar ...@@ -5,6 +5,7 @@ static inline uchar
inb(ushort port) inb(ushort port)
{ {
uchar data; uchar data;
asm volatile("in %1,%0" : "=a" (data) : "d" (port)); asm volatile("in %1,%0" : "=a" (data) : "d" (port));
return data; return data;
} }
...@@ -91,6 +92,7 @@ static inline void ...@@ -91,6 +92,7 @@ static inline void
cpuid(uint info, uint *eaxp, uint *ebxp, uint *ecxp, uint *edxp) cpuid(uint info, uint *eaxp, uint *ebxp, uint *ecxp, uint *edxp)
{ {
uint eax, ebx, ecx, edx; uint eax, ebx, ecx, edx;
asm volatile("cpuid" : asm volatile("cpuid" :
"=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) :
"a" (info)); "a" (info));
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论