On Thu, Sep 2, 2021 at 9:18 AM Philippe Mathieu-Daudé <f4...@amsat.org>
wrote:
> Restrict cpu_exec_interrupt() and its callees to sysemu.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> target/cris/cpu.h | 2 +-
> target/cris/cpu.c | 4 ++--
> target/cris/helper.c | 17 ++---------------
> 3 files changed, 5 insertions(+), 18 deletions(-)
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
> diff --git a/target/cris/cpu.h b/target/cris/cpu.h
> index d3b64929096..be021899ae8 100644
> --- a/target/cris/cpu.h
> +++ b/target/cris/cpu.h
> @@ -185,11 +185,11 @@ struct CRISCPU {
>
> #ifndef CONFIG_USER_ONLY
> extern const VMStateDescription vmstate_cris_cpu;
> -#endif
>
> void cris_cpu_do_interrupt(CPUState *cpu);
> void crisv10_cpu_do_interrupt(CPUState *cpu);
> bool cris_cpu_exec_interrupt(CPUState *cpu, int int_req);
> +#endif
>
> void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags);
>
> diff --git a/target/cris/cpu.c b/target/cris/cpu.c
> index 70932b1f8c7..c2e7483f5bd 100644
> --- a/target/cris/cpu.c
> +++ b/target/cris/cpu.c
> @@ -205,20 +205,20 @@ static const struct SysemuCPUOps cris_sysemu_ops = {
>
> static const struct TCGCPUOps crisv10_tcg_ops = {
> .initialize = cris_initialize_crisv10_tcg,
> - .cpu_exec_interrupt = cris_cpu_exec_interrupt,
> .tlb_fill = cris_cpu_tlb_fill,
>
> #ifndef CONFIG_USER_ONLY
> + .cpu_exec_interrupt = cris_cpu_exec_interrupt,
> .do_interrupt = crisv10_cpu_do_interrupt,
> #endif /* !CONFIG_USER_ONLY */
> };
>
> static const struct TCGCPUOps crisv32_tcg_ops = {
> .initialize = cris_initialize_tcg,
> - .cpu_exec_interrupt = cris_cpu_exec_interrupt,
> .tlb_fill = cris_cpu_tlb_fill,
>
> #ifndef CONFIG_USER_ONLY
> + .cpu_exec_interrupt = cris_cpu_exec_interrupt,
> .do_interrupt = cris_cpu_do_interrupt,
> #endif /* !CONFIG_USER_ONLY */
> };
> diff --git a/target/cris/helper.c b/target/cris/helper.c
> index 911867f3b48..36926faf323 100644
> --- a/target/cris/helper.c
> +++ b/target/cris/helper.c
> @@ -41,20 +41,6 @@
>
> #if defined(CONFIG_USER_ONLY)
>
> -void cris_cpu_do_interrupt(CPUState *cs)
> -{
> - CRISCPU *cpu = CRIS_CPU(cs);
> - CPUCRISState *env = &cpu->env;
> -
> - cs->exception_index = -1;
> - env->pregs[PR_ERP] = env->pc;
> -}
> -
> -void crisv10_cpu_do_interrupt(CPUState *cs)
> -{
> - cris_cpu_do_interrupt(cs);
> -}
> -
> bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
> MMUAccessType access_type, int mmu_idx,
> bool probe, uintptr_t retaddr)
> @@ -287,7 +273,6 @@ hwaddr cris_cpu_get_phys_page_debug(CPUState *cs,
> vaddr addr)
> D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy));
> return phy;
> }
> -#endif
>
> bool cris_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
> {
> @@ -319,3 +304,5 @@ bool cris_cpu_exec_interrupt(CPUState *cs, int
> interrupt_request)
>
> return ret;
> }
> +
> +#endif /* !CONFIG_USER_ONLY */
> --
> 2.31.1
>
>
