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 /user/ulib.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 'user/ulib.c')
| -rw-r--r-- | user/ulib.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/user/ulib.c b/user/ulib.c index c7b66c4..871adc9 100644 --- a/user/ulib.c +++ b/user/ulib.c @@ -1,8 +1,13 @@ #include "kernel/types.h" #include "kernel/stat.h" #include "kernel/fcntl.h" +#ifdef LAB_PGTBL +#include "kernel/riscv.h" +#include "kernel/memlayout.h" +#endif #include "user/user.h" + // // wrapper so that it's OK if main() does not call exit(). // @@ -145,3 +150,12 @@ memcpy(void *dst, const void *src, uint n) { return memmove(dst, src, n); } + +#ifdef LAB_PGTBL +int +ugetpid(void) +{ + struct usyscall *u = (struct usyscall *)USYSCALL; + return u->pid; +} +#endif |