aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2023-02-27 12:58:29 -1000
committerMichael Tokarev <mjt@tls.msk.ru>2023-04-12 16:57:32 +0300
commitdda57509e91d9d329fe11f2a3390ef38e2a86139 (patch)
tree17b8d967ce4ddf05e3586c90efcfd29750ac0879 /target
parent73a11e3723a157df669888fc89c4e776d5fcc8ee (diff)
target/arm: Handle m-profile in arm_is_secure
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1421 Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20230227225832.816605-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org> (cherry picked from commit 9094f9551df849f68d40236092d8af3ed869d093) Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'target')
-rw-r--r--target/arm/cpu.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 9aeed3c848..a9cd7178f8 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -2407,6 +2407,9 @@ static inline bool arm_is_el3_or_mon(CPUARMState *env)
/* Return true if the processor is in secure state */
static inline bool arm_is_secure(CPUARMState *env)
{
+ if (arm_feature(env, ARM_FEATURE_M)) {
+ return env->v7m.secure;
+ }
if (arm_is_el3_or_mon(env)) {
return true;
}