summaryrefslogtreecommitdiff
path: root/v
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2017-11-27 14:35:33 -0800
committerAndrew Waterman <andrew@sifive.com>2017-11-27 14:35:33 -0800
commit68cad7baf3ed0a4553fffd14726d24519ee1296a (patch)
tree029cff935fdb82221ae8e35f596bfda68495418c /v
parent1b76fd1f1c63dfe4cea93f426434a7384d2bf801 (diff)
downloadenv-68cad7baf3ed0a4553fffd14726d24519ee1296a.zip
env-68cad7baf3ed0a4553fffd14726d24519ee1296a.tar.gz
env-68cad7baf3ed0a4553fffd14726d24519ee1296a.tar.bz2
Rename sptbr to satp
Diffstat (limited to 'v')
-rw-r--r--v/vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/v/vm.c b/v/vm.c
index 6ab7fd1..a2e5533 100644
--- a/v/vm.c
+++ b/v/vm.c
@@ -225,13 +225,13 @@ void vm_boot(uintptr_t test_addr)
l1pt[PTES_PER_PT-1] = ((pte_t)kernel_l2pt >> PGSHIFT << PTE_PPN_SHIFT) | PTE_V;
kernel_l2pt[PTES_PER_PT-1] = (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_R | PTE_W | PTE_X | PTE_A | PTE_D;
user_l2pt[0] = ((pte_t)user_l3pt >> PGSHIFT << PTE_PPN_SHIFT) | PTE_V;
- uintptr_t vm_choice = SPTBR_MODE_SV39;
+ uintptr_t vm_choice = SATP_MODE_SV39;
#else
l1pt[PTES_PER_PT-1] = (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_R | PTE_W | PTE_X | PTE_A | PTE_D;
- uintptr_t vm_choice = SPTBR_MODE_SV32;
+ uintptr_t vm_choice = SATP_MODE_SV32;
#endif
write_csr(sptbr, ((uintptr_t)l1pt >> PGSHIFT) |
- (vm_choice * (SPTBR_MODE & ~(SPTBR_MODE<<1))));
+ (vm_choice * (SATP_MODE & ~(SATP_MODE<<1))));
// Set up PMPs if present, ignoring illegal instruction trap if not.
uintptr_t pmpc = PMP_NAPOT | PMP_R | PMP_W | PMP_X;