OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/m68k: Restrict cpu_exec_interrupt() handler to sysemu

Browse Source 
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-13-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-09-11 18:54:22 +02:00 committed by Richard Henderson
parent 0792e6c88d
commit d5db810c55
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/m68k/cpu.c
View File

@ -515,10 +515,10 @@ static const struct SysemuCPUOps m68k_sysemu_ops = {
static const struct TCGCPUOps m68k_tcg_ops = { static const struct TCGCPUOps m68k_tcg_ops = {
.initialize = m68k_tcg_init, .initialize = m68k_tcg_init,
.cpu_exec_interrupt = m68k_cpu_exec_interrupt,
.tlb_fill = m68k_cpu_tlb_fill, .tlb_fill = m68k_cpu_tlb_fill,
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
.cpu_exec_interrupt = m68k_cpu_exec_interrupt,
.do_interrupt = m68k_cpu_do_interrupt, .do_interrupt = m68k_cpu_do_interrupt,
.do_transaction_failed = m68k_cpu_transaction_failed, .do_transaction_failed = m68k_cpu_transaction_failed,
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */

2
target/m68k/cpu.h
View File

@ -166,8 +166,10 @@ struct M68kCPU {
}; };
#ifndef CONFIG_USER_ONLY
void m68k_cpu_do_interrupt(CPUState *cpu); void m68k_cpu_do_interrupt(CPUState *cpu);
bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req); bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req);
#endif /* !CONFIG_USER_ONLY */
void m68k_cpu_dump_state(CPUState *cpu, FILE *f, int flags); void m68k_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
int m68k_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int m68k_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);

16
target/m68k/op_helper.c
View File

@ -24,18 +24,7 @@
#include "semihosting/semihost.h" #include "semihosting/semihost.h"
#include "tcg/tcg.h" #include "tcg/tcg.h"
#if defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
void m68k_cpu_do_interrupt(CPUState *cs)
{
cs->exception_index = -1;
}
static inline void do_interrupt_m68k_hardirq(CPUM68KState *env)
{
}
#else
static void cf_rte(CPUM68KState *env) static void cf_rte(CPUM68KState *env)
{ {
@ -516,7 +505,6 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr,
cpu_loop_exit(cs); cpu_loop_exit(cs);
} }
} }
#endif
bool m68k_cpu_exec_interrupt(CPUState *cs, int interrupt_request) bool m68k_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
{ {
@ -538,6 +526,8 @@ bool m68k_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
return false; return false;
} }
#endif /* !CONFIG_USER_ONLY */
static void raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr) static void raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr)
{ {
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);