cpu-exec: Move interrupt handling out of cpu_exec()
Simplify cpu_exec() by extracting interrupt handling code outside of cpu_exec() into a new static inline function cpu_handle_interrupt(). Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net> Message-Id: <1462962111-32237-4-git-send-email-sergey.fedorov@linaro.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
ea284766ec
commit
c385e6e497
132
cpu-exec.c
132
cpu-exec.c
|
@ -437,6 +437,74 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void cpu_handle_interrupt(CPUState *cpu,
|
||||||
|
TranslationBlock **last_tb)
|
||||||
|
{
|
||||||
|
CPUClass *cc = CPU_GET_CLASS(cpu);
|
||||||
|
int interrupt_request = cpu->interrupt_request;
|
||||||
|
|
||||||
|
if (unlikely(interrupt_request)) {
|
||||||
|
if (unlikely(cpu->singlestep_enabled & SSTEP_NOIRQ)) {
|
||||||
|
/* Mask out external interrupts for this step. */
|
||||||
|
interrupt_request &= ~CPU_INTERRUPT_SSTEP_MASK;
|
||||||
|
}
|
||||||
|
if (interrupt_request & CPU_INTERRUPT_DEBUG) {
|
||||||
|
cpu->interrupt_request &= ~CPU_INTERRUPT_DEBUG;
|
||||||
|
cpu->exception_index = EXCP_DEBUG;
|
||||||
|
cpu_loop_exit(cpu);
|
||||||
|
}
|
||||||
|
if (replay_mode == REPLAY_MODE_PLAY && !replay_has_interrupt()) {
|
||||||
|
/* Do nothing */
|
||||||
|
} else if (interrupt_request & CPU_INTERRUPT_HALT) {
|
||||||
|
replay_interrupt();
|
||||||
|
cpu->interrupt_request &= ~CPU_INTERRUPT_HALT;
|
||||||
|
cpu->halted = 1;
|
||||||
|
cpu->exception_index = EXCP_HLT;
|
||||||
|
cpu_loop_exit(cpu);
|
||||||
|
}
|
||||||
|
#if defined(TARGET_I386)
|
||||||
|
else if (interrupt_request & CPU_INTERRUPT_INIT) {
|
||||||
|
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||||
|
CPUArchState *env = &x86_cpu->env;
|
||||||
|
replay_interrupt();
|
||||||
|
cpu_svm_check_intercept_param(env, SVM_EXIT_INIT, 0);
|
||||||
|
do_cpu_init(x86_cpu);
|
||||||
|
cpu->exception_index = EXCP_HALTED;
|
||||||
|
cpu_loop_exit(cpu);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
else if (interrupt_request & CPU_INTERRUPT_RESET) {
|
||||||
|
replay_interrupt();
|
||||||
|
cpu_reset(cpu);
|
||||||
|
cpu_loop_exit(cpu);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
/* The target hook has 3 exit conditions:
|
||||||
|
False when the interrupt isn't processed,
|
||||||
|
True when it is, and we should restart on a new TB,
|
||||||
|
and via longjmp via cpu_loop_exit. */
|
||||||
|
else {
|
||||||
|
replay_interrupt();
|
||||||
|
if (cc->cpu_exec_interrupt(cpu, interrupt_request)) {
|
||||||
|
*last_tb = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Don't use the cached interrupt_request value,
|
||||||
|
do_interrupt may have updated the EXITTB flag. */
|
||||||
|
if (cpu->interrupt_request & CPU_INTERRUPT_EXITTB) {
|
||||||
|
cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB;
|
||||||
|
/* ensure that no TB jump will be modified as
|
||||||
|
the program flow was changed */
|
||||||
|
*last_tb = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (unlikely(cpu->exit_request || replay_has_interrupt())) {
|
||||||
|
cpu->exit_request = 0;
|
||||||
|
cpu->exception_index = EXCP_INTERRUPT;
|
||||||
|
cpu_loop_exit(cpu);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* main execution loop */
|
/* main execution loop */
|
||||||
|
|
||||||
int cpu_exec(CPUState *cpu)
|
int cpu_exec(CPUState *cpu)
|
||||||
|
@ -446,7 +514,7 @@ int cpu_exec(CPUState *cpu)
|
||||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||||
CPUArchState *env = &x86_cpu->env;
|
CPUArchState *env = &x86_cpu->env;
|
||||||
#endif
|
#endif
|
||||||
int ret, interrupt_request;
|
int ret;
|
||||||
TranslationBlock *tb, *last_tb;
|
TranslationBlock *tb, *last_tb;
|
||||||
int tb_exit = 0;
|
int tb_exit = 0;
|
||||||
SyncClocks sc;
|
SyncClocks sc;
|
||||||
|
@ -485,67 +553,7 @@ int cpu_exec(CPUState *cpu)
|
||||||
last_tb = NULL; /* forget the last executed TB after exception */
|
last_tb = NULL; /* forget the last executed TB after exception */
|
||||||
cpu->tb_flushed = false; /* reset before first TB lookup */
|
cpu->tb_flushed = false; /* reset before first TB lookup */
|
||||||
for(;;) {
|
for(;;) {
|
||||||
interrupt_request = cpu->interrupt_request;
|
cpu_handle_interrupt(cpu, &last_tb);
|
||||||
if (unlikely(interrupt_request)) {
|
|
||||||
if (unlikely(cpu->singlestep_enabled & SSTEP_NOIRQ)) {
|
|
||||||
/* Mask out external interrupts for this step. */
|
|
||||||
interrupt_request &= ~CPU_INTERRUPT_SSTEP_MASK;
|
|
||||||
}
|
|
||||||
if (interrupt_request & CPU_INTERRUPT_DEBUG) {
|
|
||||||
cpu->interrupt_request &= ~CPU_INTERRUPT_DEBUG;
|
|
||||||
cpu->exception_index = EXCP_DEBUG;
|
|
||||||
cpu_loop_exit(cpu);
|
|
||||||
}
|
|
||||||
if (replay_mode == REPLAY_MODE_PLAY
|
|
||||||
&& !replay_has_interrupt()) {
|
|
||||||
/* Do nothing */
|
|
||||||
} else if (interrupt_request & CPU_INTERRUPT_HALT) {
|
|
||||||
replay_interrupt();
|
|
||||||
cpu->interrupt_request &= ~CPU_INTERRUPT_HALT;
|
|
||||||
cpu->halted = 1;
|
|
||||||
cpu->exception_index = EXCP_HLT;
|
|
||||||
cpu_loop_exit(cpu);
|
|
||||||
}
|
|
||||||
#if defined(TARGET_I386)
|
|
||||||
else if (interrupt_request & CPU_INTERRUPT_INIT) {
|
|
||||||
replay_interrupt();
|
|
||||||
cpu_svm_check_intercept_param(env, SVM_EXIT_INIT, 0);
|
|
||||||
do_cpu_init(x86_cpu);
|
|
||||||
cpu->exception_index = EXCP_HALTED;
|
|
||||||
cpu_loop_exit(cpu);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
else if (interrupt_request & CPU_INTERRUPT_RESET) {
|
|
||||||
replay_interrupt();
|
|
||||||
cpu_reset(cpu);
|
|
||||||
cpu_loop_exit(cpu);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
/* The target hook has 3 exit conditions:
|
|
||||||
False when the interrupt isn't processed,
|
|
||||||
True when it is, and we should restart on a new TB,
|
|
||||||
and via longjmp via cpu_loop_exit. */
|
|
||||||
else {
|
|
||||||
replay_interrupt();
|
|
||||||
if (cc->cpu_exec_interrupt(cpu, interrupt_request)) {
|
|
||||||
last_tb = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Don't use the cached interrupt_request value,
|
|
||||||
do_interrupt may have updated the EXITTB flag. */
|
|
||||||
if (cpu->interrupt_request & CPU_INTERRUPT_EXITTB) {
|
|
||||||
cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB;
|
|
||||||
/* ensure that no TB jump will be modified as
|
|
||||||
the program flow was changed */
|
|
||||||
last_tb = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (unlikely(cpu->exit_request
|
|
||||||
|| replay_has_interrupt())) {
|
|
||||||
cpu->exit_request = 0;
|
|
||||||
cpu->exception_index = EXCP_INTERRUPT;
|
|
||||||
cpu_loop_exit(cpu);
|
|
||||||
}
|
|
||||||
tb = tb_find_fast(cpu, &last_tb, tb_exit);
|
tb = tb_find_fast(cpu, &last_tb, tb_exit);
|
||||||
if (likely(!cpu->exit_request)) {
|
if (likely(!cpu->exit_request)) {
|
||||||
uintptr_t ret;
|
uintptr_t ret;
|
||||||
|
|
Loading…
Reference in a new issue