From patchwork Fri Oct 18 17:44:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176939 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1211040ill; Fri, 18 Oct 2019 11:13:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxg9EEclQvFMIHHHi3k+LFLB4fgaVavq1mjsKETgqtaqifva/dpDV5EkpGzEq5lrWkwNF2Q X-Received: by 2002:a37:4c2:: with SMTP id 185mr9475705qke.406.1571422417906; Fri, 18 Oct 2019 11:13:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571422417; cv=none; d=google.com; s=arc-20160816; b=CEkwqY54AsQkjkqsn/iyV96Op0v28u+2ebxbttIxH4cNG0Rz2wMzGeGcuJjSjnSMGM f/Vv5AxfyaFRxJkZUGjMyEpuLdT2TFYODvZelFpxDWstbMDq+PzM/7BWke7FavAnUUo1 kkgRhcuf6x9w1wOusqwA0P8pLbfPswjioCaQ9qtMGVLOOsPdy8T8YwdmSCSUTbg35n2N iyb6XNNS2nFYenDyixeTUfNGxdZWHVCT7as0w+5IOQubKu4Gh3wFLqwiBHsxtFc/VZ96 v977T6ljrBCwUsSe4uQVih8nWKMy4DF1Prp83MF+jtvzgnzKTIKFkbT1dFRRnVxHiyoE OB+Q== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=HGoDHAyFTg02BbCDc0SzUOS11VgHC5xQyCe+OvrFqFc=; b=tYX4SlTeoIe/w71O4tlV5TQdpgsyAvxaswHxc6sGKsynXegoby3RknvB9ENHba9IIi jRKv0yMp6iPZF4+92EgO6bItrqq3nu67zJQfD53Cp532lfjPiEGsccSZzH4taLLlRnec M0VksMftoSPX1cFjndvb91tA/t66tzC3lyhLop3r9wL9JDFwLtVNQll/ohqhRNcqR9Qb yWyA+aeI3eU0PanGaBcc+e6Uo/XXimFpo6hXoerTMxN/8A5yuQyFCmKfE7+11658fqOX 7l0eZSZb6JUAYK/k4ThZM4Wb/B2EGLf7Nr0sbNSCMhgnNgD6koOoJY+hB8eail7QDkuv E+eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gH4ePKI0; 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 n7si6590114qvk.204.2019.10.18.11.13.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Oct 2019 11:13:37 -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=fail header.i=@linaro.org header.s=google header.b=gH4ePKI0; 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 ([::1]:44754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLWkr-0004BD-Fj for patch@linaro.org; Fri, 18 Oct 2019 14:13:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59518) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLWJA-0006u4-FT for qemu-devel@nongnu.org; Fri, 18 Oct 2019 13:45:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLWJ9-0005ey-8T for qemu-devel@nongnu.org; Fri, 18 Oct 2019 13:45:00 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:40691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLWJ9-0005eF-37 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 13:44:59 -0400 Received: by mail-pf1-x432.google.com with SMTP id x127so4316405pfb.7 for ; Fri, 18 Oct 2019 10:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HGoDHAyFTg02BbCDc0SzUOS11VgHC5xQyCe+OvrFqFc=; b=gH4ePKI0ZYmF3BKEWSo9PNClpVHrBkapR2R7ZkhfqrjHkMHJS0HX4sdTlt21lXFwtc 2tKmh+xORcUbroASKsXq+0bA1pUBHlDJndVV1+Wuh2WRFy5pCmXxAaB3cH87LD9FyKXb IXQZH9TBrb4pIXteiwfFCvBGPW1Tzaoo8oyue8TYz0MouKhMLXpwpwEIz/3TmgsQh0SU rCTNdMyVME5zlZXAigmt3XoGOgmV6t40LujfLvl/DO78he81jF+v7I7vuI6cFTTDCAkZ VeC8eSH+ufI37bf33sNcpqxpTpY6vLGvUMUpMuxRtnhE/twy081+Txs9R2p5D860HpVB khuQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=HGoDHAyFTg02BbCDc0SzUOS11VgHC5xQyCe+OvrFqFc=; b=phxqSPjd5LuDlfEx2aeKlAcMlv3gCHDyQQLjDSZjz0hR5lfaSXg56cSnMhjJvmef6t bKttAhMW1hzffemOIYVrS1R3pxmWRoWd/m6+0S59TRhGSjRqi+rtJSSQ+Jj8cPEB4iDG TSsZkCc0AL61G5Do1sPPxOvI3bMVOR7gP4qoxKfzZYEECjSnVt6nY3SD1yZw6CfVxXjP g/6L8PBi/fH9kvCNslTmyETNUJVNJPhq5pQFr2BE71gstf35pwrRav/3zA3inlGQ80KE IjEFmgQj/b3hksjgKluVnn8CpNCWpw6Tc2h7PE62Cwd7LttGypUrV4Z4FwJPR4DVopXH 7jFg== X-Gm-Message-State: APjAAAXx6F4tDoFr/DHnN+J7i17fMy+7/cGnk9yxbv4fm5vTf2hPmuCt bOEwxLMk+mahne1wl8YACeLioNsUeSM= X-Received: by 2002:a17:90a:376d:: with SMTP id u100mr12408557pjb.23.1571420697691; Fri, 18 Oct 2019 10:44:57 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id d20sm7857534pfq.88.2019.10.18.10.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2019 10:44:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v8 20/22] target/arm: Rebuild hflags for M-profile Date: Fri, 18 Oct 2019 10:44:29 -0700 Message-Id: <20191018174431.1784-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191018174431.1784-1-richard.henderson@linaro.org> References: <20191018174431.1784-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::432 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: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Continue setting, but not relying upon, env->hflags. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- v7: Add rebuilds for v7m_msr and nvic_writel to v7m.ccr. v8: Split nvic update to a new patch and generalize location. --- target/arm/m_helper.c | 6 ++++++ target/arm/translate.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index 27cd2f3f96..f2512e448e 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 cb47cd9744..b3720cd59b 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8325,7 +8325,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; @@ -8335,6 +8335,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; }