Add abort() for benefit of benchmark code

[riscv-tests.git] / debug / programs / mprv.S

diff --git a/debug/programs/mprv.S b/debug/programs/mprv.S
index 2725b6720096a76e1bbbb85302019ef4261c4756..574f32e62a562a69732dd74af4903f6bf6baa841 100644 (file)
--- a/debug/programs/mprv.S
+++ b/debug/programs/mprv.S
@@ -12,7 +12,11 @@ main:
 
         # update mstatus
         csrr    t1, CSR_MSTATUS
+#if XLEN == 32
+        li      t0, (MSTATUS_MPRV | (VM_SV32 << 24))
+#else
         li      t0, (MSTATUS_MPRV | (VM_SV39 << 24))
+#endif
         #li      t0, ((VM_SV39 << 24))
         or      t1, t0, t1
         csrw    CSR_MSTATUS, t1
@@ -34,5 +38,9 @@ data:
 
         .balign 0x1000
 page_table:
-        .word   ((0x80000000 >> 2) | PTE_V | PTE_TYPE_URWX_SRWX)
+#if XLEN == 32
+        .word   ((0x80000000 >> 2) | PTE_V | PTE_R | PTE_W | PTE_X | PTE_G | PTE_U)
+#else
+        .word   ((0x80000000 >> 2) | PTE_V | PTE_R | PTE_W | PTE_X | PTE_G | PTE_U)
         .word   0
+#endif