1 files changed, 1 insertions, 20 deletions
diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S
index e3ea0cd..dbe1c05 100644
--- a/isa/rv64si/csr.S
+++ b/isa/rv64si/csr.S
@@ -80,20 +80,6 @@ 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
@@ -117,15 +103,10 @@ 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