From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TpjnV-0002El-1H for qemu-devel@nongnu.org; Mon, 31 Dec 2012 13:09:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TpjnQ-0003sX-9p for qemu-devel@nongnu.org; Mon, 31 Dec 2012 13:09:12 -0500 Received: from mail-ia0-f180.google.com ([209.85.210.180]:52992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TpjnQ-0003sG-4u for qemu-devel@nongnu.org; Mon, 31 Dec 2012 13:09:08 -0500 Received: by mail-ia0-f180.google.com with SMTP id t4so10574869iag.25 for ; Mon, 31 Dec 2012 10:09:07 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Mon, 31 Dec 2012 10:09:03 -0800 Message-Id: <1356977344-3679-2-git-send-email-rth@twiddle.net> In-Reply-To: <1356977344-3679-1-git-send-email-rth@twiddle.net> References: <1356977344-3679-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 1/2] softfloat: Fix uint64_to_float64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl The interface to normalizeRoundAndPackFloat64 requires that the high bit be clear. Perform one shift-right-and-jam if needed. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- fpu/softfloat.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 0cfa6b4..20b05d4 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1271,11 +1271,18 @@ float64 int64_to_float64( int64 a STATUS_PARAM ) } -float64 uint64_to_float64( uint64 a STATUS_PARAM ) +float64 uint64_to_float64(uint64 a STATUS_PARAM) { - if ( a == 0 ) return float64_zero; - return normalizeRoundAndPackFloat64( 0, 0x43C, a STATUS_VAR ); + int exp = 0x43C; + if (a == 0) { + return float64_zero; + } + if ((int64_t)a < 0) { + shift64RightJamming(a, 1, &a); + exp += 1; + } + return normalizeRoundAndPackFloat64(0, exp, a STATUS_VAR); } /*---------------------------------------------------------------------------- -- 1.7.11.7