diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-02-28 23:24:46 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-03 11:03:59 -0800 |
| commit | 9fc686ae1488a596d0bed561a750396911e71b01 (patch) | |
| tree | 498111683f3c76620ad1299fbed6deab1b1af797 /isa/rv64si | |
| parent | 08486cb632ef704709a89fc6bab5842bec4c2547 (diff) | |
| download | riscv-tests-9fc686ae1488a596d0bed561a750396911e71b01.zip riscv-tests-9fc686ae1488a596d0bed561a750396911e71b01.tar.gz riscv-tests-9fc686ae1488a596d0bed561a750396911e71b01.tar.bz2 | |
WIP on priv spec v1.9
Diffstat (limited to 'isa/rv64si')
| -rw-r--r-- | isa/rv64si/csr.S | 17 | ||||
| -rw-r--r-- | isa/rv64si/scall.S | 21 | ||||
| -rw-r--r-- | isa/rv64si/wfi.S | 4 |
3 files changed, 21 insertions, 21 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. diff --git a/isa/rv64si/scall.S b/isa/rv64si/scall.S index 935b2dd..703de0b 100644 --- a/isa/rv64si/scall.S +++ b/isa/rv64si/scall.S @@ -19,26 +19,29 @@ RVTEST_CODE_BEGIN #define scause mcause #define sepc mepc #define stvec_handler mtvec_handler - #undef CAUSE_SUPERVISOR_ECALL - #define CAUSE_SUPERVISOR_ECALL CAUSE_MACHINE_ECALL + #undef SSTATUS_SPP + #define SSTATUS_SPP MSTATUS_MPP #endif li TESTNUM, 2 + + li t0, SSTATUS_SPP + csrc sstatus, t0 + la t0, 1f + csrw sepc, t0 + eret +1: + scall j fail - j pass - TEST_PASSFAIL stvec_handler: - li t1, CAUSE_SUPERVISOR_ECALL + li t1, CAUSE_USER_ECALL csrr t0, scause bne t0, t1, fail - csrr t0, sepc - addi t0, t0, 8 - csrw sepc, t0 - sret + j pass RVTEST_CODE_END diff --git a/isa/rv64si/wfi.S b/isa/rv64si/wfi.S index 956121a..4575f59 100644 --- a/isa/rv64si/wfi.S +++ b/isa/rv64si/wfi.S @@ -19,10 +19,12 @@ RVTEST_CODE_BEGIN #define sip mip #undef MIP_SSIP #define MIP_SSIP MIP_MSIP + #undef SSTATUS_SIE + #define SSTATUS_SIE MSTATUS_MIE #endif # Make sure wfi doesn't stall if an interrupt is pending - csrc sstatus, SSTATUS_IE + csrc sstatus, SSTATUS_SIE csrs sie, MIP_SSIP csrs sip, MIP_SSIP wfi |