summary refs log tree commit diff stats
path: root/target/arm/internals.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-07-04 16:57:09 +0100
committerPeter Maydell <peter.maydell@linaro.org>2024-07-11 11:41:34 +0100
commitfcee3707eb0331a7270d9c93ba68e832e8ff8b98 (patch)
treece16cd66c21c4ed606e75d4b7ca0fd770829fba1 /target/arm/internals.h
parentefceb7d2bd5cb0f82045b7945810c5c029f60eb2 (diff)
downloadfocaccia-qemu-fcee3707eb0331a7270d9c93ba68e832e8ff8b98.tar.gz
focaccia-qemu-fcee3707eb0331a7270d9c93ba68e832e8ff8b98.zip
target/arm: Set arm_v7m_tcg_ops cpu_exec_halt to arm_cpu_exec_halt()
In commit a96edb687e76 we set the cpu_exec_halt field of the
TCGCPUOps arm_tcg_ops to arm_cpu_exec_halt(), but we left the
arm_v7m_tcg_ops struct unchanged.  That isn't wrong, because for
M-profile FEAT_WFxT doesn't exist and the default handling for "no
cpu_exec_halt method" is correct, but it's perhaps a little
confusing.  We would also like to make setting the cpu_exec_halt
method mandatory.

Initialize arm_v7m_tcg_ops cpu_exec_halt to the same function we use
for A-profile.  (On M-profile we never set up the wfxt timer so there
is no change in behaviour here.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Diffstat (limited to 'target/arm/internals.h')
-rw-r--r--target/arm/internals.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/internals.h b/target/arm/internals.h
index e1aa1a63b9..da22d04121 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -368,6 +368,9 @@ void arm_restore_state_to_opc(CPUState *cs,
 
 #ifdef CONFIG_TCG
 void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb);
+
+/* Our implementation of TCGCPUOps::cpu_exec_halt */
+bool arm_cpu_exec_halt(CPUState *cs);
 #endif /* CONFIG_TCG */
 
 typedef enum ARMFPRounding {