Re: [Qemu-devel] [PATCH 2/2] softfloat: Use uint32 consistently

[Blue Swirl]

Thanks, applied.

On Sun, Aug 28, 2011 at 6:24 PM, Andreas Färber <address@hidden> wrote:
> Prepares for uint32 replacement.
>
> Signed-off-by: Andreas Färber <address@hidden>
> ---
>  fpu/softfloat.c |   20 ++++++++++----------
>  fpu/softfloat.h |    4 ++--
>  2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/fpu/softfloat.c b/fpu/softfloat.c
> index be1206d..2b20085 100644
> --- a/fpu/softfloat.c
> +++ b/fpu/softfloat.c
> @@ -5965,20 +5965,20 @@ int float128_unordered_quiet( float128 a, float128 b 
> STATUS_PARAM )
>  }
>
>  /* misc functions */
> -float32 uint32_to_float32( unsigned int a STATUS_PARAM )
> +float32 uint32_to_float32( uint32 a STATUS_PARAM )
>  {
>     return int64_to_float32(a STATUS_VAR);
>  }
>
> -float64 uint32_to_float64( unsigned int a STATUS_PARAM )
> +float64 uint32_to_float64( uint32 a STATUS_PARAM )
>  {
>     return int64_to_float64(a STATUS_VAR);
>  }
>
> -unsigned int float32_to_uint32( float32 a STATUS_PARAM )
> +uint32 float32_to_uint32( float32 a STATUS_PARAM )
>  {
>     int64_t v;
> -    unsigned int res;
> +    uint32 res;
>
>     v = float32_to_int64(a STATUS_VAR);
>     if (v < 0) {
> @@ -5993,10 +5993,10 @@ unsigned int float32_to_uint32( float32 a 
> STATUS_PARAM )
>     return res;
>  }
>
> -unsigned int float32_to_uint32_round_to_zero( float32 a STATUS_PARAM )
> +uint32 float32_to_uint32_round_to_zero( float32 a STATUS_PARAM )
>  {
>     int64_t v;
> -    unsigned int res;
> +    uint32 res;
>
>     v = float32_to_int64_round_to_zero(a STATUS_VAR);
>     if (v < 0) {
> @@ -6029,10 +6029,10 @@ uint16 float32_to_uint16_round_to_zero( float32 a 
> STATUS_PARAM )
>     return res;
>  }
>
> -unsigned int float64_to_uint32( float64 a STATUS_PARAM )
> +uint32 float64_to_uint32( float64 a STATUS_PARAM )
>  {
>     int64_t v;
> -    unsigned int res;
> +    uint32 res;
>
>     v = float64_to_int64(a STATUS_VAR);
>     if (v < 0) {
> @@ -6047,10 +6047,10 @@ unsigned int float64_to_uint32( float64 a 
> STATUS_PARAM )
>     return res;
>  }
>
> -unsigned int float64_to_uint32_round_to_zero( float64 a STATUS_PARAM )
> +uint32 float64_to_uint32_round_to_zero( float64 a STATUS_PARAM )
>  {
>     int64_t v;
> -    unsigned int res;
> +    uint32 res;
>
>     v = float64_to_int64_round_to_zero(a STATUS_VAR);
>     if (v < 0) {
> diff --git a/fpu/softfloat.h b/fpu/softfloat.h
> index e1bbe01..618ddee 100644
> --- a/fpu/softfloat.h
> +++ b/fpu/softfloat.h
> @@ -216,8 +216,8 @@ void float_raise( int8 flags STATUS_PARAM);
>  
> *----------------------------------------------------------------------------*/
>  float32 int32_to_float32( int32 STATUS_PARAM );
>  float64 int32_to_float64( int32 STATUS_PARAM );
> -float32 uint32_to_float32( unsigned int STATUS_PARAM );
> -float64 uint32_to_float64( unsigned int STATUS_PARAM );
> +float32 uint32_to_float32( uint32 STATUS_PARAM );
> +float64 uint32_to_float64( uint32 STATUS_PARAM );
>  floatx80 int32_to_floatx80( int32 STATUS_PARAM );
>  float128 int32_to_float128( int32 STATUS_PARAM );
>  float32 int64_to_float32( int64 STATUS_PARAM );
> --
> 1.7.5.3
>
>
>