Message ID | 1504527967-29248-13-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | bd70b29ba92e4446f9e4eb8b9acc19ef6ff4a4d5 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1469723qge; Mon, 4 Sep 2017 05:35:18 -0700 (PDT) X-Google-Smtp-Source: ADKCNb475pxDCF97xoMmmyzeYmrHA8MP5X6TLRwXtt7K/rQtePkxghFpIfmSGjj5uGDKYjEqbEAy X-Received: by 10.55.169.81 with SMTP id s78mr674659qke.34.1504528518721; Mon, 04 Sep 2017 05:35:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504528518; cv=none; d=google.com; s=arc-20160816; b=TnqfZQmmuRHnDexFNq3Il/uTh+goCIlNAhc65eejp0e3A3jr+k9Nj352mXQlhTDIa1 TSA6BM7+ZSIwZTswNprYPY3+Q7trKjU/YgJKpZSmyIAX32gXAxYtfJHUArZtVqUWIxQC 1ghwCwWhV+7xN9Vvy1mq6WGJQuyC9rgnrVl/8Dgc7HYUnVWQpt1/t+5HzeJlgH+yQnzc oKXBaUhCVe3YvHhfxOWGURwoj3vr8VgJSP3W58DEbNLHWcphSwF3qU8PuxhmpXPyN8yg n/ozH96UCkM6fw9Bhxchc11eGTQ3cby6z4vEoEAqUSR0iFGfa088r0H77pRAbzg1H1DL 0u2g== 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:arc-authentication-results; bh=M+Ls+oLVynWK6aN53JXN4hFFeuR179bRPOqwpGl4ydI=; b=zcs2Lui4FYI/tLozh4BbB9PE0IgvHLj4yXbqEBytzrhQfTF8nI4kQwfp6OFymG+40H MNuSe+sRrEVlKqXQVfUrFVyh6Hsp4jCOFWndu54tSmNzopqY+UmpkpMhEDIz3SaerM0H R7uioVasWJ4cphL+Zrbfkn8U+Z13qDGpwn7fY06W3mAvv26YLsiY/OsupZpcRcz7zM9f 5NamobhCd/R5mOTa4NY8U8USKjyPZu9xBXoje5W8+cst/cX07JuolwzafiEr3mTo8E5e FTVWTBrJuPyVAd2+LUVfFheVFbGoA2fXiUB41yIspnYwCp81v4/ZYg6y6Ik+v4DUqsYI Oy2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k10si5796244qkk.88.2017.09.04.05.35.18 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Sep 2017 05:35:18 -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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:59571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1doqay-0002m1-Jk for patch@linaro.org; Mon, 04 Sep 2017 08:35:16 -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> X-Mailer: git-send-email 2.7.4 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: 8bit 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
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) arm_log_exception(cs->exception_index); - lr = 0xfffffff1; - if (env->v7m.control & R_V7M_CONTROL_SPSEL_MASK) { - lr |= 4; - } - if (env->v7m.exception == 0) - lr |= 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. */ } + lr = 0xfffffff1; + if (env->v7m.control & R_V7M_CONTROL_SPSEL_MASK) { + lr |= 4; + } + if (env->v7m.exception == 0) { + lr |= 8; + } + v7m_push_stack(cpu); v7m_exception_taken(cpu, lr); qemu_log_mask(CPU_LOG_INT, "... as %d\n", env->v7m.exception);