From 2ec1959fd1016a18ef3b2d154ce7076be8f237e4 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Fri, 31 May 2019 09:45:59 -0400 Subject: fork/wait/exit work --- sysproc.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'sysproc.c') diff --git a/sysproc.c b/sysproc.c index 0686d29..f840738 100644 --- a/sysproc.c +++ b/sysproc.c @@ -1,23 +1,28 @@ #include "types.h" -#include "x86.h" +#include "riscv.h" #include "defs.h" #include "date.h" #include "param.h" #include "memlayout.h" -#include "mmu.h" #include "proc.h" int -sys_fork(void) +sys_exit(void) { - return fork(); + exit(); + return 0; // not reached } int -sys_exit(void) +sys_getpid(void) { - exit(); - return 0; // not reached + return myproc()->pid; +} + +int +sys_fork(void) +{ + return fork(); } int @@ -26,6 +31,7 @@ sys_wait(void) return wait(); } +#if 0 int sys_kill(void) { @@ -36,12 +42,6 @@ sys_kill(void) return kill(pid); } -int -sys_getpid(void) -{ - return myproc()->pid; -} - int sys_sbrk(void) { @@ -89,3 +89,4 @@ sys_uptime(void) release(&tickslock); return xticks; } +#endif -- cgit v1.2.3