diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-22 15:09:21 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-22 15:09:21 +0000 |
commit | 3a87d00910ef64a2eece4aad25d96ea10683fc5c (patch) | |
tree | 435827ec89296cefb26eb5acefc23beff185ca06 /include | |
parent | f4014512cda682a9d0c75310d278d7ae96b0505c (diff) |
fpu: Replace uint32 typedef with uint32_t
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.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Acked-by: Leon Alrae <leon.alrae@imgtec.com>
Acked-by: James Hogan <james.hogan@imgtec.com>
Message-id: 1452603315-27030-5-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'include')
-rw-r--r-- | include/fpu/softfloat.h | 10 | ||||
-rw-r--r-- | include/hw/i386/pc.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index c61f836ebe..bee849e0a7 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -101,8 +101,6 @@ this code that are retained. typedef uint8_t flag; typedef uint8_t uint8; typedef int8_t int8; -typedef unsigned int uint32; -typedef signed int int32_t; #define LIT64( a ) a##LL @@ -376,8 +374,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); int32_t float32_to_int32(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 float32_to_uint32_round_to_zero(float32, float_status *status); +uint32_t float32_to_uint32(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); uint64_t float32_to_uint64(float32, float_status *status); uint64_t float32_to_uint64_round_to_zero(float32, float_status *status); @@ -488,8 +486,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); int32_t float64_to_int32(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 float64_to_uint32_round_to_zero(float64, float_status *status); +uint32_t float64_to_uint32(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_round_to_zero(float64, float_status *status); uint64_t float64_to_uint64(float64 a, float_status *status); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5bac03d975..65e8f245a8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -258,7 +258,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, - uint32 hpet_irqs); + uint32_t hpet_irqs); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(PCMachineState *pcms, BusState *ide0, BusState *ide1, |