| Message ID | 20210709042608.883256-5-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/riscv: Use tcg_constant_* | expand |
On Fri, Jul 9, 2021 at 2:44 PM Richard Henderson <richard.henderson@linaro.org> wrote: > > Allocate new temps to hold the source extensions, and > extend directly from the source registers. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/translate.c | 46 +++++++++++++++++++--------------------- > 1 file changed, 22 insertions(+), 24 deletions(-) > > diff --git a/target/riscv/translate.c b/target/riscv/translate.c > index a60b198623..7dedfd548b 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -502,42 +502,40 @@ static void gen_mulw(TCGv ret, TCGv arg1, TCGv arg2) > static bool gen_arith_div_w(DisasContext *ctx, arg_r *a, > void(*func)(TCGv, TCGv, TCGv)) > { > - TCGv source1, source2; > - source1 = tcg_temp_new(); > - source2 = tcg_temp_new(); > + TCGv dest = gpr_dst(ctx, a->rd); > + TCGv src1 = gpr_src(ctx, a->rs1); > + TCGv src2 = gpr_src(ctx, a->rs2); > + TCGv ext1 = tcg_temp_new(); > + TCGv ext2 = tcg_temp_new(); > > - gen_get_gpr(source1, a->rs1); > - gen_get_gpr(source2, a->rs2); > - tcg_gen_ext32s_tl(source1, source1); > - tcg_gen_ext32s_tl(source2, source2); > + tcg_gen_ext32s_tl(ext1, src1); > + tcg_gen_ext32s_tl(ext2, src2); > > - (*func)(source1, source1, source2); > + (*func)(dest, ext1, ext2); > + tcg_temp_free(ext1); > + tcg_temp_free(ext2); > > - tcg_gen_ext32s_tl(source1, source1); > - gen_set_gpr(a->rd, source1); > - tcg_temp_free(source1); > - tcg_temp_free(source2); > + tcg_gen_ext32s_tl(dest, dest); > return true; > } > > static bool gen_arith_div_uw(DisasContext *ctx, arg_r *a, > void(*func)(TCGv, TCGv, TCGv)) > { > - TCGv source1, source2; > - source1 = tcg_temp_new(); > - source2 = tcg_temp_new(); > + TCGv dest = gpr_dst(ctx, a->rd); > + TCGv src1 = gpr_src(ctx, a->rs1); > + TCGv src2 = gpr_src(ctx, a->rs2); > + TCGv ext1 = tcg_temp_new(); > + TCGv ext2 = tcg_temp_new(); > > - gen_get_gpr(source1, a->rs1); > - gen_get_gpr(source2, a->rs2); > - tcg_gen_ext32u_tl(source1, source1); > - tcg_gen_ext32u_tl(source2, source2); > + tcg_gen_ext32u_tl(ext1, src1); > + tcg_gen_ext32u_tl(ext2, src2); > > - (*func)(source1, source1, source2); > + (*func)(dest, ext1, ext2); > + tcg_temp_free(ext1); > + tcg_temp_free(ext2); > > - tcg_gen_ext32s_tl(source1, source1); > - gen_set_gpr(a->rd, source1); > - tcg_temp_free(source1); > - tcg_temp_free(source2); > + tcg_gen_ext32s_tl(dest, dest); > return true; > } > > -- > 2.25.1 > >
diff --git a/target/riscv/translate.c b/target/riscv/translate.c index a60b198623..7dedfd548b 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -502,42 +502,40 @@ static void gen_mulw(TCGv ret, TCGv arg1, TCGv arg2) static bool gen_arith_div_w(DisasContext *ctx, arg_r *a, void(*func)(TCGv, TCGv, TCGv)) { - TCGv source1, source2; - source1 = tcg_temp_new(); - source2 = tcg_temp_new(); + TCGv dest = gpr_dst(ctx, a->rd); + TCGv src1 = gpr_src(ctx, a->rs1); + TCGv src2 = gpr_src(ctx, a->rs2); + TCGv ext1 = tcg_temp_new(); + TCGv ext2 = tcg_temp_new(); - gen_get_gpr(source1, a->rs1); - gen_get_gpr(source2, a->rs2); - tcg_gen_ext32s_tl(source1, source1); - tcg_gen_ext32s_tl(source2, source2); + tcg_gen_ext32s_tl(ext1, src1); + tcg_gen_ext32s_tl(ext2, src2); - (*func)(source1, source1, source2); + (*func)(dest, ext1, ext2); + tcg_temp_free(ext1); + tcg_temp_free(ext2); - tcg_gen_ext32s_tl(source1, source1); - gen_set_gpr(a->rd, source1); - tcg_temp_free(source1); - tcg_temp_free(source2); + tcg_gen_ext32s_tl(dest, dest); return true; } static bool gen_arith_div_uw(DisasContext *ctx, arg_r *a, void(*func)(TCGv, TCGv, TCGv)) { - TCGv source1, source2; - source1 = tcg_temp_new(); - source2 = tcg_temp_new(); + TCGv dest = gpr_dst(ctx, a->rd); + TCGv src1 = gpr_src(ctx, a->rs1); + TCGv src2 = gpr_src(ctx, a->rs2); + TCGv ext1 = tcg_temp_new(); + TCGv ext2 = tcg_temp_new(); - gen_get_gpr(source1, a->rs1); - gen_get_gpr(source2, a->rs2); - tcg_gen_ext32u_tl(source1, source1); - tcg_gen_ext32u_tl(source2, source2); + tcg_gen_ext32u_tl(ext1, src1); + tcg_gen_ext32u_tl(ext2, src2); - (*func)(source1, source1, source2); + (*func)(dest, ext1, ext2); + tcg_temp_free(ext1); + tcg_temp_free(ext2); - tcg_gen_ext32s_tl(source1, source1); - gen_set_gpr(a->rd, source1); - tcg_temp_free(source1); - tcg_temp_free(source2); + tcg_gen_ext32s_tl(dest, dest); return true; }
Allocate new temps to hold the source extensions, and extend directly from the source registers. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/riscv/translate.c | 46 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) -- 2.25.1