From patchwork Tue Nov 25 14:17:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 414733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9BB801401B1 for ; Wed, 26 Nov 2014 01:55:12 +1100 (AEDT) Received: from localhost ([::1]:57854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtHWI-0007Pw-Q6 for incoming@patchwork.ozlabs.org; Tue, 25 Nov 2014 09:55:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtHMj-0001Jy-PO for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:45:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtHMZ-0005dn-CL for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:45:17 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtHMZ-0005QA-5n for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:45:07 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XtGvx-0000Bl-TW; Tue, 25 Nov 2014 14:17:37 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 25 Nov 2014 14:17:33 +0000 Message-Id: <1416925057-692-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1416925057-692-1-git-send-email-peter.maydell@linaro.org> References: <1416925057-692-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Peter Maydell , Richard Henderson , patches@linaro.org, Max Filippov , Richard Sandiford , Paul Brook , Juan Quintela , Blue Swirl , Christophe Lyon , Anthony Liguori , Stefan Weil , Paolo Bonzini , Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Avi Kivity Subject: [Qemu-devel] [PATCH 2/6] softfloat: Revert remaining portions of commits 75d62a5856 and 3430b0be36f 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 Revert the remaining portions of commits 75d62a5856 and 3430b0be36f which are under a SoftFloat-2b license, ie the functions uint64_to_float32() and uint64_to_float64(). (The float64_to_uint64() and float64_to_uint64_round_to_zero() functions were completely rewritten in commits fb3ea83aa and 0a87a3107d so can stay.) Signed-off-by: Peter Maydell --- fpu/softfloat.c | 35 ----------------------------------- include/fpu/softfloat.h | 2 -- 2 files changed, 37 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 6041dbd..f79669f 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1302,27 +1302,6 @@ float32 int64_to_float32(int64_t a STATUS_PARAM) } -float32 uint64_to_float32(uint64_t a STATUS_PARAM) -{ - int8 shiftCount; - - if ( a == 0 ) return float32_zero; - shiftCount = countLeadingZeros64( a ) - 40; - if ( 0 <= shiftCount ) { - return packFloat32(0, 0x95 - shiftCount, a<