diff options
| author | Jake Burkholder <jake@FreeBSD.org> | 2000-12-08 21:31:52 +0000 |
|---|---|---|
| committer | Jake Burkholder <jake@FreeBSD.org> | 2000-12-08 21:31:52 +0000 |
| commit | 1b00f9203929e5fa22f24250423cffe2587c5f8f (patch) | |
| tree | daabc40024cc0109bf5d51c305a2fe3c48b26893 /sys/amd64 | |
| parent | 894fbb6682845ffe32ceaf991f3d1a6be3bc844c (diff) | |
| download | src-1b00f9203929e5fa22f24250423cffe2587c5f8f.tar.gz src-1b00f9203929e5fa22f24250423cffe2587c5f8f.zip | |
Revert the previous change I made to cpu_switch. It doesn't help as
much as I thought it would and according to bde was a pessimization.
Notes
Notes:
svn path=/head/; revision=69779
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/cpu_switch.S | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/swtch.s | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index f19a7fb4a69e..2d315fc5f787 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -103,7 +103,8 @@ ENTRY(cpu_switch) movl P_ADDR(%ecx),%edx - popl PCB_EIP(%edx) /* Hardware registers */ + movl (%esp),%eax /* Hardware registers */ + movl %eax,PCB_EIP(%edx) movl %ebx,PCB_EBX(%edx) movl %esp,PCB_ESP(%edx) movl %ebp,PCB_EBP(%edx) @@ -253,7 +254,8 @@ sw1b: movl PCB_EBP(%edx),%ebp movl PCB_ESI(%edx),%esi movl PCB_EDI(%edx),%edi - pushl PCB_EIP(%edx) + movl PCB_EIP(%edx),%eax + movl %eax,(%esp) #ifdef SMP #ifdef GRAB_LOPRIO /* hold LOPRIO for INTs */ diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s index f19a7fb4a69e..2d315fc5f787 100644 --- a/sys/amd64/amd64/swtch.s +++ b/sys/amd64/amd64/swtch.s @@ -103,7 +103,8 @@ ENTRY(cpu_switch) movl P_ADDR(%ecx),%edx - popl PCB_EIP(%edx) /* Hardware registers */ + movl (%esp),%eax /* Hardware registers */ + movl %eax,PCB_EIP(%edx) movl %ebx,PCB_EBX(%edx) movl %esp,PCB_ESP(%edx) movl %ebp,PCB_EBP(%edx) @@ -253,7 +254,8 @@ sw1b: movl PCB_EBP(%edx),%ebp movl PCB_ESI(%edx),%esi movl PCB_EDI(%edx),%edi - pushl PCB_EIP(%edx) + movl PCB_EIP(%edx),%eax + movl %eax,(%esp) #ifdef SMP #ifdef GRAB_LOPRIO /* hold LOPRIO for INTs */ diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index befe6fee5199..294a5838def0 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -168,7 +168,7 @@ cpu_fork(p1, p2, flags) pcb2->pcb_edi = 0; pcb2->pcb_esi = (int)fork_return; /* fork_trampoline argument */ pcb2->pcb_ebp = 0; - pcb2->pcb_esp = (int)p2->p_md.md_regs; + pcb2->pcb_esp = (int)p2->p_md.md_regs - sizeof(void *); pcb2->pcb_ebx = (int)p2; /* fork_trampoline argument */ pcb2->pcb_eip = (int)fork_trampoline; /* |