yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-08-04 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fpu: Replace uint32 typedef with uint32_t

Browse source 
Replace the uint32 softfloat-specific typedef with uint32_t.
This change was made with

find include hw fpu target-* -name '*.[ch]' | xargs sed -i -e 's/\buint32\b/uint32_t/g'

together with manual removal of the typedef definition,
manual undoing of various mis-hits, and another couple of
fixes found via test compilation.

All the uses in hw/ were using the wrong type by mistake.

Backports commit 3a87d00910ef64a2eece4aad25d96ea10683fc5c from qemu
This commit is contained in:
Peter Maydell 2018-02-19 00:28:52 -05:00 committed by Lioncash
parent 9712d8a7ac
commit 63ac282f1a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qemu/fpu/softfloat.c
View file

@ -1268,7 +1268,7 @@ float32 int32_to_float32(int32_t a, float_status *status)
float64 int32_to_float64(int32_t a, float_status *status) float64 int32_to_float64(int32_t a, float_status *status)
{ {
flag zSign; flag zSign;
uint32 absA; uint32_t absA;
int8 shiftCount; int8 shiftCount;
uint64_t zSig; uint64_t zSig;
@ -1291,7 +1291,7 @@ float64 int32_to_float64(int32_t a, float_status *status)
floatx80 int32_to_floatx80(int32_t a, float_status *status) floatx80 int32_to_floatx80(int32_t a, float_status *status)
{ {
flag zSign; flag zSign;
uint32 absA; uint32_t absA;
int8 shiftCount; int8 shiftCount;
uint64_t zSig; uint64_t zSig;
@ -1313,7 +1313,7 @@ floatx80 int32_to_floatx80(int32_t a, float_status *status)
float128 int32_to_float128(int32_t a, float_status *status) float128 int32_to_float128(int32_t a, float_status *status)
{ {
flag zSign; flag zSign;
uint32 absA; uint32_t absA;
int8 shiftCount; int8 shiftCount;
uint64_t zSig0; uint64_t zSig0;
@ -7080,10 +7080,10 @@ float64 uint32_to_float64(uint32_t a, float_status *status)
return int64_to_float64(a, status); return int64_to_float64(a, status);
} }
uint32 float32_to_uint32( float32 a, float_status *status ) uint32_t float32_to_uint32( float32 a, float_status *status )
{ {
int64_t v; int64_t v;
uint32 res; uint32_t res;
int old_exc_flags = get_float_exception_flags(status); int old_exc_flags = get_float_exception_flags(status);
v = float32_to_int64(a, status); v = float32_to_int64(a, status);
@ -7092,17 +7092,17 @@ uint32 float32_to_uint32( float32 a, float_status *status )
} else if (v > 0xffffffff) { } else if (v > 0xffffffff) {
res = 0xffffffff; res = 0xffffffff;
} else { } else {
return (uint32)v; return (uint32_t)v;
} }
set_float_exception_flags(old_exc_flags, status); set_float_exception_flags(old_exc_flags, status);
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return res; return res;
} }
uint32 float32_to_uint32_round_to_zero( float32 a, float_status *status ) uint32_t float32_to_uint32_round_to_zero( float32 a, float_status *status )
{ {
int64_t v; int64_t v;
uint32 res; uint32_t res;
int old_exc_flags = get_float_exception_flags(status); int old_exc_flags = get_float_exception_flags(status);
v = float32_to_int64_round_to_zero(a, status); v = float32_to_int64_round_to_zero(a, status);
@ -7111,7 +7111,7 @@ uint32 float32_to_uint32_round_to_zero( float32 a, float_status *status )
} else if (v > 0xffffffff) { } else if (v > 0xffffffff) {
res = 0xffffffff; res = 0xffffffff;
} else { } else {
return (uint32)v; return (uint32_t)v;
} }
set_float_exception_flags(old_exc_flags, status); set_float_exception_flags(old_exc_flags, status);
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
@ -7177,34 +7177,34 @@ uint_fast16_t float32_to_uint16_round_to_zero(float32 a, float_status *status)
return res; return res;
} }
uint32 float64_to_uint32( float64 a, float_status *status ) uint32_t float64_to_uint32( float64 a, float_status *status )
{ {
uint64_t v; uint64_t v;
uint32 res; uint32_t res;
int old_exc_flags = get_float_exception_flags(status); int old_exc_flags = get_float_exception_flags(status);
v = float64_to_uint64(a, status); v = float64_to_uint64(a, status);
if (v > 0xffffffff) { if (v > 0xffffffff) {
res = 0xffffffff; res = 0xffffffff;
} else { } else {
return (uint32)v; return (uint32_t)v;
} }
set_float_exception_flags(old_exc_flags, status); set_float_exception_flags(old_exc_flags, status);
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return res; return res;
} }
uint32 float64_to_uint32_round_to_zero( float64 a, float_status *status ) uint32_t float64_to_uint32_round_to_zero( float64 a, float_status *status )
{ {
uint64_t v; uint64_t v;
uint32 res; uint32_t res;
int old_exc_flags = get_float_exception_flags(status); int old_exc_flags = get_float_exception_flags(status);
v = float64_to_uint64_round_to_zero(a, status); v = float64_to_uint64_round_to_zero(a, status);
if (v > 0xffffffff) { if (v > 0xffffffff) {
res = 0xffffffff; res = 0xffffffff;
} else { } else {
return (uint32)v; return (uint32_t)v;
} }
set_float_exception_flags(old_exc_flags, status); set_float_exception_flags(old_exc_flags, status);
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);

9
qemu/include/fpu/softfloat.h
View file

@ -101,7 +101,6 @@ this code that are retained.
typedef uint8_t flag; typedef uint8_t flag;
typedef uint8_t uint8; typedef uint8_t uint8;
typedef int8_t int8; typedef int8_t int8;
typedef unsigned int uint32;
#define LIT64( a ) a##LL #define LIT64( a ) a##LL
@ -379,8 +378,8 @@ int_fast16_t float32_to_int16_round_to_zero(float32, float_status *status);
uint_fast16_t float32_to_uint16_round_to_zero(float32, float_status *status); uint_fast16_t float32_to_uint16_round_to_zero(float32, float_status *status);
int32_t float32_to_int32( float32, float_status *status ); int32_t float32_to_int32( float32, float_status *status );
int32_t float32_to_int32_round_to_zero( float32, float_status *status ); int32_t float32_to_int32_round_to_zero( float32, float_status *status );
uint32 float32_to_uint32( float32, float_status *status ); uint32_t float32_to_uint32( float32, float_status *status );
uint32 float32_to_uint32_round_to_zero( float32, float_status *status ); uint32_t float32_to_uint32_round_to_zero( float32, float_status *status );
int64_t float32_to_int64( float32, float_status *status ); int64_t float32_to_int64( float32, float_status *status );
uint64_t float32_to_uint64(float32, float_status *status); uint64_t float32_to_uint64(float32, float_status *status);
uint64_t float32_to_uint64_round_to_zero(float32, float_status *status); uint64_t float32_to_uint64_round_to_zero(float32, float_status *status);
@ -491,8 +490,8 @@ int_fast16_t float64_to_int16_round_to_zero(float64, float_status *status);
uint_fast16_t float64_to_uint16_round_to_zero(float64, float_status *status); uint_fast16_t float64_to_uint16_round_to_zero(float64, float_status *status);
int32_t float64_to_int32( float64, float_status *status ); int32_t float64_to_int32( float64, float_status *status );
int32_t float64_to_int32_round_to_zero( float64, float_status *status ); int32_t float64_to_int32_round_to_zero( float64, float_status *status );
uint32 float64_to_uint32( float64, float_status *status ); uint32_t float64_to_uint32( float64, float_status *status );
uint32 float64_to_uint32_round_to_zero( float64, float_status *status ); uint32_t float64_to_uint32_round_to_zero( float64, float_status *status );
int64_t float64_to_int64( float64, float_status *status ); int64_t float64_to_int64( float64, float_status *status );
int64_t float64_to_int64_round_to_zero( float64, float_status *status ); int64_t float64_to_int64_round_to_zero( float64, float_status *status );
uint64_t float64_to_uint64 (float64 a, float_status *status); uint64_t float64_to_uint64 (float64 a, float_status *status);