diff options
Diffstat (limited to 'riscv/decode.h')
| -rw-r--r-- | riscv/decode.h | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/riscv/decode.h b/riscv/decode.h index 1141e1c..99f274e 100644 --- a/riscv/decode.h +++ b/riscv/decode.h @@ -2418,8 +2418,13 @@ for (reg_t i = 0; i < P.VU.vlmax && P.VU.vl != 0; ++i) { \ rd_tmp = set_field(rd_tmp, make_mask64((i * sizeof(pd) * 8), sizeof(pd) * 8), pd); #define WRITE_RD_PAIR(value) \ - WRITE_REG(insn.rd(), zext32(value)); \ - WRITE_REG(insn.rd() + 1, ((reg_t)value) >> 32); + if (MMU.is_target_big_endian()) { \ + WRITE_REG(insn.rd() + 1, sext32(value)); \ + WRITE_REG(insn.rd(), ((sreg_t)value) >> 32); \ + } else { \ + WRITE_REG(insn.rd(), sext32(value)); \ + WRITE_REG(insn.rd() + 1, ((sreg_t)value) >> 32); \ + } #define P_SET_OV(ov) \ auto old = p->get_csr(CSR_UCODE); \ @@ -2440,6 +2445,7 @@ for (reg_t i = 0; i < P.VU.vlmax && P.VU.vl != 0; ++i) { \ R = UINT##BIT##_MAX; \ P_SET_OV(1); \ } else if (R < 0) { \ + P_SET_OV(1); \ R = 0; \ } @@ -2491,10 +2497,10 @@ for (reg_t i = 0; i < P.VU.vlmax && P.VU.vl != 0; ++i) { \ #define P_REDUCTION_LOOP_BASE(BIT, BIT_INNER, USE_RD) \ require_extension('P'); \ require(BIT == e16 || BIT == e32 || BIT == e64); \ - reg_t rd_tmp = USE_RD ? RD : 0; \ - reg_t rs1 = RS1; \ - reg_t rs2 = RS2; \ - sreg_t len = xlen / BIT; \ + reg_t rd_tmp = USE_RD ? zext_xlen(RD) : 0; \ + reg_t rs1 = zext_xlen(RS1); \ + reg_t rs2 = zext_xlen(RS2); \ + sreg_t len = 64 / BIT; \ sreg_t len_inner = BIT / BIT_INNER; \ for (sreg_t i = len - 1; i >= 0; --i) { \ sreg_t pd_res = P_FIELD(rd_tmp, i, BIT); \ @@ -2503,10 +2509,10 @@ for (reg_t i = 0; i < P.VU.vlmax && P.VU.vl != 0; ++i) { \ #define P_REDUCTION_ULOOP_BASE(BIT, BIT_INNER, USE_RD) \ require_extension('P'); \ require(BIT == e16 || BIT == e32 || BIT == e64); \ - reg_t rd_tmp = USE_RD ? RD : 0; \ - reg_t rs1 = RS1; \ - reg_t rs2 = RS2; \ - sreg_t len = xlen / BIT; \ + reg_t rd_tmp = USE_RD ? zext_xlen(RD) : 0; \ + reg_t rs1 = zext_xlen(RS1); \ + reg_t rs2 = zext_xlen(RS2); \ + sreg_t len = 64 / BIT; \ sreg_t len_inner = BIT / BIT_INNER; \ for (sreg_t i = len - 1; i >=0; --i) { \ reg_t pd_res = P_UFIELD(rd_tmp, i, BIT); \ @@ -2616,13 +2622,6 @@ for (reg_t i = 0; i < P.VU.vlmax && P.VU.vl != 0; ++i) { \ WRITE_PD(); \ } -#define P_ONE_SULOOP_BODY(BIT, BODY) { \ - P_ONE_SUPARAMS(BIT) \ - BODY \ - WRITE_PD(); \ -} - - #define P_MUL_LOOP_BODY(BIT, BODY) { \ P_MUL_PARAMS(BIT) \ BODY \ @@ -2715,11 +2714,6 @@ for (reg_t i = 0; i < P.VU.vlmax && P.VU.vl != 0; ++i) { \ P_ONE_ULOOP_BODY(BIT, BODY) \ P_LOOP_END() -#define P_I_SULOOP(BIT, IMMBIT, BODY) \ - P_I_LOOP_BASE(BIT, IMMBIT) \ - P_ONE_SULOOP_BODY(BIT, BODY) \ - P_LOOP_END() - #define P_MUL_LOOP(BIT, BODY) \ P_MUL_LOOP_BASE(BIT) \ P_MUL_LOOP_BODY(BIT, BODY) \ |