From c10982fef3381340fc3dacb24d9a14fffb88554f Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 9 Nov 2018 12:09:56 +0000 Subject: [PATCH] macro-ify 32-bit mulh group --- riscv/sv_insn_redirect.cc | 77 ++++++++++++--------------------------- 1 file changed, 23 insertions(+), 54 deletions(-) diff --git a/riscv/sv_insn_redirect.cc b/riscv/sv_insn_redirect.cc index 7d5a274..bb8645c 100644 --- a/riscv/sv_insn_redirect.cc +++ b/riscv/sv_insn_redirect.cc @@ -524,67 +524,36 @@ OP_RES_FN ( _mul, sv_sreg_t, sv_reg_t, sv_sreg_t, int64_t, uint64_t, int64_t ) OP_RES_FN ( _mul, sv_sreg_t, sv_sreg_t, sv_sreg_t, int64_t, int64_t, int64_t ) /* 32-bit mulh/mulhu/mulhsu */ -sv_reg_t sv_proc_t::rv_mulhu(sv_reg_t const & lhs, sv_reg_t const & rhs) -{ + // normally the result is shuffled down by 32 bits (elwidth==default) // however with variable bitwidth we want the top elwidth bits, // using the SOURCE registers to determine that width. // specifically: truncation of the result due to a shorter // destination elwidth is NOT our problem. - uint8_t bitwidth = _insn->src_bitwidth; - uint64_t vlhs = 0; - uint64_t vrhs = 0; - if (rv_int_op_prepare(lhs, rhs, vlhs, vrhs, bitwidth)) { - sv_reg_t result = (lhs * rhs) >> 32; - fprintf(stderr, "mulhu result %lx %lx %lx\n", - (uint64_t)lhs, (uint64_t)rhs, (uint64_t)result); - return result; - } - uint8_t bw32 = std::min(bitwidth, (uint8_t)32); - uint64_t result = (vlhs * vrhs) >> bw32; - result = zext_bwid(result, bw32); - fprintf(stderr, "mulhu result %lx %lx %lx bw %d\n", - (uint64_t)lhs, (uint64_t)rhs, (uint64_t)(result), bitwidth); - return rv_int_op_finish(lhs, rhs, result, bitwidth); -} - -sv_sreg_t sv_proc_t::rv_mulhsu(sv_sreg_t const & lhs, sv_reg_t const & rhs) -{ - uint8_t bitwidth = _insn->src_bitwidth; - int64_t vlhs = 0; - uint64_t vrhs = 0; - if (rv_int_op_prepare(lhs, rhs, vlhs, vrhs, bitwidth)) { - sv_sreg_t result = (lhs * rhs) >> 32; - fprintf(stderr, "mulhsu result %lx %lx %lx\n", - (int64_t)lhs, (uint64_t)rhs, (int64_t)result); - return result; - } - uint8_t bw32 = std::min(bitwidth, (uint8_t)32); - int64_t result = (vlhs * vrhs) >> bw32; - result = sext_bwid(result, bw32); - fprintf(stderr, "mulhu result %lx %lx %lx bw %d\n", - (int64_t)lhs, (uint64_t)rhs, (int64_t)(result), bitwidth); - return rv_int_op_finish(lhs, rhs, result, bitwidth); +#define OP_MULH_FN( fname, SLHSTYPE, SRHSTYPE, SRESTYPE, \ + LHSTYPE, RHSTYPE, RESTYPE ) \ +SRESTYPE sv_proc_t::rv##fname (SLHSTYPE const & lhs, SRHSTYPE const & rhs) \ +{ \ + uint8_t bitwidth = _insn->src_bitwidth; \ + LHSTYPE vlhs = 0; \ + RHSTYPE vrhs = 0; \ + if (rv_int_op_prepare(lhs, rhs, vlhs, vrhs, bitwidth)) { \ + RESTYPE result = (lhs * rhs) >> 32; \ + fprintf(stderr, "%s result %lx %lx %lx\n", \ + xstr(fname), (LHSTYPE)lhs, (RHSTYPE)rhs, (RESTYPE)result); \ + return SRESTYPE(result); \ + } \ + uint8_t bw32 = std::min(bitwidth, (uint8_t)32); \ + RESTYPE result = (vlhs * vrhs) >> bw32; \ + result = zext_bwid(result, bw32); \ + fprintf(stderr, "%s result %lx %lx %lx bw %d\n", \ + xstr(fname), (LHSTYPE)lhs, (RHSTYPE)rhs, (RESTYPE)result, bitwidth); \ + return rv_int_op_finish(lhs, rhs, result, bitwidth); \ } -sv_sreg_t sv_proc_t::rv_mulh(sv_sreg_t const & lhs, sv_sreg_t const & rhs) -{ - uint8_t bitwidth = _insn->src_bitwidth; - int64_t vlhs = 0; - int64_t vrhs = 0; - if (rv_int_op_prepare(lhs, rhs, vlhs, vrhs, bitwidth)) { - sv_sreg_t result = (lhs * rhs) >> 32; - fprintf(stderr, "mulh result %lx %lx %lx\n", - (int64_t)lhs, (int64_t)rhs, (int64_t)result); - return result; - } - uint8_t bw32 = std::min(bitwidth, (uint8_t)32); - int64_t result = (vlhs * vrhs) >> bw32; - result = sext_bwid(result, bw32); - fprintf(stderr, "mulh result %lx %lx %lx bw %d\n", - (int64_t)lhs, (int64_t)rhs, (int64_t)(result), bitwidth); - return rv_int_op_finish(lhs, rhs, result, bitwidth); -} +OP_MULH_FN(_mulhu , sv_reg_t, sv_reg_t, sv_reg_t, uint64_t, uint64_t, uint64_t ) +OP_MULH_FN(_mulhsu, sv_sreg_t, sv_reg_t, sv_sreg_t, int64_t, uint64_t, int64_t ) +OP_MULH_FN(_mulh , sv_sreg_t, sv_sreg_t, sv_sreg_t, int64_t, int64_t, int64_t ) /* 64-bit mulh/mulhu/mulhsu */ sv_sreg_t (sv_proc_t::mulhsu)(sv_sreg_t const& a, sv_reg_t const& b) -- 2.30.2