diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-25 10:47:31 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-08 10:33:38 +0200 |
| commit | 3718523d011e898d414f09a4ed43cf13d76de0b4 (patch) | |
| tree | 7dcfa2556cab98c86386d028ec87d7052c786a6a | |
| parent | 1a150d331d9bbd882c8b93146ff7fbc6259f0961 (diff) | |
| download | qemu-3718523d011e898d414f09a4ed43cf13d76de0b4.zip qemu-3718523d011e898d414f09a4ed43cf13d76de0b4.tar.gz qemu-3718523d011e898d414f09a4ed43cf13d76de0b4.tar.bz2 | |
target/i386: fix INHIBIT_IRQ/TF/RF handling for PAUSE
PAUSE uses DISAS_NORETURN because the corresponding helper
calls cpu_loop_exit(). However, while HLT clear HF_INHIBIT_IRQ_MASK
to correctly handle "STI; HLT", the same is missing from PAUSE.
And also gen_eob() clears HF_RF_MASK and synthesizes a #DB exception
if single-step is active; none of this is done by HLT and PAUSE.
Start fixing PAUSE, HLT will follow.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target/i386/tcg/misc_helper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/i386/tcg/misc_helper.c b/target/i386/tcg/misc_helper.c index 8316d42..ed4cda8 100644 --- a/target/i386/tcg/misc_helper.c +++ b/target/i386/tcg/misc_helper.c @@ -92,6 +92,10 @@ G_NORETURN void helper_pause(CPUX86State *env) { CPUState *cs = env_cpu(env); + /* Do gen_eob() tasks before going back to the main loop. */ + do_end_instruction(env); + helper_rechecking_single_step(env); + /* Just let another CPU run. */ cs->exception_index = EXCP_INTERRUPT; cpu_loop_exit(cs); |