From patchwork Thu Oct 24 16:26:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177561 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp2419992ocf; Thu, 24 Oct 2019 09:57:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOGRBnW2P1WTzRMv2GoAXn6OXEPjDiyrHg99AEvF+nagHVuB1eVMUiZmZ9g3J5hRHl+RtE X-Received: by 2002:a05:6402:1454:: with SMTP id d20mr45943964edx.53.1571936275498; Thu, 24 Oct 2019 09:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571936275; cv=none; d=google.com; s=arc-20160816; b=F2tVuxl6j0d0Pl7zQBsaM9EC2f6fuQrt8V+jJJWr2IIFSPezJLjMvDTf2lChCvLHY2 TiDT99KArpDtRWwlBSGKhqxm9/IwYHjgD4hQ1z3M7ueUyjeQgoIr8HnGY72cb8+qaXgs ddKqFdRKQTvsxFPYrIqbRB7KEVCG/PFacoQxau6uD4SfHjM3TO2Uszn1yY8TjDjlpsmw aKOBsrTAt5sIkQPnfpyDU6km3a832Zpf09ebu0RmuTmFINHYRE6cENrSvbkm/fnS9RYY 6K86qs0Ini6QfI/9bk+iGlmj6PAhR9t989XRK9Blm0GGT59dx3k3ixuKHGL7PX6fWJr/ WXkw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=9fEeMZ9uPtcAifoblXjrkL5Kbv7QSQTtSjC/i1CHC68=; b=OzaB4LgCEM2L1klxbzyltVtWj0uUUztYuXzdJdAIhJuO053V3ssZINcCzg2CNwuBoE 2whDVJqX4lajxqQfMIa/0VTc1k0pyNHa1P7ddQ5PKVRWp4S8Gsj31C4Uv7tH4ReAC832 sdaNL0so1y0FK3uMuTUCQ4f8QeNCJOAhu+zwD036ynPjMdrehEc8c7AiLCVblz5GUqcc rQuopt29NnR4YBr8W/UiKP0+B8Wu9xHfIry8Ca65zG1/zhiPBeDpubuwYqHAD0W43Jf4 n5pN4XzWvj7JbyY8dmAK532asgga04q8na49y45APqj0ShYPUOpl3kYKwV33IzHc/c9Q yAfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dFin8SZe; 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=pass (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 a3si9906344ejy.286.2019.10.24.09.57.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Oct 2019 09:57:55 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=dFin8SZe; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNgQs-0002wu-3H for patch@linaro.org; Thu, 24 Oct 2019 12:57:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57975) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfxu-0007aD-Ef for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:27:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNfxt-0000r0-33 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:27:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNfxr-0000qL-Sy for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:27:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id v6so3231251wmj.0 for ; Thu, 24 Oct 2019 09:27:55 -0700 (PDT) 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=9fEeMZ9uPtcAifoblXjrkL5Kbv7QSQTtSjC/i1CHC68=; b=dFin8SZeX0EBItnbFV28EO9KDRWx+gs8o2T0sZkHUwvta+LqUaqdxM6mPtoQew6VBB l/heKWlVzWwkbVd7rwOnlcZebOUliUihfCmquo0SXq1gnkrD/Th9cJnRs9+7n3clLboy spIfAm9hYlhIcSBmQ0q7etGhMdV8TBv/3PAlyy7Fj6KCjNoFN4Ru0sJ3eDOqctgbeSWR UF3fxbpVVCfat0YeXh/4sNLgRD+8xyWm8w+GmLp+gKcofaaT+Irp+9CqZkesn8Wr63+f 29TIVMGZ4JGZLTbKUrAaGfNZdtcyGBUqXxDLJbKU4TtP3rdaKngQQ2Jbh/5xlkfm36V/ BA7Q== 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=9fEeMZ9uPtcAifoblXjrkL5Kbv7QSQTtSjC/i1CHC68=; b=d6moqV3FyUik+ALP0ZoR24X3eDWmakK5SDlyB4643GF4bZuW2jjUXfb4ccOF7w/kDw LGJL++m04TZnkus6DmoZTa2RzFUnTJWlOtsrioON/peePwygjoDfiwx0H6CuWXHXzMje UzhNweOYtmoqwtjGJABiu5M6hdmp/rG52j/cLNYX3SiBPofvxOw7QVaJ518Vur/x3KqD hfe46kLGzbBiPVtzZ9XmDqE35ypISjF2xy9lQOug5TqJ1CH0dkexmmPPex0d6nLwHpZS a3JIQeRKdDZAwuVUS2BuOARpMtvefoxBTawI/wD/ddeu0iAj2RLN2Hlz8kru3LVwEoKx T1+w== X-Gm-Message-State: APjAAAWyf62ZGPj9CLvoAuYX11KmrT/yqVYyFH+vZ9dcNgU51RIvqcu4 piGumdNf8XXcmO0jMfqclPyWaUa7gdA= X-Received: by 2002:a1c:1bcd:: with SMTP id b196mr5699960wmb.12.1571934474705; Thu, 24 Oct 2019 09:27:54 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r27sm42606124wrc.55.2019.10.24.09.27.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:27:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/51] target/arm: Rebuild hflags for M-profile Date: Thu, 24 Oct 2019 17:26:55 +0100 Message-Id: <20191024162724.31675-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024162724.31675-1-peter.maydell@linaro.org> References: <20191024162724.31675-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::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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 Continue setting, but not relying upon, env->hflags. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20191023150057.25731-21-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/m_helper.c | 6 ++++++ target/arm/translate.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index 27cd2f3f964..f2512e448e2 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -494,6 +494,7 @@ void HELPER(v7m_bxns)(CPUARMState *env, uint32_t dest) switch_v7m_security_state(env, dest & 1); env->thumb = 1; env->regs[15] = dest & ~1; + arm_rebuild_hflags(env); } void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) @@ -555,6 +556,7 @@ void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) switch_v7m_security_state(env, 0); env->thumb = 1; env->regs[15] = dest; + arm_rebuild_hflags(env); } static uint32_t *get_v7m_sp_ptr(CPUARMState *env, bool secure, bool threadmode, @@ -895,6 +897,7 @@ static void v7m_exception_taken(ARMCPU *cpu, uint32_t lr, bool dotailchain, env->regs[14] = lr; env->regs[15] = addr & 0xfffffffe; env->thumb = addr & 1; + arm_rebuild_hflags(env); } static void v7m_update_fpccr(CPUARMState *env, uint32_t frameptr, @@ -1765,6 +1768,7 @@ static void do_v7m_exception_exit(ARMCPU *cpu) /* Otherwise, we have a successful exception exit. */ arm_clear_exclusive(env); + arm_rebuild_hflags(env); qemu_log_mask(CPU_LOG_INT, "...successful exception return\n"); } @@ -1837,6 +1841,7 @@ static bool do_v7m_function_return(ARMCPU *cpu) xpsr_write(env, 0, XPSR_IT); env->thumb = newpc & 1; env->regs[15] = newpc & ~1; + arm_rebuild_hflags(env); qemu_log_mask(CPU_LOG_INT, "...function return successful\n"); return true; @@ -1959,6 +1964,7 @@ static bool v7m_handle_execute_nsc(ARMCPU *cpu) switch_v7m_security_state(env, true); xpsr_write(env, 0, XPSR_IT); env->regs[15] += 4; + arm_rebuild_hflags(env); return true; gen_invep: diff --git a/target/arm/translate.c b/target/arm/translate.c index 46a0bf51c95..2ea9da7637b 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8327,7 +8327,7 @@ static bool trans_MRS_v7m(DisasContext *s, arg_MRS_v7m *a) static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7m *a) { - TCGv_i32 addr, reg; + TCGv_i32 addr, reg, el; if (!arm_dc_feature(s, ARM_FEATURE_M)) { return false; @@ -8337,6 +8337,9 @@ static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7m *a) gen_helper_v7m_msr(cpu_env, addr, reg); tcg_temp_free_i32(addr); tcg_temp_free_i32(reg); + el = tcg_const_i32(s->current_el); + gen_helper_rebuild_hflags_m32(cpu_env, el); + tcg_temp_free_i32(el); gen_lookup_tb(s); return true; }