diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-02-19 12:25:14 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-02-19 12:25:39 -0800 |
| commit | e0532426bcd8634041be23457ff78a90e78db466 (patch) | |
| tree | 9b6c74f81bd7f3c3f36a361253567c394d31c7b1 /isa | |
| parent | d7aa5a3443f7a91d108be67f91900261e94d0ccd (diff) | |
| download | riscv-tests-e0532426bcd8634041be23457ff78a90e78db466.zip riscv-tests-e0532426bcd8634041be23457ff78a90e78db466.tar.gz riscv-tests-e0532426bcd8634041be23457ff78a90e78db466.tar.bz2 | |
Unify rv32/rv64 timer tests
Diffstat (limited to 'isa')
| -rw-r--r-- | isa/rv32si/timer.S | 41 | ||||
| -rw-r--r-- | isa/rv64si/timer.S | 12 |
2 files changed, 10 insertions, 43 deletions
diff --git a/isa/rv32si/timer.S b/isa/rv32si/timer.S index 0e3a623..5c627d5 100644 --- a/isa/rv32si/timer.S +++ b/isa/rv32si/timer.S @@ -10,42 +10,7 @@ #include "riscv_test.h" #include "test_macros.h" -RVTEST_RV32S -RVTEST_CODE_BEGIN +#undef RVTEST_RV64S +#define RVTEST_RV64S RVTEST_RV32S - la t0, evec - csrw evec, t0 - - csrr t0, count - add t0, t0, 1000 - csrw compare, t0 - - li t1, 1<<23 - csrs status, t1 # turn on timer IRQ 7 - csrsi status, 4 # enable interrupts - - li TESTNUM, 2 - li a0,10000 -loop: - div x0, x0, x0 - addi a0, a0, -1 - bne a0, x0, loop - j fail # assumption is that you can't divide in one cycle - - TEST_PASSFAIL - -evec: - li TESTNUM, 3 - li t1, 0x80000000|IRQ_TIMER - csrr t0, cause - bne t0, t1, fail - j pass - -RVTEST_CODE_END - - .data -RVTEST_DATA_BEGIN - - TEST_DATA - -RVTEST_DATA_END +#include "../rv64si/timer.S" diff --git a/isa/rv64si/timer.S b/isa/rv64si/timer.S index 80b22e9..0a90a60 100644 --- a/isa/rv64si/timer.S +++ b/isa/rv64si/timer.S @@ -32,8 +32,7 @@ RVTEST_CODE_BEGIN srl s0,s0,1 sll s2,s2,9 or s0,s2,s0 - sll s0,s0,54 - srl s0,s0,54 + and s0, s0, 0x3FF add s4, s4, 1 bltu s8, s9, 1b @@ -54,10 +53,13 @@ RVTEST_CODE_BEGIN TEST_PASSFAIL handler: - csrr t0, cause - li t1, 0x8000000000000007 li TESTNUM, 3 - bne t0, t1, fail + csrr t0, cause + bgez t0, fail + + sll t0, t0, 1 + addi t0, t0, -2*IRQ_TIMER + bnez t0, fail csrr t0, count addi t0, t0, 999 |