summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target-arm/neon_helper.c56
1 files changed, 17 insertions, 39 deletions
diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c
index 002a9c11a6..2108664adc 100644
--- a/target-arm/neon_helper.c
+++ b/target-arm/neon_helper.c
@@ -21,29 +21,6 @@
static float_status neon_float_status;
#define NFS &neon_float_status
-/* Helper routines to perform bitwise copies between float and int. */
-static inline float32 vfp_itos(uint32_t i)
-{
- union {
- uint32_t i;
- float32 s;
- } v;
-
- v.i = i;
- return v.s;
-}
-
-static inline uint32_t vfp_stoi(float32 s)
-{
- union {
- uint32_t i;
- float32 s;
- } v;
-
- v.s = s;
- return v.i;
-}
-
#define NEON_TYPE1(name, type) \
typedef struct \
{ \
@@ -1796,50 +1773,51 @@ uint32_t HELPER(neon_qneg_s32)(CPUState *env, uint32_t x)
/* NEON Float helpers. */
uint32_t HELPER(neon_min_f32)(uint32_t a, uint32_t b)
{
- float32 f0 = vfp_itos(a);
- float32 f1 = vfp_itos(b);
+ float32 f0 = make_float32(a);
+ float32 f1 = make_float32(b);
return (float32_compare_quiet(f0, f1, NFS) == -1) ? a : b;
}
uint32_t HELPER(neon_max_f32)(uint32_t a, uint32_t b)
{
- float32 f0 = vfp_itos(a);
- float32 f1 = vfp_itos(b);
+ float32 f0 = make_float32(a);
+ float32 f1 = make_float32(b);
return (float32_compare_quiet(f0, f1, NFS) == 1) ? a : b;
}
uint32_t HELPER(neon_abd_f32)(uint32_t a, uint32_t b)
{
- float32 f0 = vfp_itos(a);
- float32 f1 = vfp_itos(b);
- return vfp_stoi((float32_compare_quiet(f0, f1, NFS) == 1)
+ float32 f0 = make_float32(a);
+ float32 f1 = make_float32(b);
+ return float32_val((float32_compare_quiet(f0, f1, NFS) == 1)
? float32_sub(f0, f1, NFS)
: float32_sub(f1, f0, NFS));
}
uint32_t HELPER(neon_add_f32)(uint32_t a, uint32_t b)
{
- return vfp_stoi(float32_add(vfp_itos(a), vfp_itos(b), NFS));
+ return float32_val(float32_add(make_float32(a), make_float32(b), NFS));
}
uint32_t HELPER(neon_sub_f32)(uint32_t a, uint32_t b)
{
- return vfp_stoi(float32_sub(vfp_itos(a), vfp_itos(b), NFS));
+ return float32_val(float32_sub(make_float32(a), make_float32(b), NFS));
}
uint32_t HELPER(neon_mul_f32)(uint32_t a, uint32_t b)
{
- return vfp_stoi(float32_mul(vfp_itos(a), vfp_itos(b), NFS));
+ return float32_val(float32_mul(make_float32(a), make_float32(b), NFS));
}
/* Floating point comparisons produce an integer result. */
#define NEON_VOP_FCMP(name, cmp) \
uint32_t HELPER(neon_##name)(uint32_t a, uint32_t b) \
{ \
- if (float32_compare_quiet(vfp_itos(a), vfp_itos(b), NFS) cmp 0) \
+ if (float32_compare_quiet(make_float32(a), make_float32(b), NFS) cmp 0) { \
return ~0; \
- else \
+ } else { \
return 0; \
+ } \
}
NEON_VOP_FCMP(ceq_f32, ==)
@@ -1848,15 +1826,15 @@ NEON_VOP_FCMP(cgt_f32, >)
uint32_t HELPER(neon_acge_f32)(uint32_t a, uint32_t b)
{
- float32 f0 = float32_abs(vfp_itos(a));
- float32 f1 = float32_abs(vfp_itos(b));
+ float32 f0 = float32_abs(make_float32(a));
+ float32 f1 = float32_abs(make_float32(b));
return (float32_compare_quiet(f0, f1,NFS) >= 0) ? ~0 : 0;
}
uint32_t HELPER(neon_acgt_f32)(uint32_t a, uint32_t b)
{
- float32 f0 = float32_abs(vfp_itos(a));
- float32 f1 = float32_abs(vfp_itos(b));
+ float32 f0 = float32_abs(make_float32(a));
+ float32 f1 = float32_abs(make_float32(b));
return (float32_compare_quiet(f0, f1, NFS) > 0) ? ~0 : 0;
}