From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXfWs-0005SI-8R for qemu-devel@nongnu.org; Wed, 20 Jan 2010 13:43:46 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXfWn-0005Kg-62 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 13:43:45 -0500 Received: from [199.232.76.173] (port=44267 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXfWm-0005KM-Up for qemu-devel@nongnu.org; Wed, 20 Jan 2010 13:43:41 -0500 Received: from moutng.kundenserver.de ([212.227.17.9]:58057) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXfWi-0001kc-LS for qemu-devel@nongnu.org; Wed, 20 Jan 2010 13:43:40 -0500 From: Stefan Weil Date: Wed, 20 Jan 2010 19:43:25 +0100 Message-Id: <1264013005-16965-1-git-send-email-weil@mail.berlios.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 01/14] arm host: Fix compiler warning List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Compilation for arm (native or cross) results in this warning: fpu/softfloat-native.c: In function ‘float64_round_to_int’: fpu/softfloat-native.c:387: error: control reaches end of non-void function float64_round_to_int uses special assembler code for arm and has no explicit return value. As there is no obvious reason why arm should need special code, all fpu related conditionals were removed. The remaining code is standard (C99) and compiles for arm, too. Signed-off-by: Stefan Weil --- fpu/softfloat-native.c | 20 -------------------- fpu/softfloat-native.h | 7 ------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index 8d64f4e..049c830 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -12,8 +12,6 @@ void set_float_rounding_mode(int val STATUS_PARAM) #if (defined(CONFIG_BSD) && !defined(__APPLE__) && !defined(__GLIBC__)) || \ (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) fpsetround(val); -#elif defined(__arm__) - /* nothing to do */ #else fesetround(val); #endif @@ -365,25 +363,7 @@ float64 float64_trunc_to_int( float64 a STATUS_PARAM ) float64 float64_round_to_int( float64 a STATUS_PARAM ) { -#if defined(__arm__) - switch(STATUS(float_rounding_mode)) { - default: - case float_round_nearest_even: - asm("rndd %0, %1" : "=f" (a) : "f"(a)); - break; - case float_round_down: - asm("rnddm %0, %1" : "=f" (a) : "f"(a)); - break; - case float_round_up: - asm("rnddp %0, %1" : "=f" (a) : "f"(a)); - break; - case float_round_to_zero: - asm("rnddz %0, %1" : "=f" (a) : "f"(a)); - break; - } -#else return rint(a); -#endif } float64 float64_rem( float64 a, float64 b STATUS_PARAM) diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h index fe737b3..6da0bcb 100644 --- a/fpu/softfloat-native.h +++ b/fpu/softfloat-native.h @@ -126,13 +126,6 @@ enum { float_round_up = FP_RP, float_round_to_zero = FP_RZ }; -#elif defined(__arm__) -enum { - float_round_nearest_even = 0, - float_round_down = 1, - float_round_up = 2, - float_round_to_zero = 3 -}; #else enum { float_round_nearest_even = FE_TONEAREST, -- 1.6.5