From patchwork Mon Jun 15 17:24:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49894 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F1D9A211FD for ; Mon, 15 Jun 2015 17:26:38 +0000 (UTC) Received: by laka10 with SMTP id a10sf6364515lak.2 for ; Mon, 15 Jun 2015 10:26:37 -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:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=m2R6H5IMCXX72/SEXzeLiwPlIi/IJ93Bi/y49kY5Frg=; b=Hu26Mqt3WXAaWZSNLCXz6iRxJxjn626pwxOKftiv8RmDCnfVjXSOnIH2SnkJzbAj44 wcc9S0NwMkhZPRxpaSvqmiNcuu9Uj4frrOs9dzrW6L5o5YVQk7uw9eAdV81gVW0rPr84 2+sGNbzh891kU3i2WBn35ktk5iXTzRMctQvOb/aZEkYEplT/AGv315pD9Zj0yEuFY4MY rLqmM0BXpw1pNlWPStPfttII9q7FvEVoW3HXbSqz1r3OqEZ0bbIE8NiPrwoWqTbEiNWN imEEQCgOA8Yep5E3iRFHB5GbLyvyBId6rB28F3OjcLY6mCe023FqjWjdwLuzQ/W+lpSq i2SQ== X-Gm-Message-State: ALoCoQnRUxCm1UXnF6sxiJqE0o7aBVrnFpRnol0pFGHqeBNys9Zig+xx0wxoJ6yqCc///z2fnM9G X-Received: by 10.180.89.231 with SMTP id br7mr20529641wib.0.1434389197874; Mon, 15 Jun 2015 10:26:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.133 with SMTP id kq5ls843253lac.102.gmail; Mon, 15 Jun 2015 10:26:37 -0700 (PDT) X-Received: by 10.152.5.98 with SMTP id r2mr28153470lar.8.1434389197713; Mon, 15 Jun 2015 10:26:37 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id q6si10969844lbs.169.2015.06.15.10.26.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 10:26:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lblr1 with SMTP id r1so31472842lbl.0 for ; Mon, 15 Jun 2015 10:26:37 -0700 (PDT) X-Received: by 10.112.182.4 with SMTP id ea4mr504664lbc.35.1434389197431; Mon, 15 Jun 2015 10:26:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1562961lbb; Mon, 15 Jun 2015 10:26:36 -0700 (PDT) X-Received: by 10.140.48.171 with SMTP id o40mr37329618qga.0.1434389196206; Mon, 15 Jun 2015 10:26:36 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id jm7si13472228qcb.11.2015.06.15.10.26.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Jun 2015 10:26:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y9b-0000ca-Cp for patch@linaro.org; Mon, 15 Jun 2015 13:26:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8C-0007V8-A9 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4Y8A-0001PN-Sd for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:08 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8A-0001AA-LU for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:06 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Z4Y83-0003XM-R6 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:24:59 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 15 Jun 2015 18:24:56 +0100 Message-Id: <1434389098-13430-27-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> References: <1434389098-13430-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 Subject: [Qemu-devel] [PULL 26/28] target-arm: Correct "preferred return address" for cpreg access exceptions 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The architecture defines that when taking an exception trying to access a coprocessor register, the "preferred return address" for the exception is the address of the instruction that caused the exception. Correct an off-by-4 error which meant we were returning the address after the instruction for traps which happened because of a failure of a runtime access-check function on an AArch32 register. (Traps caused by translate-time checkable permissions failures had the correct address, as did traps on AArch64 registers.) This fixes https://bugs.launchpad.net/qemu/+bug/1463338 Reported-by: Robert Buhren Signed-off-by: Peter Maydell Message-id: 1433861440-30133-1-git-send-email-peter.maydell@linaro.org --- target-arm/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 125b6da..ead08f4 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7175,7 +7175,7 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn) break; } - gen_set_pc_im(s, s->pc); + gen_set_pc_im(s, s->pc - 4); tmpptr = tcg_const_ptr(ri); tcg_syn = tcg_const_i32(syndrome); gen_helper_access_check_cp_reg(cpu_env, tmpptr, tcg_syn);