summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2009-05-31 02:14:04 +0000
committerrsc <rsc>2009-05-31 02:14:04 +0000
commit949e55902bb0c976f74b5217b82deac65ff8d781 (patch)
treeb4c43a3cc3fd7f58f578055bae1b21787c850921
parent90bab90832d1f3863d8345bcc2a2e5f59c270af8 (diff)
downloadxv6-labs-949e55902bb0c976f74b5217b82deac65ff8d781.tar.gz
xv6-labs-949e55902bb0c976f74b5217b82deac65ff8d781.tar.bz2
xv6-labs-949e55902bb0c976f74b5217b82deac65ff8d781.zip
usys.S: put before init.c, STUB -> SYSCALL
-rw-r--r--runoff.list2
-rw-r--r--usys.S42
2 files changed, 22 insertions, 22 deletions
diff --git a/runoff.list b/runoff.list
index 3f7c5f2..5a8a2f9 100644
--- a/runoff.list
+++ b/runoff.list
@@ -66,8 +66,8 @@ timer.c
# user-level
initcode.S
-init.c
usys.S
+init.c
sh.c
diff --git a/usys.S b/usys.S
index 380cb91..2291b02 100644
--- a/usys.S
+++ b/usys.S
@@ -1,30 +1,30 @@
#include "syscall.h"
#include "traps.h"
-#define STUB(name) \
+#define SYSCALL(name) \
.globl name; \
name: \
movl $SYS_ ## name, %eax; \
int $T_SYSCALL; \
ret
-STUB(fork)
-STUB(exit)
-STUB(wait)
-STUB(pipe)
-STUB(read)
-STUB(write)
-STUB(close)
-STUB(kill)
-STUB(exec)
-STUB(open)
-STUB(mknod)
-STUB(unlink)
-STUB(fstat)
-STUB(link)
-STUB(mkdir)
-STUB(chdir)
-STUB(dup)
-STUB(getpid)
-STUB(sbrk)
-STUB(sleep)
+SYSCALL(fork)
+SYSCALL(exit)
+SYSCALL(wait)
+SYSCALL(pipe)
+SYSCALL(read)
+SYSCALL(write)
+SYSCALL(close)
+SYSCALL(kill)
+SYSCALL(exec)
+SYSCALL(open)
+SYSCALL(mknod)
+SYSCALL(unlink)
+SYSCALL(fstat)
+SYSCALL(link)
+SYSCALL(mkdir)
+SYSCALL(chdir)
+SYSCALL(dup)
+SYSCALL(getpid)
+SYSCALL(sbrk)
+SYSCALL(sleep)