diff options
| author | Andrew Waterman <andrew@sifive.com> | 2017-04-07 16:20:27 -0700 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2017-04-07 19:15:00 -0700 |
| commit | ba6d88466a96ec3147b96a57f746a137085764f9 (patch) | |
| tree | 791cbcbc50597d599ac0ad1a21a09b5b4d25fffc | |
| parent | fd4769977e79953fcf0decb68475d34f1d4c2d2a (diff) | |
| download | riscv-tests-ba6d88466a96ec3147b96a57f746a137085764f9.zip riscv-tests-ba6d88466a96ec3147b96a57f746a137085764f9.tar.gz riscv-tests-ba6d88466a96ec3147b96a57f746a137085764f9.tar.bz2 | |
Retrofit rv64mi-p-illegal to test vectored interrupts
| -rw-r--r-- | isa/rv64mi/illegal.S | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/isa/rv64mi/illegal.S b/isa/rv64mi/illegal.S index 8701a76..30105e6 100644 --- a/isa/rv64mi/illegal.S +++ b/isa/rv64mi/illegal.S @@ -13,26 +13,41 @@ RVTEST_RV64M RVTEST_CODE_BEGIN + .align 2 + .option norvc + li TESTNUM, 2 bad2: .word 0 j fail + # Test vectored interrupts if they are supported. +test_vectored_interrupts: + csrwi mip, MIP_SSIP + csrwi mie, MIP_SSIP + la t0, mtvec_handler + 1 + csrrw s0, mtvec, t0 + csrr t0, mtvec + andi t0, t0, 1 + beqz t0, msip + csrsi mstatus, MSTATUS_MIE +1: + j 1b + +msip: + csrw mtvec, s0 + # Skip the rest of the test if S-mode is not present. - li t0, MSTATUS_MPIE - csrc mstatus, t0 li t0, MSTATUS_MPP csrc mstatus, t0 - li t1, (MSTATUS_MPP & ~(MSTATUS_MPP << 1)) * PRV_S + li t1, (MSTATUS_MPP & -MSTATUS_MPP) * PRV_S csrs mstatus, t1 csrr t2, mstatus and t2, t2, t0 bne t1, t2, pass - # Set a software interrupt pending so WFI won't stall. + # Delegate supervisor software interrupts so WFI won't stall. csrwi mideleg, MIP_SSIP - csrwi mip, MIP_SSIP - csrwi mie, MIP_SSIP la t0, 1f csrw mepc, t0 mret @@ -86,7 +101,26 @@ bad9: TEST_PASSFAIL + .align 8 mtvec_handler: + j synchronous_exception + j msip + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + j fail + +synchronous_exception: li t1, CAUSE_ILLEGAL_INSTRUCTION csrr t0, mcause bne t0, t1, fail @@ -132,7 +166,7 @@ mtvec_handler: j 2b 9: - j pass + j 2b RVTEST_CODE_END |