summaryrefslogtreecommitdiff
path: root/sysproc.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-05-31 09:45:59 -0400
committerRobert Morris <[email protected]>2019-05-31 09:45:59 -0400
commit2ec1959fd1016a18ef3b2d154ce7076be8f237e4 (patch)
tree1aa75252085964283b3a2c735771f4da02346517 /sysproc.c
parent0f90388c893d1924e89e2e4d2187eda0004e9d73 (diff)
downloadxv6-labs-2ec1959fd1016a18ef3b2d154ce7076be8f237e4.tar.gz
xv6-labs-2ec1959fd1016a18ef3b2d154ce7076be8f237e4.tar.bz2
xv6-labs-2ec1959fd1016a18ef3b2d154ce7076be8f237e4.zip
fork/wait/exit work
Diffstat (limited to 'sysproc.c')
-rw-r--r--sysproc.c27
1 files changed, 14 insertions, 13 deletions
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)
{
@@ -37,12 +43,6 @@ sys_kill(void)
}
int
-sys_getpid(void)
-{
- return myproc()->pid;
-}
-
-int
sys_sbrk(void)
{
int addr;
@@ -89,3 +89,4 @@ sys_uptime(void)
release(&tickslock);
return xticks;
}
+#endif