| Revision | 8b1fe3f439eaa2f0a6ee7737942bb6c405725867 (tree) |
|---|---|
| Time | 2016-05-13 09:07:16 |
| Author | Sergey Fedorov <serge.fdrv@gmai...> |
| Commiter | Richard Henderson |
cpu-exec: Clean up 'interrupt_request' reloading in cpu_handle_interrupt()
Suggested-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org>
Message-Id: <1463071937-26607-1-git-send-email-sergey.fedorov@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
cpu-exec.c (diff)| @@ -488,10 +488,11 @@ static inline void cpu_handle_interrupt(CPUState *cpu, | ||
| 488 | 488 | if (cc->cpu_exec_interrupt(cpu, interrupt_request)) { |
| 489 | 489 | *last_tb = NULL; |
| 490 | 490 | } |
| 491 | + /* The target hook may have updated the 'cpu->interrupt_request'; | |
| 492 | + * reload the 'interrupt_request' value */ | |
| 493 | + interrupt_request = cpu->interrupt_request; | |
| 491 | 494 | } |
| 492 | - /* Don't use the cached interrupt_request value, | |
| 493 | - do_interrupt may have updated the EXITTB flag. */ | |
| 494 | - if (cpu->interrupt_request & CPU_INTERRUPT_EXITTB) { | |
| 495 | + if (interrupt_request & CPU_INTERRUPT_EXITTB) { | |
| 495 | 496 | cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB; |
| 496 | 497 | /* ensure that no TB jump will be modified as |
| 497 | 498 | the program flow was changed */ |
Fork