Merge branch 'riscv' into riscv-proc

This commit is contained in:
Frans Kaashoek 2019-07-02 14:19:31 -04:00
commit 1e4d7065d6
13 changed files with 375 additions and 133 deletions

View file

@ -7,32 +7,32 @@
#include "spinlock.h"
#include "proc.h"
int
uint64
sys_exit(void)
{
exit();
return 0; // not reached
}
int
uint64
sys_getpid(void)
{
return myproc()->pid;
}
int
uint64
sys_fork(void)
{
return fork();
}
int
uint64
sys_wait(void)
{
return wait();
}
int
uint64
sys_sbrk(void)
{
int addr;
@ -46,7 +46,7 @@ sys_sbrk(void)
return addr;
}
int
uint64
sys_sleep(void)
{
int n;
@ -67,7 +67,7 @@ sys_sleep(void)
return 0;
}
int
uint64
sys_kill(void)
{
int pid;
@ -79,7 +79,7 @@ sys_kill(void)
// return how many clock tick interrupts have occurred
// since start.
int
uint64
sys_uptime(void)
{
uint xticks;