[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/27] target/arm: Split out flags setting from vfp c
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 22/27] target/arm: Split out flags setting from vfp compares |
Date: |
Thu, 14 Feb 2019 19:05:58 +0000 |
From: Richard Henderson <address@hidden>
Minimize the code within a macro by splitting out a helper function.
Use deposit32 instead of manual bit manipulation.
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/helper.c | 45 +++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 8eedce113c1..28e45f0f0ba 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -12871,31 +12871,40 @@ float64 VFP_HELPER(sqrt, d)(float64 a, CPUARMState
*env)
return float64_sqrt(a, &env->vfp.fp_status);
}
+static void softfloat_to_vfp_compare(CPUARMState *env, int cmp)
+{
+ uint32_t flags;
+ switch (cmp) {
+ case float_relation_equal:
+ flags = 0x6;
+ break;
+ case float_relation_less:
+ flags = 0x8;
+ break;
+ case float_relation_greater:
+ flags = 0x2;
+ break;
+ case float_relation_unordered:
+ flags = 0x3;
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ env->vfp.xregs[ARM_VFP_FPSCR] =
+ deposit32(env->vfp.xregs[ARM_VFP_FPSCR], 28, 4, flags);
+}
+
/* XXX: check quiet/signaling case */
#define DO_VFP_cmp(p, type) \
void VFP_HELPER(cmp, p)(type a, type b, CPUARMState *env) \
{ \
- uint32_t flags; \
- switch(type ## _compare_quiet(a, b, &env->vfp.fp_status)) { \
- case 0: flags = 0x6; break; \
- case -1: flags = 0x8; break; \
- case 1: flags = 0x2; break; \
- default: case 2: flags = 0x3; break; \
- } \
- env->vfp.xregs[ARM_VFP_FPSCR] = (flags << 28) \
- | (env->vfp.xregs[ARM_VFP_FPSCR] & 0x0fffffff); \
+ softfloat_to_vfp_compare(env, \
+ type ## _compare_quiet(a, b, &env->vfp.fp_status)); \
} \
void VFP_HELPER(cmpe, p)(type a, type b, CPUARMState *env) \
{ \
- uint32_t flags; \
- switch(type ## _compare(a, b, &env->vfp.fp_status)) { \
- case 0: flags = 0x6; break; \
- case -1: flags = 0x8; break; \
- case 1: flags = 0x2; break; \
- default: case 2: flags = 0x3; break; \
- } \
- env->vfp.xregs[ARM_VFP_FPSCR] = (flags << 28) \
- | (env->vfp.xregs[ARM_VFP_FPSCR] & 0x0fffffff); \
+ softfloat_to_vfp_compare(env, \
+ type ## _compare(a, b, &env->vfp.fp_status)); \
}
DO_VFP_cmp(s, float32)
DO_VFP_cmp(d, float64)
--
2.20.1
- [Qemu-devel] [PULL 19/27] target/arm: Remove neon min/max helpers, (continued)
- [Qemu-devel] [PULL 22/27] target/arm: Split out flags setting from vfp compares,
Peter Maydell <=
- [Qemu-devel] [PULL 18/27] target/arm: Use tcg integer min/max primitives for neon, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 23/27] target/arm: Fix set of bits kept in xregs[ARM_VFP_FPSCR], Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 17/27] target/arm: Use vector minmax expanders for aarch32, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 21/27] target/arm: Fix arm_cpu_dump_state vs FPSCR, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 20/27] target/arm: Fix vfp_gdb_get/set_reg vs FPSCR, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 16/27] target/arm: Use vector minmax expanders for aarch64, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 27/27] gdbstub: Send a reply to the vKill packet., Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 25/27] target/arm: Use vector operations for saturation, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 26/27] target/arm: Add missing clear_tail calls, Peter Maydell, 2019/02/14
- [Qemu-devel] [PULL 24/27] target/arm: Split out FPSCR.QC to a vector field, Peter Maydell, 2019/02/14