From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmalD-0000uI-Cp for qemu-devel@nongnu.org; Sun, 15 Jan 2012 19:49:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rmal8-0000jF-LB for qemu-devel@nongnu.org; Sun, 15 Jan 2012 19:49:16 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58284 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rmal8-0000j8-5L for qemu-devel@nongnu.org; Sun, 15 Jan 2012 19:49:14 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 16 Jan 2012 01:46:59 +0100 Message-Id: <1326674823-13069-11-git-send-email-afaerber@suse.de> In-Reply-To: <1326674823-13069-1-git-send-email-afaerber@suse.de> References: <1326674823-13069-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/14] softfloat: Replace uint32 type with uint_fast32_t List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Stefan Weil , Jan Kiszka , Blue Swirl , Christophe Lyon , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Based on the following Coccinelle patch: @@ typedef uint32, uint_fast32_t; @@ -uint32 +uint_fast32_t Add typedef for pre-10 Solaris. Signed-off-by: Andreas F=C3=A4rber Cc: Ben Taylor --- fpu/softfloat.c | 26 +++++++++++++------------- fpu/softfloat.h | 13 ++++++------- osdep.h | 1 + 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index b5fa3ef..b71e47a 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1141,7 +1141,7 @@ float32 int32_to_float32( int32 a STATUS_PARAM ) float64 int32_to_float64( int32 a STATUS_PARAM ) { flag zSign; - uint32 absA; + uint_fast32_t absA; int_fast8_t shiftCount; uint64_t zSig; =20 @@ -1164,7 +1164,7 @@ float64 int32_to_float64( int32 a STATUS_PARAM ) floatx80 int32_to_floatx80( int32 a STATUS_PARAM ) { flag zSign; - uint32 absA; + uint_fast32_t absA; int_fast8_t shiftCount; uint64_t zSig; =20 @@ -1186,7 +1186,7 @@ floatx80 int32_to_floatx80( int32 a STATUS_PARAM ) float128 int32_to_float128( int32 a STATUS_PARAM ) { flag zSign; - uint32 absA; + uint_fast32_t absA; int_fast8_t shiftCount; uint64_t zSig0; =20 @@ -6397,20 +6397,20 @@ int float128_unordered_quiet( float128 a, float12= 8 b STATUS_PARAM ) } =20 /* misc functions */ -float32 uint32_to_float32( uint32 a STATUS_PARAM ) +float32 uint32_to_float32(uint_fast32_t a STATUS_PARAM) { return int64_to_float32(a STATUS_VAR); } =20 -float64 uint32_to_float64( uint32 a STATUS_PARAM ) +float64 uint32_to_float64(uint_fast32_t a STATUS_PARAM) { return int64_to_float64(a STATUS_VAR); } =20 -uint32 float32_to_uint32( float32 a STATUS_PARAM ) +uint_fast32_t float32_to_uint32(float32 a STATUS_PARAM) { int64_t v; - uint32 res; + uint_fast32_t res; =20 v =3D float32_to_int64(a STATUS_VAR); if (v < 0) { @@ -6425,10 +6425,10 @@ uint32 float32_to_uint32( float32 a STATUS_PARAM = ) return res; } =20 -uint32 float32_to_uint32_round_to_zero( float32 a STATUS_PARAM ) +uint_fast32_t float32_to_uint32_round_to_zero(float32 a STATUS_PARAM) { int64_t v; - uint32 res; + uint_fast32_t res; =20 v =3D float32_to_int64_round_to_zero(a STATUS_VAR); if (v < 0) { @@ -6461,10 +6461,10 @@ uint_fast16_t float32_to_uint16_round_to_zero(flo= at32 a STATUS_PARAM) return res; } =20 -uint32 float64_to_uint32( float64 a STATUS_PARAM ) +uint_fast32_t float64_to_uint32(float64 a STATUS_PARAM) { int64_t v; - uint32 res; + uint_fast32_t res; =20 v =3D float64_to_int64(a STATUS_VAR); if (v < 0) { @@ -6479,10 +6479,10 @@ uint32 float64_to_uint32( float64 a STATUS_PARAM = ) return res; } =20 -uint32 float64_to_uint32_round_to_zero( float64 a STATUS_PARAM ) +uint_fast32_t float64_to_uint32_round_to_zero(float64 a STATUS_PARAM) { int64_t v; - uint32 res; + uint_fast32_t res; =20 v =3D float64_to_int64_round_to_zero(a STATUS_VAR); if (v < 0) { diff --git a/fpu/softfloat.h b/fpu/softfloat.h index ea18a66..b29fd24 100644 --- a/fpu/softfloat.h +++ b/fpu/softfloat.h @@ -55,7 +55,6 @@ these four paragraphs for those parts of this code that= are retained. | to the same as `int'. *-----------------------------------------------------------------------= -----*/ typedef uint8_t flag; -typedef unsigned int uint32; typedef signed int int32; typedef uint64_t uint64; typedef int64_t int64; @@ -223,8 +222,8 @@ enum { *-----------------------------------------------------------------------= -----*/ float32 int32_to_float32( int32 STATUS_PARAM ); float64 int32_to_float64( int32 STATUS_PARAM ); -float32 uint32_to_float32( uint32 STATUS_PARAM ); -float64 uint32_to_float64( uint32 STATUS_PARAM ); +float32 uint32_to_float32(uint_fast32_t STATUS_PARAM); +float64 uint32_to_float64(uint_fast32_t STATUS_PARAM); floatx80 int32_to_floatx80( int32 STATUS_PARAM ); float128 int32_to_float128( int32 STATUS_PARAM ); float32 int64_to_float32( int64 STATUS_PARAM ); @@ -259,8 +258,8 @@ int_fast16_t float32_to_int16_round_to_zero(float32 S= TATUS_PARAM); uint_fast16_t float32_to_uint16_round_to_zero(float32 STATUS_PARAM); int32 float32_to_int32( float32 STATUS_PARAM ); int32 float32_to_int32_round_to_zero( float32 STATUS_PARAM ); -uint32 float32_to_uint32( float32 STATUS_PARAM ); -uint32 float32_to_uint32_round_to_zero( float32 STATUS_PARAM ); +uint_fast32_t float32_to_uint32(float32 STATUS_PARAM); +uint_fast32_t float32_to_uint32_round_to_zero(float32 STATUS_PARAM); int64 float32_to_int64( float32 STATUS_PARAM ); int64 float32_to_int64_round_to_zero( float32 STATUS_PARAM ); float64 float32_to_float64( float32 STATUS_PARAM ); @@ -363,8 +362,8 @@ int_fast16_t float64_to_int16_round_to_zero(float64 S= TATUS_PARAM); uint_fast16_t float64_to_uint16_round_to_zero(float64 STATUS_PARAM); int32 float64_to_int32( float64 STATUS_PARAM ); int32 float64_to_int32_round_to_zero( float64 STATUS_PARAM ); -uint32 float64_to_uint32( float64 STATUS_PARAM ); -uint32 float64_to_uint32_round_to_zero( float64 STATUS_PARAM ); +uint_fast32_t float64_to_uint32(float64 STATUS_PARAM); +uint_fast32_t float64_to_uint32_round_to_zero(float64 STATUS_PARAM); int64 float64_to_int64( float64 STATUS_PARAM ); int64 float64_to_int64_round_to_zero( float64 STATUS_PARAM ); uint64 float64_to_uint64 (float64 a STATUS_PARAM); diff --git a/osdep.h b/osdep.h index b87b450..c7f3a4e 100644 --- a/osdep.h +++ b/osdep.h @@ -14,6 +14,7 @@ /* uint_fast8_t and uint_fast16_t not in */ typedef unsigned char uint_fast8_t; typedef unsigned int uint_fast16_t; +typedef unsigned int uint_fast32_t; typedef signed char int_fast8_t; typedef signed int int_fast16_t; #endif --=20 1.7.7