From patchwork Fri Dec 7 21:52:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 204613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BE35D2C0209 for ; Sat, 8 Dec 2012 08:53:01 +1100 (EST) Received: from localhost ([::1]:36238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th5qt-0003aV-Ug for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 16:52:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th5qK-00028G-1u for qemu-devel@nongnu.org; Fri, 07 Dec 2012 16:52:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th5qE-0006A6-1L for qemu-devel@nongnu.org; Fri, 07 Dec 2012 16:52:23 -0500 Received: from mail-qa0-f45.google.com ([209.85.216.45]:50455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th5qD-00069y-Pk for qemu-devel@nongnu.org; Fri, 07 Dec 2012 16:52:17 -0500 Received: by mail-qa0-f45.google.com with SMTP id j15so2302588qaq.4 for ; Fri, 07 Dec 2012 13:52:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=Z7C0+cJAbJZg7SqvZf+iTOK343aMEeYFxbM+J/HjJvg=; b=wWYLC3A8Nvq8evesi96lshUQ62cmSGYZIPxNaJcHUJf9q9ZXYlRDkXMpUcxTRzMnx9 b+1vcQAZ6uH9OAyGKNIV0CEJj/7d1f7y9c7drG9azY7IvCPzYmhajsJ8cxeudbocIdfU C7CdvCJ7kqlFpey6lTunDQMrUNileHVDwOl4pTZ9trdjM7mLvUaPZB2LNSWGRLDiLe0Q YUiNYI/VuCFo9R7LlbeDoZwCpljgvBlOoDp+eHDDd4aVB/4mGkWj6O0sdB640mX62fK/ mxhAlAziHaj9Miir77z5oQQYAoBak0tTdCHjxCT7JtH+9ED0yxCLA7o0lxVtx4O4G8EE KqpQ== Received: by 10.224.117.7 with SMTP id o7mr12036639qaq.34.1354917137149; Fri, 07 Dec 2012 13:52:17 -0800 (PST) Received: from pebble.twiddle.home.com ([201.120.20.251]) by mx.google.com with ESMTPS id em3sm8368179qab.12.2012.12.07.13.52.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Dec 2012 13:52:16 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2012 15:52:06 -0600 Message-Id: <1354917127-29718-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354917127-29718-1-git-send-email-rth@twiddle.net> References: <1354917127-29718-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.45 Subject: [Qemu-devel] [PATCH 1/2] softfloat: Fix uint64_to_float64 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 The interface to normalizeRoundAndPackFloat64 requires that the high bit be clear. Perform one shift-right-and-jam if needed. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- fpu/softfloat.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 8413146..62830d7 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1273,9 +1273,14 @@ float64 int64_to_float64( int64 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 ); } /*----------------------------------------------------------------------------