From nobody Sat May 3 04:34:42 2025
Return-Path: qemu-devel-bounces+famz=redhat.com@nongnu.org
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
zmta02.collab.prod.int.phx2.redhat.com) (10.5.81.9) by
zmail26.collab.prod.int.phx2.redhat.com with LMTP; Mon, 4 Sep 2017 08:35:59
-0400 (EDT)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
[10.5.11.14])
by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8E133122B73
for <fzheng@mail.corp.redhat.com>; Mon, 4 Sep 2017 08:35:59 -0400 (EDT)
Received: by smtp.corp.redhat.com (Postfix)
id 8A381125240; Mon, 4 Sep 2017 12:35:59 +0000 (UTC)
Delivered-To: famz@redhat.com
Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com
[10.5.110.28])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 8279912523C
for <famz@redhat.com>; Mon, 4 Sep 2017 12:35:57 +0000 (UTC)
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17])
(using TLSv1 with cipher AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 0156473D
for <famz@redhat.com>; Mon, 4 Sep 2017 12:35:57 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0156473D
Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com;
dmarc=fail (p=none dis=none) header.from=linaro.org
Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com;
spf=pass smtp.mailfrom=qemu-devel-bounces+famz=redhat.com@nongnu.org
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0156473D
Received: from localhost ([::1]:59571 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+famz=redhat.com@nongnu.org>)
id 1doqbc-0002m1-5Y
for famz@redhat.com; Mon, 04 Sep 2017 08:35:56 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52439)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1doqSK-0004uN-93
for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1doqS9-0004jD-1N
for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:20 -0400
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37112)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1doqS8-0004ia-QO
for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:08 -0400
Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89)
(envelope-from <pm215@archaic.org.uk>) id 1doqS7-0005UZ-RO
for qemu-devel@nongnu.org; Mon, 04 Sep 2017 13:26:07 +0100
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 4 Sep 2017 13:25:43 +0100
Message-Id: <1504527967-29248-13-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1504527967-29248-1-git-send-email-peter.maydell@linaro.org>
References: <1504527967-29248-1-git-send-email-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2001:8b0:1d0::2
Subject: [Qemu-devel] [PULL 12/36] target/arm: Don't calculate lr in
arm_v7m_cpu_do_interrupt() until needed
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+famz=redhat.com@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+famz=redhat.com@nongnu.org>
X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL,
ACL 205 matched,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
Mon, 04 Sep 2017 12:35:57 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
[10.5.110.28]);
Mon,
04 Sep 2017 12:35:57 +0000 (UTC) for IP:'208.118.235.17' DOMAIN:'lists.gnu.org' HELO:'lists.gnu.org'
FROM:'redhat.com@nongnu.org' RCPT:''
X-RedHat-Spam-Score: -5.02
(HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS)
208.118.235.17 lists.gnu.org 208.118.235.17 lists.gnu.org
<qemu-devel-bounces+famz=redhat.com@nongnu.org>
X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
Content-Length: 1621
Move the code in arm_v7m_cpu_do_interrupt() that calculates the
magic LR value down to when we're actually going to use it.
Having the calculation and use so far apart makes the code
a little harder to understand than it needs to be.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 1501692241-23310-13-git-send-email-peter.maydell@linaro.org
---
target/arm/helper.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 9410856..267a170 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6306,13 +6306,6 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)
=20
arm_log_exception(cs->exception_index);
=20
- lr =3D 0xfffffff1;
- if (env->v7m.control & R_V7M_CONTROL_SPSEL_MASK) {
- lr |=3D 4;
- }
- if (env->v7m.exception =3D=3D 0)
- lr |=3D 8;
-
/* For exceptions we just mark as pending on the NVIC, and let that
handle it. */
switch (cs->exception_index) {
@@ -6403,6 +6396,14 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)
return; /* Never happens. Keep compiler happy. */
}
=20
+ lr =3D 0xfffffff1;
+ if (env->v7m.control & R_V7M_CONTROL_SPSEL_MASK) {
+ lr |=3D 4;
+ }
+ if (env->v7m.exception =3D=3D 0) {
+ lr |=3D 8;
+ }
+
v7m_push_stack(cpu);
v7m_exception_taken(cpu, lr);
qemu_log_mask(CPU_LOG_INT, "... as %d\n", env->v7m.exception);
--=20
2.7.4