amd64 uthread.S.

214c3dcc · Silas Boyd-Wickizer · 1de04831 · 214c3dcc · 214c3dcc
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ OBJS = \
 	trap.o \
 	trapasm.o \
-ULIB = ulib.o usys.o printf.o umalloc.o
+ULIB = ulib.o usys.o printf.o umalloc.o uthread.o
 UPROGS= \
 	_cat \

--- a/uthread.S
+++ b/uthread.S
-#include "syscall.h"
-#include "traps.h"
 .globl forkt
 forkt:
-  movl 4(%esp), %ecx	## new stack ptr
+        pushq %rdi      ## new stack ptr
-  movl 8(%esp), %edx	## function ptr
+        pushq %rsi      ## function ptr
+        movq $1, %rdi   ## flag for sys_fork
-  pushl $1		## flag for sys_fork
+        callq fork
-  pushl $0		## return address (dummy)
+        popq %rsi
-  movl $SYS_fork, %eax
+        popq %rdi
-  int $T_SYSCALL
+        cmpl $0, %eax
-  addl $8, %esp
+        jne 1f
+        movq %rdi, %rsp
-  cmpl $0, %eax
+        jmp *%rsi
-  jne 1f
-  movl %ecx, %esp
-  jmp *%edx
 1:
-  ret
+        ret