ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include/hw/core: Move do_interrupt in TCGCPUOps 

The ifdef out of which it is moved is not quite right: do_interrupt is
only needed for system mode.  Move it to the top of a different ifdef
block, which preserves its position within the structure for that case.

Signed-off-by: Anton Johansson <anjo@rev.ng>
Message-Id: <20240119144024.14289-18-anjo@rev.ng>
[rth: Split from a larger patch and simplified.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Anton Johansson 2024-01-28 10:24:10 +10:00 committed by Richard Henderson
parent a7f6f4f53f
commit b11cdf2748
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/hw/core/tcg-cpu-ops.h
View File

@ -58,11 +58,6 @@ struct TCGCPUOps {
* cpu execution loop (hack for x86 user mode). * cpu execution loop (hack for x86 user mode).
*/ */
void (*fake_user_interrupt)(CPUState *cpu); void (*fake_user_interrupt)(CPUState *cpu);
#else
/**
* @do_interrupt: Callback for interrupt handling.
*/
void (*do_interrupt)(CPUState *cpu);
#endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
/** /**
@ -114,6 +109,8 @@ struct TCGCPUOps {
void (*record_sigbus)(CPUState *cpu, vaddr addr, void (*record_sigbus)(CPUState *cpu, vaddr addr,
MMUAccessType access_type, uintptr_t ra); MMUAccessType access_type, uintptr_t ra);
#else #else
/** @do_interrupt: Callback for interrupt handling. */
void (*do_interrupt)(CPUState *cpu);
/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */ /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
/** /**