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 /kernel/defs.h | |
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 'kernel/defs.h')
-rw-r--r-- | kernel/defs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/defs.h b/kernel/defs.h index a3c962b..04a0276 100644 --- a/kernel/defs.h +++ b/kernel/defs.h @@ -8,6 +8,7 @@ struct spinlock; struct sleeplock; struct stat; struct superblock; +struct sysinfo; // bio.c void binit(void); @@ -63,6 +64,7 @@ void ramdiskrw(struct buf*); void* kalloc(void); void kfree(void *); void kinit(void); +int get_freemem(void); // log.c void initlog(int, struct superblock*); @@ -80,6 +82,7 @@ int pipewrite(struct pipe*, uint64, int); void printf(char*, ...); void panic(char*) __attribute__((noreturn)); void printfinit(void); +void backtrace(void); // proc.c int cpuid(void); @@ -106,6 +109,8 @@ void yield(void); int either_copyout(int user_dst, uint64 dst, void *src, uint64 len); int either_copyin(void *dst, int user_src, uint64 src, uint64 len); void procdump(void); +int get_nproc(void); +int pgaccess(uint64 base, int len, uint64 mask); // swtch.S void swtch(struct context*, struct context*); @@ -141,6 +146,9 @@ int fetchstr(uint64, char*, int); int fetchaddr(uint64, uint64*); void syscall(); +// sysinfo.c +int sys_info(uint64); + // trap.c extern uint ticks; void trapinit(void); @@ -173,6 +181,7 @@ uint64 walkaddr(pagetable_t, uint64); int copyout(pagetable_t, uint64, char *, uint64); int copyin(pagetable_t, char *, uint64, uint64); int copyinstr(pagetable_t, char *, uint64, uint64); +void vmprint(pagetable_t); // plic.c void plicinit(void); |