35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From 004e0a984118380ff89ceaabb6ace1ebbfb1eb6d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 12 Sep 2024 11:08:13 +0800
|
||
|
|
Subject: [PATCH] target/i386: no single-step exception after MOV or POP SS
|
||
|
|
|
||
|
|
cherry picked from commitd f0f0136abba688a6516647a79cc91e03fad6d5d7
|
||
|
|
|
||
|
|
Intel SDM 18.3.1.4 "If an occurrence of the MOV or POP instruction
|
||
|
|
loads the SS register executes with EFLAGS.TF = 1, no single-step debug
|
||
|
|
exception occurs following the MOV or POP instruction."
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
target/i386/tcg/translate.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
|
||
|
|
index 037bc47e7c..dc672d7995 100644
|
||
|
|
--- a/target/i386/tcg/translate.c
|
||
|
|
+++ b/target/i386/tcg/translate.c
|
||
|
|
@@ -2790,7 +2790,7 @@ do_gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf, bool jr)
|
||
|
|
if (recheck_tf) {
|
||
|
|
gen_helper_rechecking_single_step(tcg_env);
|
||
|
|
tcg_gen_exit_tb(NULL, 0);
|
||
|
|
- } else if (s->flags & HF_TF_MASK) {
|
||
|
|
+ } else if ((s->flags & HF_TF_MASK) && !inhibit) {
|
||
|
|
gen_helper_single_step(tcg_env);
|
||
|
|
} else if (jr) {
|
||
|
|
tcg_gen_lookup_and_goto_ptr();
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|