diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-08-23 20:02:02 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-08-23 20:04:30 -0700 |
| commit | 5fe2ce69dcd1d0ddb42c4edffac7ab11d939ca45 (patch) | |
| tree | 1c76b45e4b7cf966f5d0d3b943d66b04c4f95c21 /isa/macros | |
| parent | 5b13eb6cd5aa3e73fb477414f1866e7b9cbeaf3f (diff) | |
| download | riscv-tests-5fe2ce69dcd1d0ddb42c4edffac7ab11d939ca45.zip riscv-tests-5fe2ce69dcd1d0ddb42c4edffac7ab11d939ca45.tar.gz riscv-tests-5fe2ce69dcd1d0ddb42c4edffac7ab11d939ca45.tar.bz2 | |
Reflect changes to ISA
Conflicts:
isa/Makefile
Diffstat (limited to 'isa/macros')
| -rw-r--r-- | isa/macros/scalar/test_macros.h | 20 | ||||
| -rw-r--r-- | isa/macros/vector/test_macros.h | 16 |
2 files changed, 18 insertions, 18 deletions
diff --git a/isa/macros/scalar/test_macros.h b/isa/macros/scalar/test_macros.h index 97cb28e..6ce6abc 100644 --- a/isa/macros/scalar/test_macros.h +++ b/isa/macros/scalar/test_macros.h @@ -485,35 +485,35 @@ test_ ## testnum: \ #define TEST_FCVT_S_D( testnum, result, val1 ) \ TEST_FP_OP_D_INTERNAL( testnum, double result, val1, 0.0, 0.0, \ - fcvt.s.d f3, f0; fcvt.d.s f3, f3; mftx.d a0, f3) + fcvt.s.d f3, f0; fcvt.d.s f3, f3; fmv.x.d a0, f3) #define TEST_FCVT_D_S( testnum, result, val1 ) \ TEST_FP_OP_S_INTERNAL( testnum, float result, val1, 0.0, 0.0, \ - fcvt.d.s f3, f0; fcvt.s.d f3, f3; mftx.s a0, f3) + fcvt.d.s f3, f0; fcvt.s.d f3, f3; fmv.x.s a0, f3) #define TEST_FP_OP1_S( testnum, inst, result, val1 ) \ TEST_FP_OP_S_INTERNAL( testnum, float result, val1, 0.0, 0.0, \ - inst f3, f0; mftx.s a0, f3) + inst f3, f0; fmv.x.s a0, f3) #define TEST_FP_OP1_D( testnum, inst, result, val1 ) \ TEST_FP_OP_D_INTERNAL( testnum, double result, val1, 0.0, 0.0, \ - inst f3, f0; mftx.d a0, f3) + inst f3, f0; fmv.x.d a0, f3) #define TEST_FP_OP2_S( testnum, inst, result, val1, val2 ) \ TEST_FP_OP_S_INTERNAL( testnum, float result, val1, val2, 0.0, \ - inst f3, f0, f1; mftx.s a0, f3) + inst f3, f0, f1; fmv.x.s a0, f3) #define TEST_FP_OP2_D( testnum, inst, result, val1, val2 ) \ TEST_FP_OP_D_INTERNAL( testnum, double result, val1, val2, 0.0, \ - inst f3, f0, f1; mftx.d a0, f3) + inst f3, f0, f1; fmv.x.d a0, f3) #define TEST_FP_OP3_S( testnum, inst, result, val1, val2, val3 ) \ TEST_FP_OP_S_INTERNAL( testnum, float result, val1, val2, val3, \ - inst f3, f0, f1, f2; mftx.s a0, f3) + inst f3, f0, f1, f2; fmv.x.s a0, f3) #define TEST_FP_OP3_D( testnum, inst, result, val1, val2, val3 ) \ TEST_FP_OP_D_INTERNAL( testnum, double result, val1, val2, val3, \ - inst f3, f0, f1, f2; mftx.d a0, f3) + inst f3, f0, f1, f2; fmv.x.d a0, f3) #define TEST_FP_INT_OP_S( testnum, inst, result, val1, rm ) \ TEST_FP_OP_S_INTERNAL( testnum, word result, val1, 0.0, 0.0, \ @@ -538,7 +538,7 @@ test_ ## testnum: \ lw a3, 0(a0); \ li a0, val1; \ inst f0, a0; \ - mftx.s a0, f0; \ + fmv.x.s a0, f0; \ bne a0, a3, fail; \ b 1f; \ .align 2; \ @@ -553,7 +553,7 @@ test_ ## testnum: \ ld a3, 0(a0); \ li a0, val1; \ inst f0, a0; \ - mftx.d a0, f0; \ + fmv.x.d a0, f0; \ bne a0, a3, fail; \ b 1f; \ .align 3; \ diff --git a/isa/macros/vector/test_macros.h b/isa/macros/vector/test_macros.h index f7357f4..3a5d548 100644 --- a/isa/macros/vector/test_macros.h +++ b/isa/macros/vector/test_macros.h @@ -294,27 +294,27 @@ vtcode ## testnum : \ #define TEST_FCVT_S_D( testnum, result, val1 ) \ TEST_FP_OP_D_INTERNAL_NREG( testnum, 2, 4, double result, val1, 0.0, 0.0, \ - fcvt.s.d f3, f0; fcvt.d.s f3, f3; mftx.d x1, f3) + fcvt.s.d f3, f0; fcvt.d.s f3, f3; fmv.x.d x1, f3) #define TEST_FCVT_D_S( testnum, result, val1 ) \ TEST_FP_OP_S_INTERNAL_NREG( testnum, 2, 4, float result, val1, 0.0, 0.0, \ - fcvt.d.s f3, f0; fcvt.s.d f3, f3; mftx.s x1, f3) + fcvt.d.s f3, f0; fcvt.s.d f3, f3; fmv.x.s x1, f3) #define TEST_FP_OP2_S( testnum, inst, result, val1, val2 ) \ TEST_FP_OP_S_INTERNAL_NREG( testnum, 2, 4, float result, val1, val2, 0.0, \ - inst f3, f0, f1; mftx.s x1, f3) + inst f3, f0, f1; fmv.x.s x1, f3) #define TEST_FP_OP2_D( testnum, inst, result, val1, val2 ) \ TEST_FP_OP_D_INTERNAL_NREG( testnum, 2, 4, double result, val1, val2, 0.0, \ - inst f3, f0, f1; mftx.d x1, f3) + inst f3, f0, f1; fmv.x.d x1, f3) #define TEST_FP_OP3_S( testnum, inst, result, val1, val2, val3 ) \ TEST_FP_OP_S_INTERNAL_NREG( testnum, 2, 4, float result, val1, val2, val3, \ - inst f3, f0, f1, f2; mftx.s x1, f3) + inst f3, f0, f1, f2; fmv.x.s x1, f3) #define TEST_FP_OP3_D( testnum, inst, result, val1, val2, val3 ) \ TEST_FP_OP_D_INTERNAL_NREG( testnum, 2, 4, double result, val1, val2, val3, \ - inst f3, f0, f1, f2; mftx.d x1, f3) + inst f3, f0, f1, f2; fmv.x.d x1, f3) #define TEST_FP_INT_OP_S( testnum, inst, result, val1, rm ) \ TEST_FP_OP_S_INTERNAL_NREG( testnum, 2, 4, word result, val1, 0.0, 0.0, \ @@ -357,7 +357,7 @@ skip ## testnum : \ vtcode ## testnum : \ li x1, val1; \ inst f0, x1; \ - mftx.s x1, f0; \ + fmv.x.s x1, f0; \ stop; \ .align 2; \ test_ ## testnum ## _data: \ @@ -389,7 +389,7 @@ skip ## testnum : \ vtcode ## testnum : \ li x1, val1; \ inst f0, x1; \ - mftx.d x1, f0; \ + fmv.x.d x1, f0; \ stop; \ .align 3; \ test_ ## testnum ## _data: \ |