xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit ee9c7f3bfc45563e4caebcb7995e75bf39a8e0f3
parent f15a3ae2633a9f3c76be7ce76b2ab85e2229e502
Author: rsc <rsc>
Date:   Mon, 17 Jul 2006 01:36:39 +0000

goodbye PushRegs

Diffstat:
Mproc.c | 2+-
Msyscall.c | 4++--
Mtrap.c | 2+-
Mx86.h | 7++-----
4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/proc.c b/proc.c @@ -104,7 +104,7 @@ copyproc(struct proc* p) *np->tf = *p->tf; // Clear %eax so that fork system call returns 0 in child. - np->tf->regs.eax = 0; + np->tf->eax = 0; // Set up new jmpbuf to start executing at forkret (see below). memset(&np->jmpbuf, 0, sizeof np->jmpbuf); diff --git a/syscall.c b/syscall.c @@ -263,7 +263,7 @@ void syscall(void) { struct proc *cp = curproc[cpu()]; - int num = cp->tf->regs.eax; + int num = cp->tf->eax; int ret = -1; //cprintf("%x sys %d\n", cp, num); @@ -309,5 +309,5 @@ syscall(void) // XXX fault break; } - cp->tf->regs.eax = ret; + cp->tf->eax = ret; } diff --git a/trap.c b/trap.c @@ -37,7 +37,7 @@ trap(struct Trapframe *tf) if(v == T_SYSCALL){ struct proc *cp = curproc[cpu()]; - int num = cp->tf->regs.eax; + int num = cp->tf->eax; if(cp == 0) panic("syscall with no proc"); if(cp->killed) diff --git a/x86.h b/x86.h @@ -339,7 +339,7 @@ sti(void) __asm__ volatile("sti"); } -struct PushRegs { +struct Trapframe { /* registers as pushed by pusha */ uint32_t edi; uint32_t esi; @@ -349,10 +349,7 @@ struct PushRegs { uint32_t edx; uint32_t ecx; uint32_t eax; -}; - -struct Trapframe { - struct PushRegs regs; + /* rest of trap frame */ uint16_t es; uint16_t padding1; uint16_t ds;