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)