summaryrefslogtreecommitdiff
path: root/trapasm.S
diff options
context:
space:
mode:
authorrsc <rsc>2006-07-16 01:47:40 +0000
committerrsc <rsc>2006-07-16 01:47:40 +0000
commit856e1fc1ad22a24bd71c706bc06ba868e044ddc8 (patch)
tree203bf24aa99e2f50d4bca375231d3fb46332ba29 /trapasm.S
parent65bd8e139a8368e987455a10ec59dd7b079b3af1 (diff)
downloadxv6-labs-856e1fc1ad22a24bd71c706bc06ba868e044ddc8.tar.gz
xv6-labs-856e1fc1ad22a24bd71c706bc06ba868e044ddc8.tar.bz2
xv6-labs-856e1fc1ad22a24bd71c706bc06ba868e044ddc8.zip
Attempt to clean up newproc somewhat.
Also remove all calls to memcpy in favor of memmove, which has defined semantics when the ranges overlap. The fact that memcpy was working in console.c to scroll the screen is not guaranteed by all implementations.
Diffstat (limited to 'trapasm.S')
-rw-r--r--trapasm.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/trapasm.S b/trapasm.S
index e0e27be..3e0f375 100644
--- a/trapasm.S
+++ b/trapasm.S
@@ -30,9 +30,9 @@ trapret:
addl $0x8, %esp /* trapno and errcode */
iret
-.globl forkret
-forkret:
- call forkret1
+.globl forkret1
+forkret1:
+ movl 4(%esp), %esp
jmp trapret
.globl acpu