From patchwork Thu Apr 24 19:11:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 29016 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50CAA2036A for ; Thu, 24 Apr 2014 19:11:21 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id hn18sf3973225igb.0 for ; Thu, 24 Apr 2014 12:11:20 -0700 (PDT) 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=XmYcrK+SSIT0OQtUIKDtHV9UCLORjg58Jn6ybeUcr/o=; b=giNKuLSxRJ9nYI9E8U4by86F+G0xm1tuZeXRk636UlmbK6fftmJbCuZdYdohc8ZXCl 1Mw6kDg7MKHi/0Z0itFlDxpqHmhCSpR5TODr11XrPumM94OWm+RGtHfESkd0uKBaYn2U auU7bJKTa3w25pFVx9WsH3+Z9OBcxrNbg6BElLkTTpu6HnE3Xz0Sc/qEKJHZnuikjyQq CzIF43YGUyX+N+KNco9crbJ2l1EQGnL7nFwqH/6kEaEgLaAQStHxFldjyG7sL5TQHzaH WuFE+2R7uZtdDNyjrE5J72OL5qfJkizdpSOBGCt6aYp/gyfq/nuTKb4lqekJC4R0MP8A 7VPQ== X-Gm-Message-State: ALoCoQkF4MQLjWLRfQmHxVAObCHJcsjH1W/EEACf5CiCHp0AuhWKDFQAzIjfQ3ZTLEc7DHRzU1pW X-Received: by 10.182.196.8 with SMTP id ii8mr2120985obc.5.1398366680540; Thu, 24 Apr 2014 12:11:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.81 with SMTP id e75ls282952qgd.29.gmail; Thu, 24 Apr 2014 12:11:20 -0700 (PDT) X-Received: by 10.58.185.244 with SMTP id ff20mr38596vec.40.1398366680392; Thu, 24 Apr 2014 12:11:20 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id a8si1155142vej.179.2014.04.24.12.11.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 12:11:20 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so3572861veb.9 for ; Thu, 24 Apr 2014 12:11:20 -0700 (PDT) X-Received: by 10.221.55.133 with SMTP id vy5mr2393521vcb.17.1398366680321; Thu, 24 Apr 2014 12:11:20 -0700 (PDT) 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.220.221.72 with SMTP id ib8csp39653vcb; Thu, 24 Apr 2014 12:11:19 -0700 (PDT) X-Received: by 10.112.126.7 with SMTP id mu7mr2208843lbb.17.1398366679015; Thu, 24 Apr 2014 12:11:19 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id jg10si3615263lbc.185.2014.04.24.12.11.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Apr 2014 12:11:18 -0700 (PDT) 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 1WdP3C-0004f8-8g; Thu, 24 Apr 2014 20:11:14 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Richard Henderson , Michael Tokarev Subject: [PATCH 2/3] disas/libvixl: Add missing ULL suffixes Date: Thu, 24 Apr 2014 20:11:13 +0100 Message-Id: <1398366674-17889-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398366674-17889-1-git-send-email-peter.maydell@linaro.org> References: <1398366674-17889-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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: , Upstream libvixl 1.3 fixes a number of the places which needed ULL suffixes, but not all of them; reapply those ones from commit 37fd5b53b which are still relevant. Signed-off-by: Peter Maydell --- disas/libvixl/a64/instructions-a64.h | 24 ++++++++++++------------ disas/libvixl/utils.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/disas/libvixl/a64/instructions-a64.h b/disas/libvixl/a64/instructions-a64.h index 4eaee58..d7b09e2 100644 --- a/disas/libvixl/a64/instructions-a64.h +++ b/disas/libvixl/a64/instructions-a64.h @@ -58,20 +58,20 @@ const unsigned kDRegSizeLog2 = 6; const unsigned kDRegSizeInBytes = kDRegSize / 8; const unsigned kDRegSizeInBytesLog2 = kDRegSizeLog2 - 3; const uint64_t kWRegMask = 0xffffffff; -const uint64_t kXRegMask = 0xffffffffffffffff; +const uint64_t kXRegMask = 0xffffffffffffffffULL; const uint64_t kSRegMask = 0xffffffff; -const uint64_t kDRegMask = 0xffffffffffffffff; +const uint64_t kDRegMask = 0xffffffffffffffffULL; const uint64_t kSSignMask = 0x80000000; -const uint64_t kDSignMask = 0x8000000000000000; +const uint64_t kDSignMask = 0x8000000000000000ULL; const uint64_t kWSignMask = 0x80000000; -const uint64_t kXSignMask = 0x8000000000000000; +const uint64_t kXSignMask = 0x8000000000000000ULL; const uint64_t kByteMask = 0xff; const uint64_t kHalfWordMask = 0xffff; const uint64_t kWordMask = 0xffffffff; -const uint64_t kXMaxUInt = 0xffffffffffffffff; +const uint64_t kXMaxUInt = 0xffffffffffffffffULL; const uint64_t kWMaxUInt = 0xffffffff; -const int64_t kXMaxInt = 0x7fffffffffffffff; -const int64_t kXMinInt = 0x8000000000000000; +const int64_t kXMaxInt = 0x7fffffffffffffffULL; +const int64_t kXMinInt = 0x8000000000000000ULL; const int32_t kWMaxInt = 0x7fffffff; const int32_t kWMinInt = 0x80000000; const unsigned kLinkRegCode = 30; @@ -87,20 +87,20 @@ const unsigned kFloatExponentBits = 8; const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000); const float kFP32NegativeInfinity = rawbits_to_float(0xff800000); -const double kFP64PositiveInfinity = rawbits_to_double(0x7ff0000000000000); -const double kFP64NegativeInfinity = rawbits_to_double(0xfff0000000000000); +const double kFP64PositiveInfinity = rawbits_to_double(0x7ff0000000000000ULL); +const double kFP64NegativeInfinity = rawbits_to_double(0xfff0000000000000ULL); // This value is a signalling NaN as both a double and as a float (taking the // least-significant word). -static const double kFP64SignallingNaN = rawbits_to_double(0x7ff000007f800001); +static const double kFP64SignallingNaN = rawbits_to_double(0x7ff000007f800001ULL); static const float kFP32SignallingNaN = rawbits_to_float(0x7f800001); // A similar value, but as a quiet NaN. -static const double kFP64QuietNaN = rawbits_to_double(0x7ff800007fc00001); +static const double kFP64QuietNaN = rawbits_to_double(0x7ff800007fc00001ULL); static const float kFP32QuietNaN = rawbits_to_float(0x7fc00001); // The default NaN values (for FPCR.DN=1). -static const double kFP64DefaultNaN = rawbits_to_double(0x7ff8000000000000); +static const double kFP64DefaultNaN = rawbits_to_double(0x7ff8000000000000ULL); static const float kFP32DefaultNaN = rawbits_to_float(0x7fc00000); diff --git a/disas/libvixl/utils.h b/disas/libvixl/utils.h index bed70c6..34fb50e 100644 --- a/disas/libvixl/utils.h +++ b/disas/libvixl/utils.h @@ -99,7 +99,7 @@ double rawbits_to_double(uint64_t bits); // NaN tests. inline bool IsSignallingNaN(double num) { - const uint64_t kFP64QuietNaNMask = 0x0008000000000000; + const uint64_t kFP64QuietNaNMask = 0x0008000000000000ULL; uint64_t raw = double_to_rawbits(num); if (isnan(num) && ((raw & kFP64QuietNaNMask) == 0)) { return true; @@ -126,7 +126,7 @@ inline bool IsQuietNaN(T num) { // Convert the NaN in 'num' to a quiet NaN. inline double ToQuietNaN(double num) { - const uint64_t kFP64QuietNaNMask = 0x0008000000000000; + const uint64_t kFP64QuietNaNMask = 0x0008000000000000ULL; VIXL_ASSERT(isnan(num)); return rawbits_to_double(double_to_rawbits(num) | kFP64QuietNaNMask); }