mirror of https://github.com/xemu-project/xemu.git
accel/tcg: Un-inline icount_exit_request() for clarity
Convert packed logic to dumb icount_exit_request() helper. No functional change intended. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Anton Johansson <anjo@rev.ng> Message-Id: <20240124101639.30056-5-philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
f4cf2ef93f
commit
93c6091bfa
|
@ -777,6 +777,17 @@ static inline bool need_replay_interrupt(int interrupt_request)
|
||||||
}
|
}
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
|
|
||||||
|
static inline bool icount_exit_request(CPUState *cpu)
|
||||||
|
{
|
||||||
|
if (!icount_enabled()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (cpu->cflags_next_tb != -1 && !(cpu->cflags_next_tb & CF_USE_ICOUNT)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return cpu->neg.icount_decr.u16.low + cpu->icount_extra == 0;
|
||||||
|
}
|
||||||
|
|
||||||
static inline bool cpu_handle_interrupt(CPUState *cpu,
|
static inline bool cpu_handle_interrupt(CPUState *cpu,
|
||||||
TranslationBlock **last_tb)
|
TranslationBlock **last_tb)
|
||||||
{
|
{
|
||||||
|
@ -882,10 +893,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Finally, check if we need to exit to the main loop. */
|
/* Finally, check if we need to exit to the main loop. */
|
||||||
if (unlikely(qatomic_read(&cpu->exit_request))
|
if (unlikely(qatomic_read(&cpu->exit_request)) || icount_exit_request(cpu)) {
|
||||||
|| (icount_enabled()
|
|
||||||
&& (cpu->cflags_next_tb == -1 || cpu->cflags_next_tb & CF_USE_ICOUNT)
|
|
||||||
&& cpu->neg.icount_decr.u16.low + cpu->icount_extra == 0)) {
|
|
||||||
qatomic_set(&cpu->exit_request, 0);
|
qatomic_set(&cpu->exit_request, 0);
|
||||||
if (cpu->exception_index == -1) {
|
if (cpu->exception_index == -1) {
|
||||||
cpu->exception_index = EXCP_INTERRUPT;
|
cpu->exception_index = EXCP_INTERRUPT;
|
||||||
|
|
Loading…
Reference in New Issue