vfp_helper: Normalize tabs to spaces

This commit is contained in:
Lioncash 2015-02-09 09:32:56 -05:00
parent 4154560bd5
commit d832c48864

View File

@ -104,125 +104,125 @@
static inline u32 vfp_shiftright32jamming(u32 val, unsigned int shift) static inline u32 vfp_shiftright32jamming(u32 val, unsigned int shift)
{ {
if (shift) { if (shift) {
if (shift < 32) if (shift < 32)
val = val >> shift | ((val << (32 - shift)) != 0); val = val >> shift | ((val << (32 - shift)) != 0);
else else
val = val != 0; val = val != 0;
} }
return val; return val;
} }
static inline u64 vfp_shiftright64jamming(u64 val, unsigned int shift) static inline u64 vfp_shiftright64jamming(u64 val, unsigned int shift)
{ {
if (shift) { if (shift) {
if (shift < 64) if (shift < 64)
val = val >> shift | ((val << (64 - shift)) != 0); val = val >> shift | ((val << (64 - shift)) != 0);
else else
val = val != 0; val = val != 0;
} }
return val; return val;
} }
static inline u32 vfp_hi64to32jamming(u64 val) static inline u32 vfp_hi64to32jamming(u64 val)
{ {
u32 v; u32 v;
u32 highval = val >> 32; u32 highval = val >> 32;
u32 lowval = val & 0xffffffff; u32 lowval = val & 0xffffffff;
if (lowval >= 1) if (lowval >= 1)
v = highval | 1; v = highval | 1;
else else
v = highval; v = highval;
return v; return v;
} }
static inline void add128(u64 *resh, u64 *resl, u64 nh, u64 nl, u64 mh, u64 ml) static inline void add128(u64* resh, u64* resl, u64 nh, u64 nl, u64 mh, u64 ml)
{ {
*resl = nl + ml; *resl = nl + ml;
*resh = nh + mh; *resh = nh + mh;
if (*resl < nl) if (*resl < nl)
*resh += 1; *resh += 1;
} }
static inline void sub128(u64 *resh, u64 *resl, u64 nh, u64 nl, u64 mh, u64 ml) static inline void sub128(u64* resh, u64* resl, u64 nh, u64 nl, u64 mh, u64 ml)
{ {
*resl = nl - ml; *resl = nl - ml;
*resh = nh - mh; *resh = nh - mh;
if (*resl > nl) if (*resl > nl)
*resh -= 1; *resh -= 1;
} }
static inline void mul64to128(u64 *resh, u64 *resl, u64 n, u64 m) static inline void mul64to128(u64* resh, u64* resl, u64 n, u64 m)
{ {
u32 nh, nl, mh, ml; u32 nh, nl, mh, ml;
u64 rh, rma, rmb, rl; u64 rh, rma, rmb, rl;
nl = n; nl = n;
ml = m; ml = m;
rl = (u64)nl * ml; rl = (u64)nl * ml;
nh = n >> 32; nh = n >> 32;
rma = (u64)nh * ml; rma = (u64)nh * ml;
mh = m >> 32; mh = m >> 32;
rmb = (u64)nl * mh; rmb = (u64)nl * mh;
rma += rmb; rma += rmb;
rh = (u64)nh * mh; rh = (u64)nh * mh;
rh += ((u64)(rma < rmb) << 32) + (rma >> 32); rh += ((u64)(rma < rmb) << 32) + (rma >> 32);
rma <<= 32; rma <<= 32;
rl += rma; rl += rma;
rh += (rl < rma); rh += (rl < rma);
*resl = rl; *resl = rl;
*resh = rh; *resh = rh;
} }
static inline void shift64left(u64 *resh, u64 *resl, u64 n) static inline void shift64left(u64* resh, u64* resl, u64 n)
{ {
*resh = n >> 63; *resh = n >> 63;
*resl = n << 1; *resl = n << 1;
} }
static inline u64 vfp_hi64multiply64(u64 n, u64 m) static inline u64 vfp_hi64multiply64(u64 n, u64 m)
{ {
u64 rh, rl; u64 rh, rl;
mul64to128(&rh, &rl, n, m); mul64to128(&rh, &rl, n, m);
return rh | (rl != 0); return rh | (rl != 0);
} }
static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m) static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m)
{ {
u64 mh, ml, remh, reml, termh, terml, z; u64 mh, ml, remh, reml, termh, terml, z;
if (nh >= m) if (nh >= m)
return ~0ULL; return ~0ULL;
mh = m >> 32; mh = m >> 32;
if (mh << 32 <= nh) { if (mh << 32 <= nh) {
z = 0xffffffff00000000ULL; z = 0xffffffff00000000ULL;
} else { } else {
z = nh; z = nh;
do_div(z, mh); do_div(z, mh);
z <<= 32; z <<= 32;
} }
mul64to128(&termh, &terml, m, z); mul64to128(&termh, &terml, m, z);
sub128(&remh, &reml, nh, nl, termh, terml); sub128(&remh, &reml, nh, nl, termh, terml);
ml = m << 32; ml = m << 32;
while ((s64)remh < 0) { while ((s64)remh < 0) {
z -= 0x100000000ULL; z -= 0x100000000ULL;
add128(&remh, &reml, remh, reml, mh, ml); add128(&remh, &reml, remh, reml, mh, ml);
} }
remh = (remh << 32) | (reml >> 32); remh = (remh << 32) | (reml >> 32);
if (mh << 32 <= remh) { if (mh << 32 <= remh) {
z |= 0xffffffff; z |= 0xffffffff;
} else { } else {
do_div(remh, mh); do_div(remh, mh);
z |= remh; z |= remh;
} }
return z; return z;
} }
/* /*
@ -234,9 +234,9 @@ static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m)
* Single-precision * Single-precision
*/ */
struct vfp_single { struct vfp_single {
s16 exponent; s16 exponent;
u16 sign; u16 sign;
u32 significand; u32 significand;
}; };
/* /*
@ -271,16 +271,16 @@ struct vfp_single {
*/ */
static inline void vfp_single_unpack(struct vfp_single *s, s32 val) static inline void vfp_single_unpack(struct vfp_single *s, s32 val)
{ {
u32 significand; u32 significand;
s->sign = vfp_single_packed_sign(val) >> 16, s->sign = vfp_single_packed_sign(val) >> 16,
s->exponent = vfp_single_packed_exponent(val); s->exponent = vfp_single_packed_exponent(val);
significand = (u32) val; significand = (u32) val;
significand = (significand << (32 - VFP_SINGLE_MANTISSA_BITS)) >> 2; significand = (significand << (32 - VFP_SINGLE_MANTISSA_BITS)) >> 2;
if (s->exponent && s->exponent != 255) if (s->exponent && s->exponent != 255)
significand |= 0x40000000; significand |= 0x40000000;
s->significand = significand; s->significand = significand;
} }
/* /*
@ -289,11 +289,10 @@ static inline void vfp_single_unpack(struct vfp_single *s, s32 val)
*/ */
static inline s32 vfp_single_pack(struct vfp_single *s) static inline s32 vfp_single_pack(struct vfp_single *s)
{ {
u32 val; u32 val = (s->sign << 16) +
val = (s->sign << 16) + (s->exponent << VFP_SINGLE_MANTISSA_BITS) +
(s->exponent << VFP_SINGLE_MANTISSA_BITS) + (s->significand >> VFP_SINGLE_LOW_BITS);
(s->significand >> VFP_SINGLE_LOW_BITS); return (s32)val;
return (s32)val;
} }
#define VFP_NUMBER (1<<0) #define VFP_NUMBER (1<<0)
@ -308,21 +307,21 @@ static inline s32 vfp_single_pack(struct vfp_single *s)
static inline int vfp_single_type(struct vfp_single *s) static inline int vfp_single_type(struct vfp_single *s)
{ {
int type = VFP_NUMBER; int type = VFP_NUMBER;
if (s->exponent == 255) { if (s->exponent == 255) {
if (s->significand == 0) if (s->significand == 0)
type = VFP_INFINITY; type = VFP_INFINITY;
else if (s->significand & VFP_SINGLE_SIGNIFICAND_QNAN) else if (s->significand & VFP_SINGLE_SIGNIFICAND_QNAN)
type = VFP_QNAN; type = VFP_QNAN;
else else
type = VFP_SNAN; type = VFP_SNAN;
} else if (s->exponent == 0) { } else if (s->exponent == 0) {
if (s->significand == 0) if (s->significand == 0)
type |= VFP_ZERO; type |= VFP_ZERO;
else else
type |= VFP_DENORMAL; type |= VFP_DENORMAL;
} }
return type; return type;
} }
@ -332,9 +331,9 @@ u32 vfp_single_normaliseround(ARMul_State* state, int sd, struct vfp_single *vs,
* Double-precision * Double-precision
*/ */
struct vfp_double { struct vfp_double {
s16 exponent; s16 exponent;
u16 sign; u16 sign;
u64 significand; u64 significand;
}; };
/* /*
@ -374,16 +373,16 @@ struct vfp_double {
*/ */
static inline void vfp_double_unpack(struct vfp_double *s, s64 val) static inline void vfp_double_unpack(struct vfp_double *s, s64 val)
{ {
u64 significand; u64 significand;
s->sign = vfp_double_packed_sign(val) >> 48; s->sign = vfp_double_packed_sign(val) >> 48;
s->exponent = vfp_double_packed_exponent(val); s->exponent = vfp_double_packed_exponent(val);
significand = (u64) val; significand = (u64) val;
significand = (significand << (64 - VFP_DOUBLE_MANTISSA_BITS)) >> 2; significand = (significand << (64 - VFP_DOUBLE_MANTISSA_BITS)) >> 2;
if (s->exponent && s->exponent != 2047) if (s->exponent && s->exponent != 2047)
significand |= (1ULL << 62); significand |= (1ULL << 62);
s->significand = significand; s->significand = significand;
} }
/* /*
@ -392,30 +391,29 @@ static inline void vfp_double_unpack(struct vfp_double *s, s64 val)
*/ */
static inline s64 vfp_double_pack(struct vfp_double *s) static inline s64 vfp_double_pack(struct vfp_double *s)
{ {
u64 val; u64 val = ((u64)s->sign << 48) +
val = ((u64)s->sign << 48) + ((u64)s->exponent << VFP_DOUBLE_MANTISSA_BITS) +
((u64)s->exponent << VFP_DOUBLE_MANTISSA_BITS) + (s->significand >> VFP_DOUBLE_LOW_BITS);
(s->significand >> VFP_DOUBLE_LOW_BITS); return (s64)val;
return (s64)val;
} }
static inline int vfp_double_type(struct vfp_double *s) static inline int vfp_double_type(struct vfp_double *s)
{ {
int type = VFP_NUMBER; int type = VFP_NUMBER;
if (s->exponent == 2047) { if (s->exponent == 2047) {
if (s->significand == 0) if (s->significand == 0)
type = VFP_INFINITY; type = VFP_INFINITY;
else if (s->significand & VFP_DOUBLE_SIGNIFICAND_QNAN) else if (s->significand & VFP_DOUBLE_SIGNIFICAND_QNAN)
type = VFP_QNAN; type = VFP_QNAN;
else else
type = VFP_SNAN; type = VFP_SNAN;
} else if (s->exponent == 0) { } else if (s->exponent == 0) {
if (s->significand == 0) if (s->significand == 0)
type |= VFP_ZERO; type |= VFP_ZERO;
else else
type |= VFP_DENORMAL; type |= VFP_DENORMAL;
} }
return type; return type;
} }
u32 vfp_double_normaliseround(ARMul_State* state, int dd, struct vfp_double *vd, u32 fpscr, u32 exceptions, const char *func); u32 vfp_double_normaliseround(ARMul_State* state, int dd, struct vfp_double *vd, u32 fpscr, u32 exceptions, const char *func);
@ -448,37 +446,37 @@ u32 vfp_estimate_sqrt_significand(u32 exponent, u32 significand);
#define OP_SM (1 << 2) #define OP_SM (1 << 2)
struct op { struct op {
u32 (* const fn)(ARMul_State* state, int dd, int dn, int dm, u32 fpscr); u32 (* const fn)(ARMul_State* state, int dd, int dn, int dm, u32 fpscr);
u32 flags; u32 flags;
}; };
static inline u32 fls(ARMword x) static inline u32 fls(ARMword x)
{ {
int r = 32; int r = 32;
if (!x) if (!x)
return 0; return 0;
if (!(x & 0xffff0000u)) { if (!(x & 0xffff0000u)) {
x <<= 16; x <<= 16;
r -= 16; r -= 16;
} }
if (!(x & 0xff000000u)) { if (!(x & 0xff000000u)) {
x <<= 8; x <<= 8;
r -= 8; r -= 8;
} }
if (!(x & 0xf0000000u)) { if (!(x & 0xf0000000u)) {
x <<= 4; x <<= 4;
r -= 4; r -= 4;
} }
if (!(x & 0xc0000000u)) { if (!(x & 0xc0000000u)) {
x <<= 2; x <<= 2;
r -= 2; r -= 2;
} }
if (!(x & 0x80000000u)) { if (!(x & 0x80000000u)) {
x <<= 1; x <<= 1;
r -= 1; r -= 1;
} }
return r; return r;
} }