[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/22] target/arm: Restructure handle_fp_1src_{single
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 10/22] target/arm: Restructure handle_fp_1src_{single, double} |
Date: |
Tue, 5 Mar 2019 16:50:39 +0000 |
From: Richard Henderson <address@hidden>
This will allow sharing code that adjusts rmode beyond
the existing users.
Tested-by: Laurent Desnogues <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/translate-a64.c | 90 +++++++++++++++++++++-----------------
1 file changed, 49 insertions(+), 41 deletions(-)
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 0cfd07d3abd..90336318194 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -5688,55 +5688,59 @@ static void handle_fp_1src_half(DisasContext *s, int
opcode, int rd, int rn)
/* Floating-point data-processing (1 source) - single precision */
static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn)
{
+ void (*gen_fpst)(TCGv_i32, TCGv_i32, TCGv_ptr);
+ TCGv_i32 tcg_op, tcg_res;
TCGv_ptr fpst;
- TCGv_i32 tcg_op;
- TCGv_i32 tcg_res;
+ int rmode = -1;
- fpst = get_fpstatus_ptr(false);
tcg_op = read_fp_sreg(s, rn);
tcg_res = tcg_temp_new_i32();
switch (opcode) {
case 0x0: /* FMOV */
tcg_gen_mov_i32(tcg_res, tcg_op);
- break;
+ goto done;
case 0x1: /* FABS */
gen_helper_vfp_abss(tcg_res, tcg_op);
- break;
+ goto done;
case 0x2: /* FNEG */
gen_helper_vfp_negs(tcg_res, tcg_op);
- break;
+ goto done;
case 0x3: /* FSQRT */
gen_helper_vfp_sqrts(tcg_res, tcg_op, cpu_env);
- break;
+ goto done;
case 0x8: /* FRINTN */
case 0x9: /* FRINTP */
case 0xa: /* FRINTM */
case 0xb: /* FRINTZ */
case 0xc: /* FRINTA */
- {
- TCGv_i32 tcg_rmode = tcg_const_i32(arm_rmode_to_sf(opcode & 7));
-
- gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
- gen_helper_rints(tcg_res, tcg_op, fpst);
-
- gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
- tcg_temp_free_i32(tcg_rmode);
+ rmode = arm_rmode_to_sf(opcode & 7);
+ gen_fpst = gen_helper_rints;
break;
- }
case 0xe: /* FRINTX */
- gen_helper_rints_exact(tcg_res, tcg_op, fpst);
+ gen_fpst = gen_helper_rints_exact;
break;
case 0xf: /* FRINTI */
- gen_helper_rints(tcg_res, tcg_op, fpst);
+ gen_fpst = gen_helper_rints;
break;
default:
- abort();
+ g_assert_not_reached();
}
- write_fp_sreg(s, rd, tcg_res);
-
+ fpst = get_fpstatus_ptr(false);
+ if (rmode >= 0) {
+ TCGv_i32 tcg_rmode = tcg_const_i32(rmode);
+ gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
+ gen_fpst(tcg_res, tcg_op, fpst);
+ gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
+ tcg_temp_free_i32(tcg_rmode);
+ } else {
+ gen_fpst(tcg_res, tcg_op, fpst);
+ }
tcg_temp_free_ptr(fpst);
+
+ done:
+ write_fp_sreg(s, rd, tcg_res);
tcg_temp_free_i32(tcg_op);
tcg_temp_free_i32(tcg_res);
}
@@ -5744,9 +5748,10 @@ static void handle_fp_1src_single(DisasContext *s, int
opcode, int rd, int rn)
/* Floating-point data-processing (1 source) - double precision */
static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn)
{
+ void (*gen_fpst)(TCGv_i64, TCGv_i64, TCGv_ptr);
+ TCGv_i64 tcg_op, tcg_res;
TCGv_ptr fpst;
- TCGv_i64 tcg_op;
- TCGv_i64 tcg_res;
+ int rmode = -1;
switch (opcode) {
case 0x0: /* FMOV */
@@ -5754,48 +5759,51 @@ static void handle_fp_1src_double(DisasContext *s, int
opcode, int rd, int rn)
return;
}
- fpst = get_fpstatus_ptr(false);
tcg_op = read_fp_dreg(s, rn);
tcg_res = tcg_temp_new_i64();
switch (opcode) {
case 0x1: /* FABS */
gen_helper_vfp_absd(tcg_res, tcg_op);
- break;
+ goto done;
case 0x2: /* FNEG */
gen_helper_vfp_negd(tcg_res, tcg_op);
- break;
+ goto done;
case 0x3: /* FSQRT */
gen_helper_vfp_sqrtd(tcg_res, tcg_op, cpu_env);
- break;
+ goto done;
case 0x8: /* FRINTN */
case 0x9: /* FRINTP */
case 0xa: /* FRINTM */
case 0xb: /* FRINTZ */
case 0xc: /* FRINTA */
- {
- TCGv_i32 tcg_rmode = tcg_const_i32(arm_rmode_to_sf(opcode & 7));
-
- gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
- gen_helper_rintd(tcg_res, tcg_op, fpst);
-
- gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
- tcg_temp_free_i32(tcg_rmode);
+ rmode = arm_rmode_to_sf(opcode & 7);
+ gen_fpst = gen_helper_rintd;
break;
- }
case 0xe: /* FRINTX */
- gen_helper_rintd_exact(tcg_res, tcg_op, fpst);
+ gen_fpst = gen_helper_rintd_exact;
break;
case 0xf: /* FRINTI */
- gen_helper_rintd(tcg_res, tcg_op, fpst);
+ gen_fpst = gen_helper_rintd;
break;
default:
- abort();
+ g_assert_not_reached();
}
- write_fp_dreg(s, rd, tcg_res);
-
+ fpst = get_fpstatus_ptr(false);
+ if (rmode >= 0) {
+ TCGv_i32 tcg_rmode = tcg_const_i32(rmode);
+ gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
+ gen_fpst(tcg_res, tcg_op, fpst);
+ gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst);
+ tcg_temp_free_i32(tcg_rmode);
+ } else {
+ gen_fpst(tcg_res, tcg_op, fpst);
+ }
tcg_temp_free_ptr(fpst);
+
+ done:
+ write_fp_dreg(s, rd, tcg_res);
tcg_temp_free_i64(tcg_op);
tcg_temp_free_i64(tcg_res);
}
--
2.20.1
- [Qemu-devel] [PULL 01/22] target/arm: Fix PC test for LDM (exception return), (continued)
- [Qemu-devel] [PULL 01/22] target/arm: Fix PC test for LDM (exception return), Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 02/22] target/arm: Split out arm_sctlr, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 03/22] target/arm: Implement ARMv8.0-SB, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 06/22] target/arm: Add set/clear_pstate_bits, share gen_ss_advance, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 05/22] target/arm: Split helper_msr_i_pstate into 3, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 08/22] target/arm: Implement ARMv8.4-CondM, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 04/22] target/arm: Implement ARMv8.0-PredInv, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 09/22] target/arm: Implement ARMv8.5-CondM, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 11/22] target/arm: Implement ARMv8.5-FRINT, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 07/22] target/arm: Rearrange disas_data_proc_reg, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 10/22] target/arm: Restructure handle_fp_1src_{single, double},
Peter Maydell <=
- [Qemu-devel] [PULL 12/22] hw/arm/boot: introduce fdt_add_memory_node helper, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 13/22] hw/arm/virt: Rename highmem IO regions, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 14/22] hw/arm/virt: Split the memory map description, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 15/22] hw/boards: Add a MachineState parameter to kvm_type callback, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 17/22] vl: Set machine ram_size, maxram_size and ram_slots earlier, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 18/22] hw/arm/virt: Dynamic memory map depending on RAM requirements, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 19/22] hw/arm/virt: Implement kvm_type function for 4.0 machine, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 20/22] hw/arm/virt: Check the VCPU PA range in TCG mode, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 16/22] kvm: add kvm_arm_get_max_vm_ipa_size, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 22/22] hw/arm/stellaris: Implement watchdog timer, Peter Maydell, 2019/03/05