Update to new PTE format

diff --git a/env b/env
index 260b6fff32036dcfc8299aa21dd7cd443b18bb6a..5c613fe43d1bc44e6ae408b5356c7d60d93a1ca0 160000 (submodule)
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit 260b6fff32036dcfc8299aa21dd7cd443b18bb6a
+Subproject commit 5c613fe43d1bc44e6ae408b5356c7d60d93a1ca0

diff --git a/isa/rv64mi/dirty.S b/isa/rv64mi/dirty.S
index 9de358b81dd9842e5f8d924fbe44044ba03ab869..66ed5a085317dfe082bb71b523e165e91fd452a7 100644 (file)
--- a/isa/rv64mi/dirty.S
+++ b/isa/rv64mi/dirty.S
@@ -44,7 +44,7 @@ RVTEST_CODE_BEGIN
 
   # Make sure R and D bits are set
   lw t0, page_table_2
-  li t1, PTE_R | PTE_D
+  li t1, PTE_A | PTE_D
   and t0, t0, t1
   bne t0, t1, die
   
@@ -58,7 +58,7 @@ stvec_handler:
   bne TESTNUM, t1, 1f
   # Make sure R bit is set
   lw t0, page_table_1
-  li t1, PTE_R
+  li t1, PTE_A
   and t0, t0, t1
   bne t0, t1, die
 
@@ -84,9 +84,9 @@ RVTEST_DATA_BEGIN
   TEST_DATA
 
 .align 12
-page_table_1: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_TYPE_URX_SRX
+page_table_1: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_U | PTE_R | PTE_X
 dummy: .dword 0
 .align 12
-page_table_2: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_TYPE_URWX_SRWX
+page_table_2: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_U | PTE_R | PTE_X | PTE_W
 
 RVTEST_DATA_END