From nobody Wed Nov 12 16:27:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1571422477; cv=none; d=zoho.com; s=zohoarc; b=op9A+MMfgl31pq1lf7VHHxI0U23+j2/EO4TjmvialbWY+DM1S0d/ei3NG6gIpl0rMboI1SFrN/JqxJLFVcHwzB4vUaF28vBjxG5oC1o4CctjM7YaVWp35kF7NSOuW3yRGSz+L2Bvn69QC/QQv7UepVzh4P/GyGfzXELDgMjyzrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571422477; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HGoDHAyFTg02BbCDc0SzUOS11VgHC5xQyCe+OvrFqFc=; b=nE6EOhrJjY1qvzlYqUIGS2EAqPGv2OgAK7txjKq2Q2z4orwO+5165TzYbTAjFzz1n5EugOPAO03p11kE7Epzq1Qx6OwaXkj9cXLdoysj/gT7OGZS4QNC+TYjQgOP6sgcJ7cRqtitXg7gT1fsyzdPYhLc78WVxEvYZd+E8BMoxQg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571422477547766.0299849676337; Fri, 18 Oct 2019 11:14:37 -0700 (PDT) Received: from localhost ([::1]:44764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLWll-0004Zq-Lw for importer@patchew.org; Fri, 18 Oct 2019 14:14:33 -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) 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) 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-Google-Smtp-Source: APXvYqz/KFTKYBmeodxvJ4P9FIz9BFgjMqOd1Kk6fWEJ/ZKOvUUWq3TqvZHYNZXviyd5iFb4LDKbGQ== X-Received: by 2002:a17:90a:376d:: with SMTP id u100mr12408557pjb.23.1571420697691; Fri, 18 Oct 2019 10:44:57 -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 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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Continue setting, but not relying upon, env->hflags. Reviewed-by: Alex Benn=C3=A9e 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(-) 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 =3D 1; env->regs[15] =3D dest & ~1; + arm_rebuild_hflags(env); } =20 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 =3D 1; env->regs[15] =3D dest; + arm_rebuild_hflags(env); } =20 static uint32_t *get_v7m_sp_ptr(CPUARMState *env, bool secure, bool thread= mode, @@ -895,6 +897,7 @@ static void v7m_exception_taken(ARMCPU *cpu, uint32_t l= r, bool dotailchain, env->regs[14] =3D lr; env->regs[15] =3D addr & 0xfffffffe; env->thumb =3D addr & 1; + arm_rebuild_hflags(env); } =20 static void v7m_update_fpccr(CPUARMState *env, uint32_t frameptr, @@ -1765,6 +1768,7 @@ static void do_v7m_exception_exit(ARMCPU *cpu) =20 /* 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"); } =20 @@ -1837,6 +1841,7 @@ static bool do_v7m_function_return(ARMCPU *cpu) xpsr_write(env, 0, XPSR_IT); env->thumb =3D newpc & 1; env->regs[15] =3D newpc & ~1; + arm_rebuild_hflags(env); =20 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] +=3D 4; + arm_rebuild_hflags(env); return true; =20 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_v7= m *a) =20 static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7m *a) { - TCGv_i32 addr, reg; + TCGv_i32 addr, reg, el; =20 if (!arm_dc_feature(s, ARM_FEATURE_M)) { return false; @@ -8335,6 +8335,9 @@ static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7= m *a) gen_helper_v7m_msr(cpu_env, addr, reg); tcg_temp_free_i32(addr); tcg_temp_free_i32(reg); + el =3D 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; } --=20 2.17.1