target/cris: Restrict cpu_exec_interrupt() handler to sysemu
Restrict cpu_exec_interrupt() and its callees to sysemu. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Warner Losh <imp@bsdimp.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20210911165434.531552-9-f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
083afd18a9
commit
413f858d39
|
@ -205,20 +205,20 @@ static const struct SysemuCPUOps cris_sysemu_ops = {
|
||||||
|
|
||||||
static const struct TCGCPUOps crisv10_tcg_ops = {
|
static const struct TCGCPUOps crisv10_tcg_ops = {
|
||||||
.initialize = cris_initialize_crisv10_tcg,
|
.initialize = cris_initialize_crisv10_tcg,
|
||||||
.cpu_exec_interrupt = cris_cpu_exec_interrupt,
|
|
||||||
.tlb_fill = cris_cpu_tlb_fill,
|
.tlb_fill = cris_cpu_tlb_fill,
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
.cpu_exec_interrupt = cris_cpu_exec_interrupt,
|
||||||
.do_interrupt = crisv10_cpu_do_interrupt,
|
.do_interrupt = crisv10_cpu_do_interrupt,
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct TCGCPUOps crisv32_tcg_ops = {
|
static const struct TCGCPUOps crisv32_tcg_ops = {
|
||||||
.initialize = cris_initialize_tcg,
|
.initialize = cris_initialize_tcg,
|
||||||
.cpu_exec_interrupt = cris_cpu_exec_interrupt,
|
|
||||||
.tlb_fill = cris_cpu_tlb_fill,
|
.tlb_fill = cris_cpu_tlb_fill,
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
.cpu_exec_interrupt = cris_cpu_exec_interrupt,
|
||||||
.do_interrupt = cris_cpu_do_interrupt,
|
.do_interrupt = cris_cpu_do_interrupt,
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
};
|
};
|
||||||
|
|
|
@ -185,11 +185,11 @@ struct CRISCPU {
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
extern const VMStateDescription vmstate_cris_cpu;
|
extern const VMStateDescription vmstate_cris_cpu;
|
||||||
#endif
|
|
||||||
|
|
||||||
void cris_cpu_do_interrupt(CPUState *cpu);
|
void cris_cpu_do_interrupt(CPUState *cpu);
|
||||||
void crisv10_cpu_do_interrupt(CPUState *cpu);
|
void crisv10_cpu_do_interrupt(CPUState *cpu);
|
||||||
bool cris_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
bool cris_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
||||||
|
#endif
|
||||||
|
|
||||||
void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags);
|
void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags);
|
||||||
|
|
||||||
|
|
|
@ -41,20 +41,6 @@
|
||||||
|
|
||||||
#if defined(CONFIG_USER_ONLY)
|
#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,
|
bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
|
||||||
MMUAccessType access_type, int mmu_idx,
|
MMUAccessType access_type, int mmu_idx,
|
||||||
bool probe, uintptr_t retaddr)
|
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));
|
D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy));
|
||||||
return phy;
|
return phy;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
bool cris_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
|
|
Loading…
Reference in New Issue