123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153 |
- From 0139ed25d8f0ebc592e8bd6fb78842e6e2b37be2 Mon Sep 17 00:00:00 2001
- From: Frank Chang <frank.chang@sifive.com>
- Date: Mon, 11 Jan 2021 23:31:49 +0800
- Subject: [PATCH 092/107] target/riscv: add gen_shifti() and gen_shiftiw()
- helper functions
- Add gen_shifti() and gen_shiftiw() helper functions to reuse the same
- interfaces for immediate shift instructions.
- Signed-off-by: Frank Chang <frank.chang@sifive.com>
- Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
- ---
- target/riscv/insn_trans/trans_rvi.c.inc | 54 ++-----------------------
- target/riscv/translate.c | 43 ++++++++++++++++++++
- 2 files changed, 47 insertions(+), 50 deletions(-)
- diff --git a/target/riscv/insn_trans/trans_rvi.c.inc b/target/riscv/insn_trans/trans_rvi.c.inc
- index d04ca0394c..7b89420184 100644
- --- a/target/riscv/insn_trans/trans_rvi.c.inc
- +++ b/target/riscv/insn_trans/trans_rvi.c.inc
- @@ -261,54 +261,17 @@ static bool trans_andi(DisasContext *ctx, arg_andi *a)
- }
- static bool trans_slli(DisasContext *ctx, arg_slli *a)
- {
- - if (a->shamt >= TARGET_LONG_BITS) {
- - return false;
- - }
- -
- - if (a->rd != 0) {
- - TCGv t = tcg_temp_new();
- - gen_get_gpr(t, a->rs1);
- -
- - tcg_gen_shli_tl(t, t, a->shamt);
- -
- - gen_set_gpr(a->rd, t);
- - tcg_temp_free(t);
- - } /* NOP otherwise */
- - return true;
- + return gen_shifti(ctx, a, tcg_gen_shl_tl);
- }
-
- static bool trans_srli(DisasContext *ctx, arg_srli *a)
- {
- - if (a->shamt >= TARGET_LONG_BITS) {
- - return false;
- - }
- -
- - if (a->rd != 0) {
- - TCGv t = tcg_temp_new();
- - gen_get_gpr(t, a->rs1);
- -
- - tcg_gen_shri_tl(t, t, a->shamt);
- - gen_set_gpr(a->rd, t);
- - tcg_temp_free(t);
- - } /* NOP otherwise */
- - return true;
- + return gen_shifti(ctx, a, tcg_gen_shr_tl);
- }
-
- static bool trans_srai(DisasContext *ctx, arg_srai *a)
- {
- - if (a->shamt >= TARGET_LONG_BITS) {
- - return false;
- - }
- -
- - if (a->rd != 0) {
- - TCGv t = tcg_temp_new();
- - gen_get_gpr(t, a->rs1);
- -
- - tcg_gen_sari_tl(t, t, a->shamt);
- - gen_set_gpr(a->rd, t);
- - tcg_temp_free(t);
- - } /* NOP otherwise */
- - return true;
- + return gen_shifti(ctx, a, tcg_gen_sar_tl);
- }
-
- static bool trans_add(DisasContext *ctx, arg_add *a)
- @@ -369,16 +332,7 @@ static bool trans_addiw(DisasContext *ctx, arg_addiw *a)
-
- static bool trans_slliw(DisasContext *ctx, arg_slliw *a)
- {
- - TCGv source1;
- - source1 = tcg_temp_new();
- - gen_get_gpr(source1, a->rs1);
- -
- - tcg_gen_shli_tl(source1, source1, a->shamt);
- - tcg_gen_ext32s_tl(source1, source1);
- - gen_set_gpr(a->rd, source1);
- -
- - tcg_temp_free(source1);
- - return true;
- + return gen_shiftiw(ctx, a, tcg_gen_shl_tl);
- }
-
- static bool trans_srliw(DisasContext *ctx, arg_srliw *a)
- diff --git a/target/riscv/translate.c b/target/riscv/translate.c
- index 0152deef67..a6e50f77d4 100644
- --- a/target/riscv/translate.c
- +++ b/target/riscv/translate.c
- @@ -709,6 +709,49 @@ static uint32_t opcode_at(DisasContextBase *dcbase, target_ulong pc)
- return cpu_ldl_code(env, pc);
- }
-
- +static bool gen_shifti(DisasContext *ctx, arg_shift *a,
- + void(*func)(TCGv, TCGv, TCGv))
- +{
- + if (a->shamt >= TARGET_LONG_BITS) {
- + return false;
- + }
- +
- + TCGv source1 = tcg_temp_new();
- + TCGv source2 = tcg_temp_new();
- +
- + gen_get_gpr(source1, a->rs1);
- +
- + tcg_gen_movi_tl(source2, a->shamt);
- + (*func)(source1, source1, source2);
- +
- + gen_set_gpr(a->rd, source1);
- + tcg_temp_free(source1);
- + tcg_temp_free(source2);
- + return true;
- +}
- +
- +#ifdef TARGET_RISCV64
- +
- +static bool gen_shiftiw(DisasContext *ctx, arg_shift *a,
- + void(*func)(TCGv, TCGv, TCGv))
- +{
- + TCGv source1 = tcg_temp_new();
- + TCGv source2 = tcg_temp_new();
- +
- + gen_get_gpr(source1, a->rs1);
- + tcg_gen_movi_tl(source2, a->shamt);
- +
- + (*func)(source1, source1, source2);
- + tcg_gen_ext32s_tl(source1, source1);
- +
- + gen_set_gpr(a->rd, source1);
- + tcg_temp_free(source1);
- + tcg_temp_free(source2);
- + return true;
- +}
- +
- +#endif
- +
- static void gen_ctz(TCGv ret, TCGv arg1)
- {
- tcg_gen_ctzi_tl(ret, arg1, TARGET_LONG_BITS);
- --
- 2.33.1
|