diff options
| author | Andrew Waterman <waterman@eecs.berkeley.edu> | 2014-01-21 16:07:05 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@eecs.berkeley.edu> | 2014-01-21 16:07:24 -0800 |
| commit | a481561500f43c8a022cfc0ba1695914e1df4d57 (patch) | |
| tree | 359425c3be17b3304ff75faeb112d375581ccccf | |
| parent | 7356626efe5c331f77202e6e1d875c85c4b4588a (diff) | |
| download | riscv-tests-a481561500f43c8a022cfc0ba1695914e1df4d57.zip riscv-tests-a481561500f43c8a022cfc0ba1695914e1df4d57.tar.gz riscv-tests-a481561500f43c8a022cfc0ba1695914e1df4d57.tar.bz2 | |
Add CSRRx/CSRRxI test
| -rw-r--r-- | isa/rv64si/Makefrag | 1 | ||||
| -rw-r--r-- | isa/rv64si/coreid.S | 2 | ||||
| -rw-r--r-- | isa/rv64si/csr.S | 33 |
3 files changed, 35 insertions, 1 deletions
diff --git a/isa/rv64si/Makefrag b/isa/rv64si/Makefrag index 285b7fd..83bf22d 100644 --- a/isa/rv64si/Makefrag +++ b/isa/rv64si/Makefrag @@ -4,6 +4,7 @@ rv64si_sc_tests = \ coreid \ + csr \ rv64si_mc_tests = \ ipi \ diff --git a/isa/rv64si/coreid.S b/isa/rv64si/coreid.S index ed33f11..cb2367e 100644 --- a/isa/rv64si/coreid.S +++ b/isa/rv64si/coreid.S @@ -15,7 +15,7 @@ RVTEST_CODE_BEGIN # Basic tests #------------------------------------------------------------- - TEST_CASE( 2, x1, 0x0, csrr x1, hartid ); + TEST_CASE( 2, x1, 0x0, li x1, 1; csrr x1, hartid ); TEST_PASSFAIL diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S new file mode 100644 index 0000000..26031bc --- /dev/null +++ b/isa/rv64si/csr.S @@ -0,0 +1,33 @@ +#***************************************************************************** +# csr.S +#----------------------------------------------------------------------------- +# +# Test CSRRx and CSRRxI instructions. +# + +#include "riscv_test.h" +#include "test_macros.h" + +RVTEST_RV64S +RVTEST_CODE_BEGIN + + csrwi sup0, 3 + TEST_CASE( 2, a0, 3, csrr a0, sup0); + TEST_CASE( 3, a1, 3, csrrci a1, sup0, 1); + TEST_CASE( 4, a2, 2, csrrsi a2, sup0, 4); + TEST_CASE( 5, a3, 6, csrrwi a3, sup0, 2); + TEST_CASE( 6, a1, 2, li a0, 0xbad1dea; csrrw a1, sup0, a0); + TEST_CASE( 7, a0, 0xbad1dea, li a0, 0x0001dea; csrrc a0, sup0, a0); + TEST_CASE( 8, a0, 0xbad0000, li a0, 0x000beef; csrrs a0, sup0, a0); + TEST_CASE( 9, a0, 0xbadbeef, csrr a0, sup0); + + TEST_PASSFAIL + +RVTEST_CODE_END + + .data +RVTEST_DATA_BEGIN + + TEST_DATA + +RVTEST_DATA_END |