diff options
Diffstat (limited to 'isa/rv64si/csr.S')
| -rw-r--r-- | isa/rv64si/csr.S | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S index d66b432..af0b756 100644 --- a/isa/rv64si/csr.S +++ b/isa/rv64si/csr.S @@ -19,12 +19,10 @@ RVTEST_CODE_BEGIN #define scause mcause #define sepc mepc #define stvec_handler mtvec_handler - #undef SSTATUS_PS - #define SSTATUS_PS MSTATUS_PRV1 + #undef SSTATUS_SPP + #define SSTATUS_SPP MSTATUS_MPP #endif - csrwi cyclew, 0 - csrwi sscratch, 3 TEST_CASE( 2, a0, 3, csrr a0, sscratch); TEST_CASE( 3, a1, 3, csrrci a1, sscratch, 1); @@ -39,7 +37,7 @@ RVTEST_CODE_BEGIN TEST_CASE(10, a0, 255, li a0, 255; csrrw a0, cycle, x0); # jump to user land - li t0, SSTATUS_PS + li t0, SSTATUS_SPP csrc sstatus, t0 la t0, 1f csrw sepc, t0 @@ -49,23 +47,20 @@ RVTEST_CODE_BEGIN # Make sure reading status in user mode causes an exception. TEST_CASE(11, a0, 255, li a0, 255; csrr a0, sstatus); - # Make sure rdcycle is legal in user mode. - TEST_CASE(12, x0, 0, rdcycle a0) - # Exit by doing a syscall. - TEST_CASE(13, x0, 1, scall) + TEST_CASE(12, x0, 1, scall) # We should only fall through to this if scall failed. TEST_PASSFAIL stvec_handler: - # Trapping on tests 10, 11, and 13 is usually good news. + # Trapping on tests 11 and 12 is usually good news. # Note that since the test didn't complete, TESTNUM is smaller by 1. li t0, 9 beq TESTNUM, t0, privileged li t0, 10 beq TESTNUM, t0, privileged - li t0, 12 + li t0, 11 beq TESTNUM, t0, syscall # Trapping on other tests is bad news. |