diff options
| -rw-r--r-- | fpu/softfloat.c | 10 | ||||
| -rw-r--r-- | include/fpu/softfloat.h | 9 | ||||
| -rw-r--r-- | target-alpha/fpu_helper.c | 2 | ||||
| -rw-r--r-- | target-mips/kvm.c | 4 | ||||
| -rw-r--r-- | target-s390x/kvm.c | 2 |
5 files changed, 13 insertions, 14 deletions
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); 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); diff --git a/target-alpha/fpu_helper.c b/target-alpha/fpu_helper.c index b091aa842a..0c65e1f6e1 100644 --- a/target-alpha/fpu_helper.c +++ b/target-alpha/fpu_helper.c @@ -437,7 +437,7 @@ uint64_t helper_cvtqs(CPUAlphaState *env, uint64_t a) return float32_to_s(fr); } -/* Implement float64 to uint64 conversion without saturation -- we must +/* Implement float64 to uint64_t conversion without saturation -- we must supply the truncated result. This behaviour is used by the compiler to get unsigned conversion for free with the same instruction. */ diff --git a/target-mips/kvm.c b/target-mips/kvm.c index 12d7db311e..ffc120d716 100644 --- a/target-mips/kvm.c +++ b/target-mips/kvm.c @@ -277,7 +277,7 @@ static inline int kvm_mips_get_one_reg(CPUState *cs, uint64_t reg_id, return kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); } -static inline int kvm_mips_get_one_ulreg(CPUState *cs, uint64 reg_id, +static inline int kvm_mips_get_one_ulreg(CPUState *cs, uint64_t reg_id, target_ulong *addr) { int ret; @@ -294,7 +294,7 @@ static inline int kvm_mips_get_one_ulreg(CPUState *cs, uint64 reg_id, return ret; } -static inline int kvm_mips_get_one_reg64(CPUState *cs, uint64 reg_id, +static inline int kvm_mips_get_one_reg64(CPUState *cs, uint64_t reg_id, uint64_t *addr) { struct kvm_one_reg cp0reg = { diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 75a0e5d1c3..b8222ccd17 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1433,7 +1433,7 @@ static int kvm_s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) cpu_physical_memory_write(offsetof(LowCore, ar_access_id), &ar_id, 1); } for (i = 0; i < 16; ++i) { - *((uint64 *)mem + i) = get_freg(&cpu->env, i)->ll; + *((uint64_t *)mem + i) = get_freg(&cpu->env, i)->ll; } memcpy(mem + 128, &cpu->env.regs, 128); memcpy(mem + 256, &cpu->env.psw, 16); |