diff options
| author | Mole Shang <[email protected]> | 2024-02-11 14:44:22 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-11 16:06:15 +0800 |
| commit | 2fe04bc8faa4bf737a86c36a8017473e84814f3b (patch) | |
| tree | 2146d3dae86f21060e2e807ad364f5a949fd1c53 /user/ulib.c | |
| parent | 5ce1f630132d8b7b35b9dc46b4a55f860eb85d5c (diff) | |
| parent | 48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 (diff) | |
| download | xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.gz xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.bz2 xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.zip | |
Merge branch 'traps' into cow
Conflicts:
.gitignore
Makefile
conf/lab.mk
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 |