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 --- include/fpu/softfloat.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index b49d5fbf5c..438804ee5c 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -103,7 +103,6 @@ typedef uint8_t uint8; typedef int8_t int8; typedef unsigned int uint32; typedef signed int int32; -typedef uint64_t uint64; #define LIT64( a ) a##LL @@ -380,8 +379,8 @@ int32 float32_to_int32_round_to_zero(float32, float_status *status); uint32 float32_to_uint32(float32, float_status *status); uint32 float32_to_uint32_round_to_zero(float32, float_status *status); int64_t float32_to_int64(float32, float_status *status); -uint64 float32_to_uint64(float32, float_status *status); -uint64 float32_to_uint64_round_to_zero(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); int64_t float32_to_int64_round_to_zero(float32, float_status *status); float64 float32_to_float64(float32, float_status *status); floatx80 float32_to_floatx80(float32, float_status *status); @@ -493,8 +492,8 @@ uint32 float64_to_uint32(float64, float_status *status); uint32 float64_to_uint32_round_to_zero(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); -uint64 float64_to_uint64(float64 a, float_status *status); -uint64 float64_to_uint64_round_to_zero(float64 a, float_status *status); +uint64_t float64_to_uint64(float64 a, float_status *status); +uint64_t float64_to_uint64_round_to_zero(float64 a, float_status *status); float32 float64_to_float32(float64, float_status *status); floatx80 float64_to_floatx80(float64, float_status *status); float128 float64_to_float128(float64, float_status *status); -- cgit v1.2.3-55-g7522