From nobody Fri Dec 19 04:28:20 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=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1571752265; cv=none; d=zoho.com; s=zohoarc; b=dAEblWqXiCom2+3HcMN2rFHzJ1vk7GhH4kvKaC54Gpg/mlD6U0D99uNP6nx1wEq15nOcYIk+9zQREwKd6mOy+seEbZuXua9tnDHbErd1qH0oB+cpG0rUqCLhFT8rOYmSZWT6OvFXiZ8XpNByQu5sVBqzQUNyeJiFAPBZnIKZFSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752265; h=Content-Type:Content-Transfer-Encoding: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=10Ms0HjDWN7ux33iEvzUyQs1UaAMPIAPE/5GBQG8vsk=; b=XNk/sJJjLQvo0lwTOmNLaEeBpdkQUZ3FyP/p0iSlqmYh0dXxHRU0+VhDGUwhDAercBUxKxJNoCdeSLixfiR8rRZ3ZE6s7gSYKb2X6kXai97xrnf8k6VWVINwKE1LEFK+jp0mb8P9h5AKmfu4qeLYKBfV7DiJHpRLnicrgnK+8fU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; 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=pass 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 1571752265416261.8091422789521; Tue, 22 Oct 2019 06:51:05 -0700 (PDT) Received: from localhost ([::1]:57704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuYy-0006cd-95 for importer@patchew.org; Tue, 22 Oct 2019 09:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37122) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuHK-0003Mq-69 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuHI-0001VG-O7 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:49 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuHI-0001V0-Hg for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:48 -0400 Received: by mail-wm1-x330.google.com with SMTP id v9so269352wml.0 for ; Tue, 22 Oct 2019 06:32:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:45 -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=10Ms0HjDWN7ux33iEvzUyQs1UaAMPIAPE/5GBQG8vsk=; b=O8Q9LdAaFMwThqoK/1UDeb4silpc/UPTPfA+lOmrzzvIDvV6OR0Z8xrascGhJLU7t7 dYkx+DvjLWbCUMF1Gp7fMkpr2YabFMIJH9cwA9Lzq8pf+OOJqg/KSYhp21LE/UPOhfrQ e707JGo2xZWzWJaqWH8cFvJyA9GdhzT4M2fnzQec9ZbH4bdlfl41lp8UkpdJkUEe4/Ex ASDaeW9xJX7+4tCvY3f7XM4xX58uG3udRDto8y9wVkwZx43sh9XokM2jr603MgsQMxFA hTBbD5D611pfzwlwpbakjeJsCmeCNN3B04pqr8UsuH3mRG4IACiQF/kILUj6AuMsMckR e7oA== 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=10Ms0HjDWN7ux33iEvzUyQs1UaAMPIAPE/5GBQG8vsk=; b=W/HeTDJGaYiehp/l19S1yKjPMvAx4d0dMulW/Cp49KY+az3ZW1rjS0aqdYL8H7C0PR xt21/Dt5DmlWr9wD3wOHWnERgovgZZXGqp4p1n+2ayUlcS0eRqUEvKEYjY2Ius0EL4uq KX02+nfVXRSOov1RgfFPMOgskTGi3hNavF524t0dOf2cLa7nlexgxaOzsKsajB0BeKyR YTXTfprnNcg5sV7YtngQaiUoERF6GeL1VnvPzP/TQQxuCHyus2Squ2lO3WZsOrOHEgA8 qxnVHKyYExZEFf+diMPXcmlmlorWvj0SpqNSywKEApnKRm4qm1yyRHXnIgj+gjQIgIsP THNg== X-Gm-Message-State: APjAAAVonYWAW0IQLpd7ku2226aaluEA2SBAOb6bnbTZNW3MxhTwU9Ls ffiqKPsP9/47vVLia6u7XEu/PiHMD/I= X-Google-Smtp-Source: APXvYqwH507K7h86cOhc9VMEFawdv7yzsh/oyGpjNQVW0PV2ub87lJXvQPLL7R/0U3UnsjNPMR0P0A== X-Received: by 2002:a05:600c:1007:: with SMTP id c7mr3221253wmc.41.1571751166943; Tue, 22 Oct 2019 06:32:46 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/41] target/arm: Rebuild hflags for M-profile Date: Tue, 22 Oct 2019 14:31:23 +0100 Message-Id: <20191022133134.14487-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson Continue setting, but not relying upon, env->hflags. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson Message-id: 20191018174431.1784-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(-) 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 =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 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_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; @@ -8337,6 +8337,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.20.1