diff options
author | Andrew Waterman <andrew@sifive.com> | 2020-11-23 23:06:46 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-23 23:06:46 -0800 |
commit | 1d9e7eaa85d9929d3f76b460c25ca26e1245a371 (patch) | |
tree | 71ce98bfdf3172f3f79c0db4743113c36d75a628 | |
parent | 43d3d53809085e2c8f030d72eed1bdf798bfb31a (diff) | |
parent | 6f81792315c7263a3c4cd40c05cfc54aa95cbd49 (diff) | |
download | env-1d9e7eaa85d9929d3f76b460c25ca26e1245a371.zip env-1d9e7eaa85d9929d3f76b460c25ca26e1245a371.tar.gz env-1d9e7eaa85d9929d3f76b460c25ca26e1245a371.tar.bz2 |
Merge pull request #27 from bucaps/satp_stval-fixes
Minor clang-related fixes
-rw-r--r-- | p/riscv_test.h | 2 | ||||
-rw-r--r-- | v/entry.S | 2 | ||||
-rw-r--r-- | v/vm.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/p/riscv_test.h b/p/riscv_test.h index 2b6ff83..a08f49e 100644 --- a/p/riscv_test.h +++ b/p/riscv_test.h @@ -110,7 +110,7 @@ #define INIT_SATP \ la t0, 1f; \ csrw mtvec, t0; \ - csrwi sptbr, 0; \ + csrwi satp, 0; \ .align 2; \ 1: @@ -153,7 +153,7 @@ trap_entry: STORE t0,32*REGBYTES(sp) csrr t0,sepc STORE t0,33*REGBYTES(sp) - csrr t0,sbadaddr + csrr t0,stval STORE t0,34*REGBYTES(sp) csrr t0,scause STORE t0,35*REGBYTES(sp) @@ -253,10 +253,10 @@ void vm_boot(uintptr_t test_addr) # error #endif uintptr_t vm_choice = SATP_MODE_CHOICE; - uintptr_t sptbr_value = ((uintptr_t)l1pt >> PGSHIFT) + uintptr_t satp_value = ((uintptr_t)l1pt >> PGSHIFT) | (vm_choice * (SATP_MODE & ~(SATP_MODE<<1))); - write_csr(sptbr, sptbr_value); - if (read_csr(sptbr) != sptbr_value) + write_csr(satp, satp_value); + if (read_csr(satp) != satp_value) assert(!"unsupported satp mode"); // Set up PMPs if present, ignoring illegal instruction trap if not. |