diff options
| author | Robert Morris <[email protected]> | 2022-08-09 13:41:51 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2022-08-09 13:41:51 -0400 |
| commit | af9abaca0543e392812fcde1138e68892b6c70bc (patch) | |
| tree | 0e930e587ce179165b0ed0a9c3dbaf3af9955ea3 | |
| parent | 3abd7a16dd6a0a529b7eab1ef31a3819b54a931e (diff) | |
| parent | cf0c095721b22b8ce011484a2509cd27858cbe77 (diff) | |
| download | xv6-labs-af9abaca0543e392812fcde1138e68892b6c70bc.tar.gz xv6-labs-af9abaca0543e392812fcde1138e68892b6c70bc.tar.bz2 xv6-labs-af9abaca0543e392812fcde1138e68892b6c70bc.zip | |
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
| -rw-r--r-- | kernel/proc.h | 1 | ||||
| -rw-r--r-- | kernel/riscv.h | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/kernel/proc.h b/kernel/proc.h index f6ca8b7..d021857 100644 --- a/kernel/proc.h +++ b/kernel/proc.h @@ -31,7 +31,6 @@ extern struct cpu cpus[NCPU]; // per-process data for the trap handling code in trampoline.S. // sits in a page by itself just under the trampoline page in the // user page table. not specially mapped in the kernel page table. -// the sscratch register points here. // uservec in trampoline.S saves user registers in the trapframe, // then initializes registers from the trapframe's // kernel_sp, kernel_hartid, kernel_satp, and jumps to kernel_trap. diff --git a/kernel/riscv.h b/kernel/riscv.h index 7e358f1..645a775 100644 --- a/kernel/riscv.h +++ b/kernel/riscv.h @@ -217,13 +217,6 @@ r_satp() return x; } -// Supervisor Scratch register, for early trap handler in trampoline.S. -static inline void -w_sscratch(uint64 x) -{ - asm volatile("csrw sscratch, %0" : : "r" (x)); -} - static inline void w_mscratch(uint64 x) { |