From patchwork Mon Jan 16 00:47:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 136217 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1C28B6EF1 for ; Mon, 16 Jan 2012 11:50:48 +1100 (EST) Received: from localhost ([::1]:46159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rmamc-0004St-HJ for incoming@patchwork.ozlabs.org; Sun, 15 Jan 2012 19:50:46 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmalC-0000sA-PZ for qemu-devel@nongnu.org; Sun, 15 Jan 2012 19:49:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RmalA-0000jk-Oq for qemu-devel@nongnu.org; Sun, 15 Jan 2012 19:49:18 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58302 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmalA-0000jZ-GN for qemu-devel@nongnu.org; Sun, 15 Jan 2012 19:49:16 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id CB0FC90983; Mon, 16 Jan 2012 01:49:15 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 16 Jan 2012 01:47:01 +0100 Message-Id: <1326674823-13069-13-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Peter Maydell , Anthony Liguori , Stefan Weil , Jan Kiszka , Blue Swirl , Christophe Lyon , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Subject: [Qemu-devel] [PATCH 12/14] softfloat: Replace uint64 type with uint_fast64_t X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Based on the following Coccinelle patch: @@ typedef uint64, uint_fast64_t; @@ -uint64 +uint_fast_64_t Add a typedef for pre-10 Solaris. Signed-off-by: Andreas Färber Cc: Ben Taylor --- fpu/softfloat.c | 10 +++++----- fpu/softfloat.h | 9 ++++----- osdep.h | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index b7cd589..ace2ca2 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1208,7 +1208,7 @@ float128 int32_to_float128(int_fast32_t a STATUS_PARAM) float32 int64_to_float32( int64 a STATUS_PARAM ) { flag zSign; - uint64 absA; + uint_fast64_t absA; int_fast8_t shiftCount; if ( a == 0 ) return float32_zero; @@ -1231,7 +1231,7 @@ float32 int64_to_float32( int64 a STATUS_PARAM ) } -float32 uint64_to_float32( uint64 a STATUS_PARAM ) +float32 uint64_to_float32(uint_fast64_t a STATUS_PARAM) { int_fast8_t shiftCount; @@ -1271,7 +1271,7 @@ float64 int64_to_float64( int64 a STATUS_PARAM ) } -float64 uint64_to_float64( uint64 a STATUS_PARAM ) +float64 uint64_to_float64(uint_fast64_t a STATUS_PARAM) { if ( a == 0 ) return float64_zero; return normalizeRoundAndPackFloat64( 0, 0x43C, a STATUS_VAR ); @@ -1288,7 +1288,7 @@ float64 uint64_to_float64( uint64 a STATUS_PARAM ) floatx80 int64_to_floatx80( int64 a STATUS_PARAM ) { flag zSign; - uint64 absA; + uint_fast64_t absA; int_fast8_t shiftCount; if ( a == 0 ) return packFloatx80( 0, 0, 0 ); @@ -1308,7 +1308,7 @@ floatx80 int64_to_floatx80( int64 a STATUS_PARAM ) float128 int64_to_float128( int64 a STATUS_PARAM ) { flag zSign; - uint64 absA; + uint_fast64_t absA; int_fast8_t shiftCount; int_fast32_t zExp; uint64_t zSig0, zSig1; diff --git a/fpu/softfloat.h b/fpu/softfloat.h index 9987443..ce28906 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 uint64_t uint64; typedef int64_t int64; #define LIT64( a ) a##LL @@ -226,9 +225,9 @@ float64 uint32_to_float64(uint_fast32_t STATUS_PARAM); floatx80 int32_to_floatx80(int_fast32_t STATUS_PARAM); float128 int32_to_float128(int_fast32_t STATUS_PARAM); float32 int64_to_float32( int64 STATUS_PARAM ); -float32 uint64_to_float32( uint64 STATUS_PARAM ); +float32 uint64_to_float32(uint_fast64_t STATUS_PARAM); float64 int64_to_float64( int64 STATUS_PARAM ); -float64 uint64_to_float64( uint64 STATUS_PARAM ); +float64 uint64_to_float64(uint_fast64_t STATUS_PARAM); floatx80 int64_to_floatx80( int64 STATUS_PARAM ); float128 int64_to_float128( int64 STATUS_PARAM ); @@ -365,8 +364,8 @@ 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); -uint64 float64_to_uint64_round_to_zero (float64 a STATUS_PARAM); +uint_fast64_t float64_to_uint64(float64 a STATUS_PARAM); +uint_fast64_t float64_to_uint64_round_to_zero(float64 a STATUS_PARAM); float32 float64_to_float32( float64 STATUS_PARAM ); floatx80 float64_to_floatx80( float64 STATUS_PARAM ); float128 float64_to_float128( float64 STATUS_PARAM ); diff --git a/osdep.h b/osdep.h index 935810f..a30bd6a 100644 --- a/osdep.h +++ b/osdep.h @@ -15,6 +15,7 @@ typedef unsigned char uint_fast8_t; typedef unsigned int uint_fast16_t; typedef unsigned int uint_fast32_t; +typedef uint64_t uint_fast64_t; typedef signed char int_fast8_t; typedef signed int int_fast16_t; typedef signed int int_fast32_t;