diff options
| author | Andrew Waterman <andrew@sifive.com> | 2017-09-01 11:15:44 -0700 |
|---|---|---|
| committer | Christopher Celio <celio@eecs.berkeley.edu> | 2017-09-01 12:56:04 -0700 |
| commit | c2bcbb1a30a1513cc79b9899d41f46870f92a2f3 (patch) | |
| tree | 22673eacbd3bbc1d62a3655c4e1646802a09b333 | |
| parent | ab6c2ccaec192684cf4649d5d69bd105d738d1c7 (diff) | |
| download | riscv-tests-c2bcbb1a30a1513cc79b9899d41f46870f92a2f3.zip riscv-tests-c2bcbb1a30a1513cc79b9899d41f46870f92a2f3.tar.gz riscv-tests-c2bcbb1a30a1513cc79b9899d41f46870f92a2f3.tar.bz2 | |
Improve ma_fetch test to cover JAL and branches
| -rw-r--r-- | isa/rv64si/ma_fetch.S | 49 |
1 files changed, 48 insertions, 1 deletions
diff --git a/isa/rv64si/ma_fetch.S b/isa/rv64si/ma_fetch.S index 7766c69..d4e5b44 100644 --- a/isa/rv64si/ma_fetch.S +++ b/isa/rv64si/ma_fetch.S @@ -61,17 +61,64 @@ RVTEST_CODE_BEGIN j fail 2: + # Like test 2, but with jal instead of jalr. + li TESTNUM, 5 + li t1, 0 + la t0, 1f + jal t1, 2f +1: + .option rvc + c.j 1f +2: + c.j 2f + .option norvc +1: + j fail +2: + + # Like test 2, but with a taken branch instead of jalr. + li TESTNUM, 6 + li t1, 0 + la t0, 1f + beqz x0, 2f +1: + .option rvc + c.j 1f +2: + c.j 2f + .option norvc +1: + j fail +2: + + # Not-taken branches should not trap, even without RVC. + li TESTNUM, 7 + bnez x0, 1f + j 2f + .option rvc + c.j 1f +1: + c.j 1f + .option norvc +1: + j fail +2: + j pass TEST_PASSFAIL .align 2 stvec_handler: - # tests 2 and 4 should trap + # tests 2, 4, 5, and 6 should trap li a0, 2 beq TESTNUM, a0, 1f li a0, 4 beq TESTNUM, a0, 1f + li a0, 5 + beq TESTNUM, a0, 1f + li a0, 6 + beq TESTNUM, a0, 1f j fail 1: |