Skip to content

X
xv6-public
提交 ef62aebd 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

trapasm.S fixes.

上级 c883a275
显示空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 6 行删除
Makefile
浏览文件 @ ef62aebd
...@@ -76,7 +76,7 @@ clean: ...@@ -76,7 +76,7 @@ clean:
QEMUOPTS = -smp $(CPUS) -m 512 -nographic QEMUOPTS = -smp $(CPUS) -m 512 -nographic
qemu: kernel qemu: kernel
$(QEMU) $(QEMUOPTS) -kernel kernel #-S -s $(QEMU) $(QEMUOPTS) -kernel kernel
ud0: kernel ud0: kernel
rsync -avP kernel amsterdam.csail.mit.edu:/tftpboot/ud0/kernel.xv6 rsync -avP kernel amsterdam.csail.mit.edu:/tftpboot/ud0/kernel.xv6
proc.c
浏览文件 @ ef62aebd
...@@ -179,9 +179,12 @@ inituser(void) ...@@ -179,9 +179,12 @@ inituser(void)
if(copyout(p->vmap, 0, _binary_initcode_start, (uptr)_binary_initcode_size) < 0) if(copyout(p->vmap, 0, _binary_initcode_start, (uptr)_binary_initcode_size) < 0)
panic("userinit: copyout"); panic("userinit: copyout");
memset(p->tf, 0, sizeof(*p->tf)); memset(p->tf, 0, sizeof(*p->tf));
p->tf->cs = UCSEG | 0x3;
p->tf->ds = UDSEG | 0x3;
p->tf->ss = p->tf->ds;
p->tf->rflags = FL_IF; p->tf->rflags = FL_IF;
p->tf->rsp = PGSIZE; p->tf->rsp = PGSIZE;
p->tf->rip = 0; // beginning of initcode.S p->tf->rip = 0x0; // beginning of initcode.S
safestrcpy(p->name, "initcode", sizeof(p->name)); safestrcpy(p->name, "initcode", sizeof(p->name));
p->cwd = 0; // forkret will fix in the process's context p->cwd = 0; // forkret will fix in the process's context
......
trapasm.S
浏览文件 @ ef62aebd
...@@ -34,6 +34,8 @@ trapcommon: ...@@ -34,6 +34,8 @@ trapcommon:
pushq %r13 pushq %r13
pushq %r14 pushq %r14
pushq %r15 pushq %r15
movw %ds, %ax
pushw %ax
# Set up data and per-cpu segments. # Set up data and per-cpu segments.
movw $KDSEG, %ax movw $KDSEG, %ax
...@@ -47,10 +49,9 @@ trapcommon: ...@@ -47,10 +49,9 @@ trapcommon:
.globl trapret .globl trapret
.align 8 .align 8
trapret: trapret:
movw $UDSEG, %ax popw %ax
movw %ax, %ds movw %ax, %ds
movw %ax, %es movw %ax, %es
movw %ax, %ss
// XXX(sbw) we should do something with fs, gs, gs.base // XXX(sbw) we should do something with fs, gs, gs.base
popq %r15 popq %r15
...@@ -68,8 +69,8 @@ trapret: ...@@ -68,8 +69,8 @@ trapret:
popq %rdx popq %rdx
popq %rsi popq %rsi
popq %rdi popq %rdi
addq $0x12, %rsp // trapno, err addq $0x16, %rsp // trapno, err
iret iretq
.data .data
.align 8 .align 8
......
x86.h
浏览文件 @ ef62aebd
...@@ -127,9 +127,19 @@ static inline void lcr3(u64 val) ...@@ -127,9 +127,19 @@ static inline void lcr3(u64 val)
__asm volatile("movq %0,%%cr3" : : "r" (val)); __asm volatile("movq %0,%%cr3" : : "r" (val));
} }
static inline uptr
rcr2(void)
{
uptr val;
__asm volatile("movq %%cr2,%0" : "=r" (val));
return val;
}
// Layout of the trap frame built on the stack by the // Layout of the trap frame built on the stack by the
// hardware and by trapasm.S, and passed to trap(). // hardware and by trapasm.S, and passed to trap().
struct trapframe { struct trapframe {
u16 ds;
// amd64 ABI callee saved registers // amd64 ABI callee saved registers
u64 r15; u64 r15;
u64 r14; u64 r14;
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论