Message ID | 20190305165051.26860-2-peter.maydell@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E25AC1669 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 5 Mar 2019 16:52:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEE152CCA8 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 5 Mar 2019 16:52:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD2382CCAD; Tue, 5 Mar 2019 16:52:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6753E2CCBF for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 5 Mar 2019 16:52:32 +0000 (UTC) Received: from localhost ([127.0.0.1]:45738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1h1DIt-0002gB-7N for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Mar 2019 11:52:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) 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 <peter.maydell@linaro.org>) 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 <peter.maydell@linaro.org>) 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 <qemu-devel@nongnu.org>; 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-Google-Smtp-Source: APXvYqwxPNtrLBI9bxQU68H8qblc9nbgH9o84OlEhp/E4tI9uZ5PDEdrO4O5WxI36RGjLP+aVM/q1g== 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 <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:50:54 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[PULL,01/22] target/arm: Fix PC test for LDM (exception return)
|
expand
|
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);