From 182f42fdc219e6481654fcfb73b17e4b4e63b6ff Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 22 Jan 2016 15:09:20 +0000 Subject: fpu: Replace uint64 typedef with uint64_t Replace the uint64 softfloat-specific typedef with uint64_t. This change was made with find include fpu target-* -name '*.[ch]' | xargs sed -i -e 's/\buint64\b/uint64_t/g' together with manual removal of the typedef definition, and manual undoing of some mis-hits where macro arguments were being used for token pasting rather than as a type. Note that the target-mips/kvm.c and target-s390x/kvm.c changes are fixing code that should not have been using the uint64 type in the first place. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Aurelien Jarno Acked-by: Leon Alrae Acked-by: James Hogan Message-id: 1452603315-27030-3-git-send-email-peter.maydell@linaro.org --- fpu/softfloat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fpu') diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 967da1c6a5..c72eb5b2b0 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1363,7 +1363,7 @@ float128 int32_to_float128(int32_t a, float_status *status) float32 int64_to_float32(int64_t a, float_status *status) { flag zSign; - uint64 absA; + uint64_t absA; int8 shiftCount; if ( a == 0 ) return float32_zero; @@ -1414,7 +1414,7 @@ float64 int64_to_float64(int64_t a, float_status *status) floatx80 int64_to_floatx80(int64_t a, float_status *status) { flag zSign; - uint64 absA; + uint64_t absA; int8 shiftCount; if ( a == 0 ) return packFloatx80( 0, 0, 0 ); @@ -1434,7 +1434,7 @@ floatx80 int64_to_floatx80(int64_t a, float_status *status) float128 int64_to_float128(int64_t a, float_status *status) { flag zSign; - uint64 absA; + uint64_t absA; int8 shiftCount; int32 zExp; uint64_t zSig0, zSig1; @@ -1705,7 +1705,7 @@ int64_t float32_to_int64(float32 a, float_status *status) | raise the inexact exception flag. *----------------------------------------------------------------------------*/ -uint64 float32_to_uint64(float32 a, float_status *status) +uint64_t float32_to_uint64(float32 a, float_status *status) { flag aSign; int_fast16_t aExp, shiftCount; @@ -1750,7 +1750,7 @@ uint64 float32_to_uint64(float32 a, float_status *status) | not round to zero will raise the inexact flag. *----------------------------------------------------------------------------*/ -uint64 float32_to_uint64_round_to_zero(float32 a, float_status *status) +uint64_t float32_to_uint64_round_to_zero(float32 a, float_status *status) { signed char current_rounding_mode = status->float_rounding_mode; set_float_rounding_mode(float_round_to_zero, status); -- cgit v1.2.1