haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target-arm/neon_helper.c: Use make_float32/float32_val macros

Browse source 
Use the softfloat make_float32 and float32_val macros to convert between
softfloat's float32 type and raw uint32_t types, rather than private
conversion functions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Nathan Froyd <froydnj@codesourcery.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Peter Maydell 2011-03-11 08:12:21 +00:00 committed by Aurelien Jarno
parent 1056c02b7b
commit 51d852672c
1 changed files with 17 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
target-arm/neon_helper.c
View file

@ -21,29 +21,6 @@
static float_status neon_float_status; static float_status neon_float_status;
#define NFS &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) \ #define NEON_TYPE1(name, type) \
typedef struct \ typedef struct \
{ \ { \
@ -1796,50 +1773,51 @@ uint32_t HELPER(neon_qneg_s32)(CPUState *env, uint32_t x)
/* NEON Float helpers. */ /* NEON Float helpers. */
uint32_t HELPER(neon_min_f32)(uint32_t a, uint32_t b) uint32_t HELPER(neon_min_f32)(uint32_t a, uint32_t b)
{ {
float32 f0 = vfp_itos(a); float32 f0 = make_float32(a);
float32 f1 = vfp_itos(b); float32 f1 = make_float32(b);
return (float32_compare_quiet(f0, f1, NFS) == -1) ? a : b; return (float32_compare_quiet(f0, f1, NFS) == -1) ? a : b;
} }
uint32_t HELPER(neon_max_f32)(uint32_t a, uint32_t b) uint32_t HELPER(neon_max_f32)(uint32_t a, uint32_t b)
{ {
float32 f0 = vfp_itos(a); float32 f0 = make_float32(a);
float32 f1 = vfp_itos(b); float32 f1 = make_float32(b);
return (float32_compare_quiet(f0, f1, NFS) == 1) ? a : b; return (float32_compare_quiet(f0, f1, NFS) == 1) ? a : b;
} }
uint32_t HELPER(neon_abd_f32)(uint32_t a, uint32_t b) uint32_t HELPER(neon_abd_f32)(uint32_t a, uint32_t b)
{ {
float32 f0 = vfp_itos(a); float32 f0 = make_float32(a);
float32 f1 = vfp_itos(b); float32 f1 = make_float32(b);
return vfp_stoi((float32_compare_quiet(f0, f1, NFS) == 1) return float32_val((float32_compare_quiet(f0, f1, NFS) == 1)
? float32_sub(f0, f1, NFS) ? float32_sub(f0, f1, NFS)
: float32_sub(f1, f0, NFS)); : float32_sub(f1, f0, NFS));
} }
uint32_t HELPER(neon_add_f32)(uint32_t a, uint32_t b) 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) 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) 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. */ /* Floating point comparisons produce an integer result. */
#define NEON_VOP_FCMP(name, cmp) \ #define NEON_VOP_FCMP(name, cmp) \
uint32_t HELPER(neon_##name)(uint32_t a, uint32_t b) \ 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; \ return ~0; \
else \ } else { \
return 0; \ return 0; \
} \
} }
NEON_VOP_FCMP(ceq_f32, ==) 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) uint32_t HELPER(neon_acge_f32)(uint32_t a, uint32_t b)
{ {
float32 f0 = float32_abs(vfp_itos(a)); float32 f0 = float32_abs(make_float32(a));
float32 f1 = float32_abs(vfp_itos(b)); float32 f1 = float32_abs(make_float32(b));
return (float32_compare_quiet(f0, f1,NFS) >= 0) ? ~0 : 0; return (float32_compare_quiet(f0, f1,NFS) >= 0) ? ~0 : 0;
} }
uint32_t HELPER(neon_acgt_f32)(uint32_t a, uint32_t b) uint32_t HELPER(neon_acgt_f32)(uint32_t a, uint32_t b)
{ {
float32 f0 = float32_abs(vfp_itos(a)); float32 f0 = float32_abs(make_float32(a));
float32 f1 = float32_abs(vfp_itos(b)); float32 f1 = float32_abs(make_float32(b));
return (float32_compare_quiet(f0, f1, NFS) > 0) ? ~0 : 0; return (float32_compare_quiet(f0, f1, NFS) > 0) ? ~0 : 0;
} }