Fix to solve the failing tests shamt, csr and scall (#151)

[riscv-tests.git] / isa / rv64si / csr.S

diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S
index 5a8edbeaaf5ff28fcd7acc3701a5bd6d73057811..e3ea0cdeff0ec57f9a7f5d13cb3e93848c62c757 100644 (file)
--- a/isa/rv64si/csr.S
+++ b/isa/rv64si/csr.S
@@ -26,13 +26,14 @@ RVTEST_CODE_BEGIN
 
   # For RV64, make sure UXL encodes RV64.  (UXL does not exist for RV32.)
 #if __riscv_xlen == 64
-  # If running in M mode, read misa to check existence of U mode.
+  # If running in M mode, use mstatus.MPP to check existence of U mode.
   # Otherwise, if in S mode, then U mode must exist and we don't need to check.
 #ifdef __MACHINE_MODE
-  csrr a0, misa
-  srli a0, a0, 'U' - 'A'
-  andi a0, a0, 1
-  beqz a0, 1f
+  li t0, MSTATUS_MPP
+  csrc mstatus, t0
+  csrr t1, mstatus
+  and t0, t0, t1
+  bnez t0, 1f
 #endif
   # If U mode is present, UXL should be 2 (XLEN = 64-bit)
   TEST_CASE(13, a0, SSTATUS_UXL & (SSTATUS_UXL << 1), csrr a0, sstatus; li a1, SSTATUS_UXL; and a0, a0, a1)
@@ -79,6 +80,20 @@ RVTEST_CODE_BEGIN
   srli a0, a0, 20 # a0 = a0 >> 20
   andi a0, a0, 1  # a0 = a0 & 1
   beqz a0, finish # if no user mode, skip the rest of these checks
+  la t0, user_mode_end
+  srli t0, t0, PMP_SHIFT
+  csrr t1, pmpcfg0
+  csrw pmpaddr0, t0
+  csrr t1, pmpaddr0
+  bne t0, t1, fail
+  li t0, (PMP_R | PMP_W | PMP_X)   # giving read, write and execute permissions
+  or t0, t0, PMP_TOR  # setting mode to TOR
+  li t1, 255
+  csrrc t1, pmpcfg0, t1
+  csrrs t1, pmpcfg0, t0
+  csrr  t1, pmpcfg0
+  andi  t1, t1, 255
+  bne t0, t1, fail
 #endif /* __MACHINE_MODE */
 
   # jump to user land
@@ -102,10 +117,15 @@ RVTEST_CODE_BEGIN
 #else
   TEST_CASE(12, x0, 0, nop)
 #endif
-
+  scall
 finish:
   RVTEST_PASS
 
+  .align 2
+  .global user_mode_end
+user_mode_end:
+  nop
+  
   # We should only fall through to this if scall failed.
   TEST_PASSFAIL