Skip to content

Commit

Permalink
fpu: Replace int64 typedef with int64_t
Browse files Browse the repository at this point in the history 
Replace the int64 softfloat-specific typedef with int64_t.
This change was made with

find include fpu target-* -name '*.[ch]' | xargs sed -i -e 's/\bint64\b/int64_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.

Signed-off-by: Peter Maydell <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Reviewed-by: Aurelien Jarno <[email protected]>
Acked-by: Leon Alrae <[email protected]>
Message-id: [email protected]
  • Loading branch information
@pm215
pm215 committed Jan 22, 2016
1 parent 3c2c85e commit f42c222
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 30 deletions.
30 changes: 15 additions & 15 deletions fpu/softfloat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static int32 roundAndPackInt32(flag zSign, uint64_t absZ, float_status *status)
| returned.
*----------------------------------------------------------------------------*/

static int64 roundAndPackInt64(flag zSign, uint64_t absZ0, uint64_t absZ1,
static int64_t roundAndPackInt64(flag zSign, uint64_t absZ0, uint64_t absZ1,
float_status *status)
{
int8 roundingMode;
Expand Down Expand Up @@ -255,7 +255,7 @@ static int64 roundAndPackInt64(flag zSign, uint64_t absZ0, uint64_t absZ1,
| exception is raised and the largest unsigned integer is returned.
*----------------------------------------------------------------------------*/

static int64 roundAndPackUint64(flag zSign, uint64_t absZ0,
static int64_t roundAndPackUint64(flag zSign, uint64_t absZ0,
uint64_t absZ1, float_status *status)
{
int8 roundingMode;
Expand Down Expand Up @@ -784,7 +784,7 @@ static floatx80 roundAndPackFloatx80(int8 roundingPrecision, flag zSign,
{
int8 roundingMode;
flag roundNearestEven, increment, isTiny;
int64 roundIncrement, roundMask, roundBits;
int64_t roundIncrement, roundMask, roundBits;

roundingMode = status->float_rounding_mode;
roundNearestEven = ( roundingMode == float_round_nearest_even );
Expand Down Expand Up @@ -1666,7 +1666,7 @@ int_fast16_t float32_to_int16_round_to_zero(float32 a, float_status *status)
| largest integer with the same sign as `a' is returned.
*----------------------------------------------------------------------------*/

int64 float32_to_int64(float32 a, float_status *status)
int64_t float32_to_int64(float32 a, float_status *status)
{
flag aSign;
int_fast16_t aExp, shiftCount;
Expand Down Expand Up @@ -1769,13 +1769,13 @@ uint64 float32_to_uint64_round_to_zero(float32 a, float_status *status)
| returned.
*----------------------------------------------------------------------------*/

int64 float32_to_int64_round_to_zero(float32 a, float_status *status)
int64_t float32_to_int64_round_to_zero(float32 a, float_status *status)
{
flag aSign;
int_fast16_t aExp, shiftCount;
uint32_t aSig;
uint64_t aSig64;
int64 z;
int64_t z;
a = float32_squash_input_denormal(a, status);

aSig = extractFloat32Frac( a );
Expand Down Expand Up @@ -3201,7 +3201,7 @@ int_fast16_t float64_to_int16_round_to_zero(float64 a, float_status *status)
| largest integer with the same sign as `a' is returned.
*----------------------------------------------------------------------------*/

int64 float64_to_int64(float64 a, float_status *status)
int64_t float64_to_int64(float64 a, float_status *status)
{
flag aSign;
int_fast16_t aExp, shiftCount;
Expand Down Expand Up @@ -3244,12 +3244,12 @@ int64 float64_to_int64(float64 a, float_status *status)
| returned.
*----------------------------------------------------------------------------*/

int64 float64_to_int64_round_to_zero(float64 a, float_status *status)
int64_t float64_to_int64_round_to_zero(float64 a, float_status *status)
{
flag aSign;
int_fast16_t aExp, shiftCount;
uint64_t aSig;
int64 z;
int64_t z;
a = float64_squash_input_denormal(a, status);

aSig = extractFloat64Frac( a );
Expand Down Expand Up @@ -4864,7 +4864,7 @@ int32 floatx80_to_int32_round_to_zero(floatx80 a, float_status *status)
| overflows, the largest integer with the same sign as `a' is returned.
*----------------------------------------------------------------------------*/

int64 floatx80_to_int64(floatx80 a, float_status *status)
int64_t floatx80_to_int64(floatx80 a, float_status *status)
{
flag aSign;
int32 aExp, shiftCount;
Expand Down Expand Up @@ -4904,12 +4904,12 @@ int64 floatx80_to_int64(floatx80 a, float_status *status)
| sign as `a' is returned.
*----------------------------------------------------------------------------*/

int64 floatx80_to_int64_round_to_zero(floatx80 a, float_status *status)
int64_t floatx80_to_int64_round_to_zero(floatx80 a, float_status *status)
{
flag aSign;
int32 aExp, shiftCount;
uint64_t aSig;
int64 z;
int64_t z;

aSig = extractFloatx80Frac( a );
aExp = extractFloatx80Exp( a );
Expand Down Expand Up @@ -5933,7 +5933,7 @@ int32 float128_to_int32_round_to_zero(float128 a, float_status *status)
| largest integer with the same sign as `a' is returned.
*----------------------------------------------------------------------------*/

int64 float128_to_int64(float128 a, float_status *status)
int64_t float128_to_int64(float128 a, float_status *status)
{
flag aSign;
int32 aExp, shiftCount;
Expand Down Expand Up @@ -5976,12 +5976,12 @@ int64 float128_to_int64(float128 a, float_status *status)
| returned.
*----------------------------------------------------------------------------*/

int64 float128_to_int64_round_to_zero(float128 a, float_status *status)
int64_t float128_to_int64_round_to_zero(float128 a, float_status *status)
{
flag aSign;
int32 aExp, shiftCount;
uint64_t aSig0, aSig1;
int64 z;
int64_t z;

aSig1 = extractFloat128Frac1( a );
aSig0 = extractFloat128Frac0( a );
Expand Down
17 changes: 8 additions & 9 deletions include/fpu/softfloat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ typedef int8_t int8;
typedef unsigned int uint32;
typedef signed int int32;
typedef uint64_t uint64;
typedef int64_t int64;

#define LIT64( a ) a##LL

Expand Down Expand Up @@ -380,10 +379,10 @@ int32 float32_to_int32(float32, float_status *status);
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 float32_to_int64(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);
int64 float32_to_int64_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);
float128 float32_to_float128(float32, float_status *status);
Expand Down Expand Up @@ -492,8 +491,8 @@ int32 float64_to_int32(float64, float_status *status);
int32 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);
int64 float64_to_int64(float64, float_status *status);
int64 float64_to_int64_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);
float32 float64_to_float32(float64, float_status *status);
Expand Down Expand Up @@ -598,8 +597,8 @@ extern const float64 float64_default_nan;
*----------------------------------------------------------------------------*/
int32 floatx80_to_int32(floatx80, float_status *status);
int32 floatx80_to_int32_round_to_zero(floatx80, float_status *status);
int64 floatx80_to_int64(floatx80, float_status *status);
int64 floatx80_to_int64_round_to_zero(floatx80, float_status *status);
int64_t floatx80_to_int64(floatx80, float_status *status);
int64_t floatx80_to_int64_round_to_zero(floatx80, float_status *status);
float32 floatx80_to_float32(floatx80, float_status *status);
float64 floatx80_to_float64(floatx80, float_status *status);
float128 floatx80_to_float128(floatx80, float_status *status);
Expand Down Expand Up @@ -683,8 +682,8 @@ extern const floatx80 floatx80_default_nan;
*----------------------------------------------------------------------------*/
int32 float128_to_int32(float128, float_status *status);
int32 float128_to_int32_round_to_zero(float128, float_status *status);
int64 float128_to_int64(float128, float_status *status);
int64 float128_to_int64_round_to_zero(float128, float_status *status);
int64_t float128_to_int64(float128, float_status *status);
int64_t float128_to_int64_round_to_zero(float128, float_status *status);
float32 float128_to_float32(float128, float_status *status);
float64 float128_to_float64(float128, float_status *status);
floatx80 float128_to_floatx80(float128, float_status *status);
Expand Down
12 changes: 6 additions & 6 deletions target-mips/msa_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@ static inline float16 float16_from_float32(int32 a, flag ieee,
return a < 0 ? (f_val | (1 << 15)) : f_val;
}

static inline float32 float32_from_float64(int64 a, float_status *status)
static inline float32 float32_from_float64(int64_t a, float_status *status)
{
float32 f_val;

Expand Down Expand Up @@ -1722,9 +1722,9 @@ static inline int16_t float32_to_q16(float32 a, float_status *status)

static inline int32 float64_to_q32(float64 a, float_status *status)
{
int64 q_val;
int64 q_min = 0xffffffff80000000LL;
int64 q_max = 0x000000007fffffffLL;
int64_t q_val;
int64_t q_min = 0xffffffff80000000LL;
int64_t q_max = 0x000000007fffffffLL;

int ieee_ex;

Expand All @@ -1742,7 +1742,7 @@ static inline int32 float64_to_q32(float64 a, float_status *status)

if (ieee_ex & float_flag_overflow) {
float_raise(float_flag_inexact, status);
return (int64)a < 0 ? q_min : q_max;
return (int64_t)a < 0 ? q_min : q_max;
}

/* conversion to integer */
Expand All @@ -1756,7 +1756,7 @@ static inline int32 float64_to_q32(float64 a, float_status *status)
set_float_exception_flags(ieee_ex & (~float_flag_invalid)
, status);
float_raise(float_flag_overflow | float_flag_inexact, status);
return (int64)a < 0 ? q_min : q_max;
return (int64_t)a < 0 ? q_min : q_max;
}

if (q_val < q_min) {
Expand Down

0 comments on commit f42c222

Please sign in to comment.