Imbus/xv6-riscv-kernel
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate system call path from trap path. Passes usertests on 1 and 2 cpus.

Browse source
This commit is contained in:
Frans Kaashoek 2018-10-09 14:28:54 -04:00
parent f241e67d91
commit 54e6f829e4
8 changed files with 106 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

9
exec.c
View file

@ -85,8 +85,8 @@ exec(char *path, char **argv)
ustack[1] = argc;
ustack[2] = sp - (argc+1)*sizeof(uint64); // argv pointer
curproc->tf->rdi = argc;
curproc->tf->rsi = sp - (argc+1)*sizeof(uint64);
curproc->sf->rdi = argc;
curproc->sf->rsi = sp - (argc+1)*sizeof(uint64);
sp -= (3+argc+1) * sizeof(uint64);
if(copyout(pgdir, sp, ustack, (3+argc+1)*sizeof(uint64)) < 0)
@ -102,9 +102,8 @@ exec(char *path, char **argv)
oldpgdir = curproc->pgdir;
curproc->pgdir = pgdir;
curproc->sz = sz;
curproc->tf->rip = elf.entry; // main
curproc->tf->rcx = elf.entry;
curproc->tf->rsp = sp;
curproc->sf->rcx = elf.entry; // main
curproc->sf->rsp = sp;
switchuvm(curproc);
freevm(oldpgdir, oldsz);
return 0;