From patchwork Fri Mar 14 18:37:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 26310 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D89C2202DD for ; Fri, 14 Mar 2014 18:57:17 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf6921138pbb.7 for ; Fri, 14 Mar 2014 11:57:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=y4XcR1DvQCld5jlM4e3xxBeS4g9lHWjfrrmFnuYGKM4=; b=f95/Fq/oAvWnoPJ533tRAEu0SzaSBzWqXDX7zDicr4pDIwn7DXJmLjEDHUfHSmiDoe uyQuzFiLPhQBnI/R4jb24egzkKA8bIisPPnwx/7Ghj2K17Y71gy95CV0FogdXP4fyCbh L2ZAiJ23El0Dxgo9RQSw0XaJz6uPXUO5KDDykTuQmIYwFDTLAU5MIwhO4nWYZlP/+rsH ZJgiFcCrCP9xsEXlpcMEESio/1EPdpUZvEUTaY5sdkTdlhkxQAHN7kO77o0uL30cEa0y I4X15Hg2yOhV9xcvt+aqIPV4ZWr3BW68eOLWxzm5mNkj2zOieE0tb8S1tlz+h343mEE1 Er4g== X-Gm-Message-State: ALoCoQlOX6aK+/2yIXDfeZS1NA2uPLn43UgmdWnOrKHviTNOSXf9yW5DqqONZWLLWvQM5xOIEBYC X-Received: by 10.68.253.66 with SMTP id zy2mr3787563pbc.1.1394823437114; Fri, 14 Mar 2014 11:57:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.184 with SMTP id w53ls861526qge.45.gmail; Fri, 14 Mar 2014 11:57:17 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr7380709vec.6.1394823436898; Fri, 14 Mar 2014 11:57:16 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id y6si804845veb.79.2014.03.14.11.57.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:57:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so3168107vcb.4 for ; Fri, 14 Mar 2014 11:57:16 -0700 (PDT) X-Received: by 10.58.247.193 with SMTP id yg1mr62501vec.41.1394823436805; Fri, 14 Mar 2014 11:57:16 -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.78.9 with SMTP id i9csp44528vck; Fri, 14 Mar 2014 11:57:16 -0700 (PDT) X-Received: by 10.15.31.137 with SMTP id y9mr9836326eeu.12.1394823434543; Fri, 14 Mar 2014 11:57:14 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id v2si11465201eel.226.2014.03.14.11.57.14 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:57:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WOWzm-0003ru-QE; Fri, 14 Mar 2014 18:38:14 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Michael Matz , Dirk Mueller , Laurent Desnogues , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Will Newton , Peter Crosthwaite Subject: [PATCH v2 02/25] target-arm: A64: Fix bug in add_sub_ext handling of rn Date: Fri, 14 Mar 2014 18:37:51 +0000 Message-Id: <1394822294-14837-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394822294-14837-1-git-send-email-peter.maydell@linaro.org> References: <1394822294-14837-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 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: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , From: Alex Bennée rn == 31 always means SP (not XZR) whether an add_sub_ext instruction is setting the flags or not; only rd has behaviour dependent on whether we are setting flags. Reported-by: Laurent Desnogues Signed-off-by: Alex Bennée Signed-off-by: Peter Maydell --- target-arm/translate-a64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 37252b7..444dd85 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -3096,12 +3096,11 @@ static void disas_add_sub_ext_reg(DisasContext *s, uint32_t insn) /* non-flag setting ops may use SP */ if (!setflags) { - tcg_rn = read_cpu_reg_sp(s, rn, sf); tcg_rd = cpu_reg_sp(s, rd); } else { - tcg_rn = read_cpu_reg(s, rn, sf); tcg_rd = cpu_reg(s, rd); } + tcg_rn = read_cpu_reg_sp(s, rn, sf); tcg_rm = read_cpu_reg(s, rm, sf); ext_and_shift_reg(tcg_rm, tcg_rm, option, imm3);