[PATCH v3 26/30] target/sh4: Restrict has_work() handler to sysemu and TCG

Philippe Mathieu-Daudé posted 30 patches 4 years, 5 months ago
There is a newer version of this series
[PATCH v3 26/30] target/sh4: Restrict has_work() handler to sysemu and TCG
Posted by Philippe Mathieu-Daudé 4 years, 5 months ago
Restrict has_work() to TCG sysemu.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/sh4/cpu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index 2047742d03c..6c47d28631c 100644
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -58,12 +58,15 @@ static bool superh_io_recompile_replay_branch(CPUState *cs,
     }
     return false;
 }
-#endif
 
+#if defined(CONFIG_TCG)
 static bool superh_cpu_has_work(CPUState *cs)
 {
     return cs->interrupt_request & CPU_INTERRUPT_HARD;
 }
+#endif /* CONFIG_TCG */
+
+#endif /* !CONFIG_USER_ONLY */
 
 static void superh_cpu_reset(DeviceState *dev)
 {
@@ -239,6 +242,7 @@ static const struct TCGCPUOps superh_tcg_ops = {
     .tlb_fill = superh_cpu_tlb_fill,
 
 #ifndef CONFIG_USER_ONLY
+    .has_work = superh_cpu_has_work,
     .cpu_exec_interrupt = superh_cpu_exec_interrupt,
     .do_interrupt = superh_cpu_do_interrupt,
     .do_unaligned_access = superh_cpu_do_unaligned_access,
@@ -258,7 +262,6 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)
     device_class_set_parent_reset(dc, superh_cpu_reset, &scc->parent_reset);
 
     cc->class_by_name = superh_cpu_class_by_name;
-    cc->has_work = superh_cpu_has_work;
     cc->dump_state = superh_cpu_dump_state;
     cc->set_pc = superh_cpu_set_pc;
     cc->gdb_read_register = superh_cpu_gdb_read_register;
-- 
2.31.1

Re: [PATCH v3 26/30] target/sh4: Restrict has_work() handler to sysemu and TCG
Posted by Richard Henderson 4 years, 5 months ago
On 9/3/21 8:13 PM, Philippe Mathieu-Daudé wrote:
> Restrict has_work() to TCG sysemu.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   target/sh4/cpu.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
> index 2047742d03c..6c47d28631c 100644
> --- a/target/sh4/cpu.c
> +++ b/target/sh4/cpu.c
> @@ -58,12 +58,15 @@ static bool superh_io_recompile_replay_branch(CPUState *cs,
>       }
>       return false;
>   }
> -#endif
>   
> +#if defined(CONFIG_TCG)
>   static bool superh_cpu_has_work(CPUState *cs)

No CONFIG_TCG, otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~