From patchwork Tue Mar 5 16:50:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159676 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5186262jad; Tue, 5 Mar 2019 08:53:57 -0800 (PST) X-Google-Smtp-Source: APXvYqxXVo1ZeLmo2OfAWQA0urG/0oc0iFc9a3hkbEbTiXmVmdWjNFg8bKicYYnC7ZvgBuKzEvbM X-Received: by 2002:a0d:ebcd:: with SMTP id u196mr1770429ywe.293.1551804837259; Tue, 05 Mar 2019 08:53:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551804837; cv=none; d=google.com; s=arc-20160816; b=QqK1/ODoJrcJ0FmVsOFbdCdXc6kZA9zYXvuA/Z5ZQ8udOO2XH9/NPY7Rubo0ANFVhx TJfvGljoJZ6QQzGJtLdmLjEhIU+/bh0dqjWUiflqERA5BpS5EmIpO/K5Ug1OgSsrOlzN y5A1Q5aSdRsoi1jhOCHIxK2aG7vUEb6BoFqITPxm1rktf4ypphw2eiKXD8ysCyRJwCoJ nvwBLCKn52zxHeWLcOyh6RSEFMIKEBaTphLdX4DhbpdPLwBhEKAk8Jas4Oh381jzCUiu ut/Mdn8A4i68VQ1DvZ7SSEbcdNsrqK5DXh+42nvUDOATWVgBsziopqxD3iKxd17raRYo 8pvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=j0I7Nv5Z/7AbfENJrvrxgUHkMJI29mc0zYtJPLLee8s=; b=nhD9e8Sg624E1iOS004lvKEjo3mdHg+Zei/DmYrhRUT5c5ympcTngYrMb9z9ZWvxUc IcIYMPgd2vzzm58xgT013RRQyCc7TeJ6mahEDhvECrorBZIZJavJnSo9iUv1ljcR2XnX W64nswbnn56gEzS0sFd05fMT1h94mAQDbc8PV6pens5CXmVrB0Rhs8hkGkXgi64lCmOR cWZngYndlsO8OFfPdMHxclQNTfjeX4eHpgPP2JYozzgsOqSmt6qHsFvyFNkDjdwPWhta bmItZqUYBDJ9yJkRv/LMHXNIEbPciTYmvq8Db40sSgHokHo9xk+ILjbIzoATnSy6p5FF xY8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=r9bygbv0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c65si5808505yba.477.2019.03.05.08.53.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 08:53:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=r9bygbv0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:45738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DKG-0002gB-Bl for patch@linaro.org; Tue, 05 Mar 2019 11:53:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DHN-0001Tp-TH for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:50:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DHN-0000d3-2Y for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:50:57 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DHM-0000c2-RI for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:50:57 -0500 Received: by mail-wr1-x431.google.com with SMTP id w6so10241406wrs.4 for ; Tue, 05 Mar 2019 08:50:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=j0I7Nv5Z/7AbfENJrvrxgUHkMJI29mc0zYtJPLLee8s=; b=r9bygbv05rl3QFctN26KDHUBMNjTolQwmtx960qS5OgJX0gXlHmCe3Lju4oBOEra3s 4oJ0ag4M/cvJT8fIAeVaaQ4lf7lwf0YG2fai1WbfK53WF3gi6CgAwVQjlovMErSZK5t4 XeW5t4N0XWiyrEwEocIYPX2Hk6efkqeWgJqDFMQFYE501qNW+Kzb2PmXx278601lq4ot ivZgxXBeL8HLqh5KmFh4U4F0YljyeWlOxtSV3Ft++dSo/8H6cGbmseVWa0yAZVGBrEcI KlecwJT4khT7tQ12LEjRrIR107D3QUQkVUhl3bBWXOuB3rezx8I2LSri6nCPxHkkSOgg xT7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j0I7Nv5Z/7AbfENJrvrxgUHkMJI29mc0zYtJPLLee8s=; b=JngjU/Gsr83LXMt1qDCNa4NgQhDfsZbewoLOK/gvBdmm0SMbgkTu04y21uG6ba9Gjz +HfrsOvT5TYPhbW+C5h7ubJWy8X+4P1kKvc4gVdjUdzjGzWwKis1t05vSffLjeorOiub D7xpl5yTHrI2Fkocx/in5iNWQkUObEGF+u+0fKxO2zfklhN58hG9yop/ekBKRQOqrHyw cAMXMqjZT2c2nVwQV3ysMTs27Gh3dWJ0X7hKCM9evlcf47uAHsIznqI7WHn3f1e99flj wdxdwHbfxHd4aQVFrob1MLOQs1PNK1/IWYgfu2wZTB1gOGj12eyssPWWdNfuZzd1XeFA 8keA== X-Gm-Message-State: APjAAAVQ8+3GtH/mytX5AcoZSChOASzKhRNLy9QgbQFtvzZ6c4xIanoR HpjoRgkE4Oz1QGj92Ff+ppTevveIxgs= X-Received: by 2002:adf:e58f:: with SMTP id l15mr16604000wrm.309.1551804655421; Tue, 05 Mar 2019 08:50:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 2sm10071495wrg.89.2019.03.05.08.50.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:50:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 16:50:30 +0000 Message-Id: <20190305165051.26860-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305165051.26860-1-peter.maydell@linaro.org> References: <20190305165051.26860-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PULL 01/22] target/arm: Fix PC test for LDM (exception return) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: Richard Henderson Found by inspection: Rn is the base register against which the load began; I is the register within the mask being processed. The exception return should of course be processed from the loaded PC. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20190301202921.21209-1-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index 8f7f5b95aab..ad879e3480c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10612,7 +10612,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } else if (i == rn) { loaded_var = tmp; loaded_base = 1; - } else if (rn == 15 && exc_return) { + } else if (i == 15 && exc_return) { store_pc_exc_ret(s, tmp); } else { store_reg_from_load(s, i, tmp);