From 8fe29be764bfb2b562ebf782b767619eaf45512f Mon Sep 17 00:00:00 2001 From: LIU Zhiwei Date: Mon, 8 Mar 2021 12:39:28 -0500 Subject: [PATCH] target/riscv: Clean up fmv.w.x Use tcg_gen_extu_tl_i64 to avoid the ifdef. Backports 6e0229e63868b8b5bfcc54959cea227ed19f7bd3 --- qemu/target/riscv/insn_trans/trans_rvf.inc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qemu/target/riscv/insn_trans/trans_rvf.inc.c b/qemu/target/riscv/insn_trans/trans_rvf.inc.c index 9b2de125..83d5ce90 100644 --- a/qemu/target/riscv/insn_trans/trans_rvf.inc.c +++ b/qemu/target/riscv/insn_trans/trans_rvf.inc.c @@ -454,11 +454,7 @@ static bool trans_fmv_w_x(DisasContext *ctx, arg_fmv_w_x *a) TCGv t0 = tcg_temp_new(tcg_ctx); gen_get_gpr(ctx, t0, a->rs1); -#if defined(TARGET_RISCV64) - tcg_gen_mov_i64(tcg_ctx, tcg_ctx->cpu_fpr_risc[a->rd], t0); -#else - tcg_gen_extu_i32_i64(tcg_ctx, tcg_ctx->cpu_fpr_risc[a->rd], t0); -#endif + tcg_gen_extu_tl_i64(tcg_ctx, tcg_ctx->cpu_fpr_risc[a->rd], t0); gen_nanbox_s(ctx, tcg_ctx->cpu_fpr_risc[a->rd], tcg_ctx->cpu_fpr_risc[a->rd]); mark_fs_dirty(ctx);