From patchwork Fri Mar 1 20:29:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159518 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1164872jad; Fri, 1 Mar 2019 12:30:44 -0800 (PST) X-Google-Smtp-Source: APXvYqz/OEgzqtPPltBXVaRJ8qo+/FW1+nIWzc/RIkdBKbv4E3cez+LZ9WK+03kRbqBVXJFySGYC X-Received: by 2002:a81:4b0d:: with SMTP id y13mr5227420ywa.47.1551472244684; Fri, 01 Mar 2019 12:30:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551472244; cv=none; d=google.com; s=arc-20160816; b=icj1en6g2ixIErStZXopUUYc0My0IImmKEETyrRqRD7cm9cvzuHfS4YETk3Vx/mM40 RYk/shX4LIn+lRCs9DN/sMPtJA2MK46WiXBzAneDrMTUa7nk0umZZNBcuSwSZb99o7N7 pZqVhsgZjcjk1rhZsXuX8uxdIRy/+S92ylYWI+0OcfkPuWJlQJGDnDzWTtfIm9JLBnkP z/5yr3AyHNgPiFY3OSIWRYNgwcV7SBXO0lxMs+ezeqEHx7vKrhp7BkN6LPh0vS99Tdr0 xD2ZTMFnG90RVGhqpl1SRW34q8OQ+VvzQgr1BuQ6c0up6Vt382aUuIoo78C7WwVqKE9B omqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :dkim-signature; bh=N0A8ms3zZXFXRjrzyDoU+zFX8Xa3PWuDZdnYyPg6haE=; b=clh9wR+QxJ2SryasIXfX1zH50i7baP8ibFL2LxE0M9NXDMDdqzLfbivc7dr5W5GnfL favsFCSsvANsHx/hjwkDiyS8JgPpd1Tq35s2ec6alFw4ORdqXwXCjkFo5Nh/+ApH0UgA dn4GNnwbB2QDP/TgkR1rbot/SUm6Syr+2jjgPDkZVRg5JgECIzeh2PLLnIRZ/+H6Qbev 6US/BW6acaNykQV5bWgd8TGXznmQ62SNL74r03iZwBMHuczLd3lHiIXK8JdOqyYaekN+ H0RgY7lqHDKgCKUdXOsAP/HG0N+EEPHS77qVJjpx3w9Gx2T1bdkCMrsO+Ac36QIsKSK4 n0Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="OHJnO/Qm"; 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 a16si12514628ybk.218.2019.03.01.12.30.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:30:44 -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="OHJnO/Qm"; 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]:43736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzons-0003J6-7a for patch@linaro.org; Fri, 01 Mar 2019 15:30:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzomi-0002x5-NV for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:29:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzomh-0001w5-2C for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:29:32 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:44970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzomg-0001iX-HY for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:29:30 -0500 Received: by mail-pl1-x634.google.com with SMTP id c4so11982489pls.11 for ; Fri, 01 Mar 2019 12:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=N0A8ms3zZXFXRjrzyDoU+zFX8Xa3PWuDZdnYyPg6haE=; b=OHJnO/QmzSJ8QATzH4FcvmjKXvKGBnz4fPM/noHz0GIQMbhEKrTwqDh3/Bd4NbZj70 Bss0uk/+u9AaiU87w7HigukXy1DnTP/GCinnbeR2WQXf9eZw0/mJjo6JpHROh5LVFKjr VeNqJ0by4m3kvHN//Gj0XAzYzcOIGMfFhZ8rhiZR3XtlT+2kMwxhbKd97pZ1WsRb1A4U VzTWDsWkIrjVLWG1kooAwVijRPqI+kUVxcI5FchfpRXrCiTDIXo+1zUOwIBZJC4HSAKZ FtuqpLZ2k09Qr6VSBNUO4jYH6J3UQk94M77nVAAWckDyyDLwLoosz++n3AHmQHPZnuhL WY2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=N0A8ms3zZXFXRjrzyDoU+zFX8Xa3PWuDZdnYyPg6haE=; b=RJiysEB045YcTXMSwmky75OAt1d8mhnBV1ohBMD+gXA2loajiyz1XUotbOidIlvKRm ZnzDezoovECMn0nwzz9pXAev0VpCIIQdszLaQCH+UndBMFPjMRvP5k2p90i2nCFK60+F jdzlCs+ulfD1gH8KJibu236nHP8jY3621ROorPBMF/i7KFTnqlhPnGJNLu2E1qOaaBYd /1Kv6xzSWj1eDLwQT9jJ3BIluCt98ZwruoY1fPEXElc0hTs4gJ154+SylVtCEjZFqhIo ttlpWXQM/7r1Cirq9fIuDT2lZUd6xm3bOXklfOxsjkB/GMp9NnCsTkEhcoJBnQR06D6F KTvQ== X-Gm-Message-State: APjAAAVHz2hJlNMpDLyUSJr7GIxIk7Mn28Cmw12e7nIlr83NHB9glxSI rqq+bjYZTowKiwAH4k6N8xEK7owgWys= X-Received: by 2002:a17:902:2963:: with SMTP id g90mr7466884plb.182.1551472165088; Fri, 01 Mar 2019 12:29:25 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id l64sm13254541pfj.179.2019.03.01.12.29.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:29:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:29:21 -0800 Message-Id: <20190301202921.21209-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::634 Subject: [Qemu-devel] [PATCH] 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 procesed from the loaded PC. Signed-off-by: Richard Henderson --- target/arm/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.2 Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/arm/translate.c b/target/arm/translate.c index 8f7f5b95aa..ad879e3480 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);