diff options
| author | Andrew Waterman <andrew@sifive.com> | 2023-04-19 13:49:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 13:49:37 -0700 |
| commit | 3f7937e25ad051dd0c65da8461d209f3cf00a4cf (patch) | |
| tree | 1c1fab376c006907f093609e63604300cf0b8f05 | |
| parent | 1c2d53a3fcf2127c1768e8b1bb9e3f3328bbd8bb (diff) | |
| parent | 808fa1cab1abb2e339d6ed3cbd975418f7bb9b28 (diff) | |
| download | riscv-isa-sim-3f7937e25ad051dd0c65da8461d209f3cf00a4cf.zip riscv-isa-sim-3f7937e25ad051dd0c65da8461d209f3cf00a4cf.tar.gz riscv-isa-sim-3f7937e25ad051dd0c65da8461d209f3cf00a4cf.tar.bz2 | |
Merge pull request #1326 from riscv-software-src/fix-1325
Avoid declaring potentially out-of-bounds references in vmfeq etc.
| -rw-r--r-- | riscv/v_ext_macros.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/riscv/v_ext_macros.h b/riscv/v_ext_macros.h index 0954d22..a0d8322 100644 --- a/riscv/v_ext_macros.h +++ b/riscv/v_ext_macros.h @@ -341,12 +341,12 @@ static inline bool is_aligned(const unsigned val, const unsigned pos) type_usew_t<x>::type vs2 = P.VU.elt<type_usew_t<x>::type>(rs2_num, i); #define VV_PARAMS(x) \ - type_sew_t<x>::type UNUSED &vd = P.VU.elt<type_sew_t<x>::type>(rd_num, i, true); \ + type_sew_t<x>::type &vd = P.VU.elt<type_sew_t<x>::type>(rd_num, i, true); \ type_sew_t<x>::type vs1 = P.VU.elt<type_sew_t<x>::type>(rs1_num, i); \ type_sew_t<x>::type UNUSED vs2 = P.VU.elt<type_sew_t<x>::type>(rs2_num, i); #define VX_PARAMS(x) \ - type_sew_t<x>::type UNUSED &vd = P.VU.elt<type_sew_t<x>::type>(rd_num, i, true); \ + type_sew_t<x>::type &vd = P.VU.elt<type_sew_t<x>::type>(rd_num, i, true); \ type_sew_t<x>::type rs1 = (type_sew_t<x>::type)RS1; \ type_sew_t<x>::type UNUSED vs2 = P.VU.elt<type_sew_t<x>::type>(rs2_num, i); @@ -442,16 +442,22 @@ static inline bool is_aligned(const unsigned val, const unsigned pos) float##width##_t &vd = P.VU.elt<float##width##_t>(rd_num, i, true); \ float##width##_t vs2 = P.VU.elt<float##width##_t>(rs2_num, i); -#define VFP_VV_PARAMS(width) \ - float##width##_t UNUSED &vd = P.VU.elt<float##width##_t>(rd_num, i, true); \ +#define VFP_VV_CMP_PARAMS(width) \ float##width##_t vs1 = P.VU.elt<float##width##_t>(rs1_num, i); \ float##width##_t vs2 = P.VU.elt<float##width##_t>(rs2_num, i); -#define VFP_VF_PARAMS(width) \ - float##width##_t UNUSED &vd = P.VU.elt<float##width##_t>(rd_num, i, true); \ +#define VFP_VV_PARAMS(width) \ + float##width##_t &vd = P.VU.elt<float##width##_t>(rd_num, i, true); \ + VFP_VV_CMP_PARAMS(width) + +#define VFP_VF_CMP_PARAMS(width) \ float##width##_t rs1 = f##width(READ_FREG(rs1_num)); \ float##width##_t vs2 = P.VU.elt<float##width##_t>(rs2_num, i); +#define VFP_VF_PARAMS(width) \ + float##width##_t &vd = P.VU.elt<float##width##_t>(rd_num, i, true); \ + VFP_VF_CMP_PARAMS(width) + #define CVT_FP_TO_FP_PARAMS(from_width, to_width) \ auto vs2 = P.VU.elt<float##from_width##_t>(rs2_num, i); \ auto &vd = P.VU.elt<float##to_width##_t>(rd_num, i, true); @@ -1739,19 +1745,19 @@ reg_t index[P.VU.vlmax]; \ VI_VFP_LOOP_CMP_BASE \ switch (P.VU.vsew) { \ case e16: { \ - VFP_VV_PARAMS(16); \ + VFP_VV_CMP_PARAMS(16); \ BODY16; \ set_fp_exceptions; \ break; \ } \ case e32: { \ - VFP_VV_PARAMS(32); \ + VFP_VV_CMP_PARAMS(32); \ BODY32; \ set_fp_exceptions; \ break; \ } \ case e64: { \ - VFP_VV_PARAMS(64); \ + VFP_VV_CMP_PARAMS(64); \ BODY64; \ set_fp_exceptions; \ break; \ @@ -1767,19 +1773,19 @@ reg_t index[P.VU.vlmax]; \ VI_VFP_LOOP_CMP_BASE \ switch (P.VU.vsew) { \ case e16: { \ - VFP_VF_PARAMS(16); \ + VFP_VF_CMP_PARAMS(16); \ BODY16; \ set_fp_exceptions; \ break; \ } \ case e32: { \ - VFP_VF_PARAMS(32); \ + VFP_VF_CMP_PARAMS(32); \ BODY32; \ set_fp_exceptions; \ break; \ } \ case e64: { \ - VFP_VF_PARAMS(64); \ + VFP_VF_CMP_PARAMS(64); \ BODY64; \ set_fp_exceptions; \ break; \ |