diff options
| author | Mole Shang <[email protected]> | 2024-02-13 19:39:56 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-13 19:39:56 +0800 |
| commit | 89ef6f717ed4b3e702e5f6f906f58fe1ea27d366 (patch) | |
| tree | 760cce316675479a6cca77551438e8d2cc5fe9ae /kernel/exec.c | |
| parent | cfae93475dfb4cb5cfe264f4c029136e1447c262 (diff) | |
| parent | 4a6593f1a6f666c618d303a4858c4c6d31b41c63 (diff) | |
| download | xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.tar.gz xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.tar.bz2 xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.zip | |
Merge branch 'cow' into net
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
kernel/syscall.c
kernel/vm.c
user/pingpong.c
user/user.h
user/usys.pl
Diffstat (limited to 'kernel/exec.c')
| -rw-r--r-- | kernel/exec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/exec.c b/kernel/exec.c index e18bbb6..35b35f5 100644 --- a/kernel/exec.c +++ b/kernel/exec.c @@ -128,6 +128,10 @@ exec(char *path, char **argv) p->trapframe->sp = sp; // initial stack pointer proc_freepagetable(oldpagetable, oldsz); + if(p->pid == 1){ + vmprint(p->pagetable); + } + return argc; // this ends up in a0, the first argument to main(argc, argv) bad: |