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: 41469 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4B4D625E72 for ; Tue, 25 Nov 2014 14:17:56 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id l18sf472979wgh.2 for ; Tue, 25 Nov 2014 06:17:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=MjMPRZhlRQjKvDUO/q59DH33Z0ZL46xb3qwc4WUGqCw=; b=YPREjeoZLTsaIjF47VpEWsWm1uikgSFuumbspZ+tSWk+Dm3nzf+bCksn68k5eKpw/w L0biljfYXtKaNI8kIDLQGkNuMl5m2JPUCOqxr/zV26/86CApvQjLOdZDYSp8qC/rvG08 WHdyuA9eiEQds00BIE/v9+sxU5N3PMutelJ6PtXeUx2UxM7peRsXFSbEF+cwu20m0dR4 MzKTORylqVRjSdzBaGnHbP5VJilMbsSLHcnwYTpQMvP/0/cMfZ1eemfqgPVrvbEqG18d lxGB+v1GukntgwQLjrJ+ohfxmgKWgoeRQ6PPAR/R4L5emfVwE1yxv/BknN/JFaolceGY L0rg== X-Gm-Message-State: ALoCoQkhsH1CcwN5lH/SL242ZQ0wnwsEGtYdfZFEQsX0nGTTXQzEZ2TygM/RNln7Y2F7apQR/oIG X-Received: by 10.112.125.6 with SMTP id mm6mr7688843lbb.8.1416925075603; Tue, 25 Nov 2014 06:17:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.227 with SMTP id i3ls459840lae.28.gmail; Tue, 25 Nov 2014 06:17:55 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr27423215laa.32.1416925075466; Tue, 25 Nov 2014 06:17:55 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id p5si1483262lbo.69.2014.11.25.06.17.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Nov 2014 06:17:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ms9so596096lab.24 for ; Tue, 25 Nov 2014 06:17:55 -0800 (PST) X-Received: by 10.112.62.166 with SMTP id z6mr26627010lbr.74.1416925075335; Tue, 25 Nov 2014 06:17:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp441253lbc; Tue, 25 Nov 2014 06:17:54 -0800 (PST) X-Received: by 10.152.115.230 with SMTP id jr6mr27349239lab.2.1416925074902; Tue, 25 Nov 2014 06:17:54 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id hu10si2268261wjb.53.2014.11.25.06.17.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 25 Nov 2014 06:17:54 -0800 (PST) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; 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 Cc: patches@linaro.org, Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Avi Kivity , Ben Taylor , Blue Swirl , Christophe Lyon , Fabrice Bellard , Guan Xuetao , Juan Quintela , Max Filippov , Paul Brook , Paolo Bonzini , Peter Maydell , Richard Henderson , Richard Sandiford , Stefan Weil Subject: [PATCH 2/6] softfloat: Revert remaining portions of commits 75d62a5856 and 3430b0be36f 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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<