diff mbox

target/i386: Fix bad patch application to translate.c

Message ID f403045cde4049058c05446d5c04@google.com (mailing list archive)
State New, archived
Headers show

Commit Message

Doug Evans Dec. 24, 2016, 8:29 p.m. UTC 
In commit c52ab08aee6f7d4717fc6b517174043126bd302f,
the patch snippet for the "syscall" insn got applied to "iret".

Signed-off-by: Doug Evans <dje@google.com>
---
  target/i386/translate.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

      case 0xe8: /* call im */
          {
@@ -7119,7 +7116,10 @@ static target_ulong disas_insn(CPUX86State *env,  
DisasContext *s,
          gen_update_cc_op(s);
          gen_jmp_im(pc_start - s->cs_base);
          gen_helper_syscall(cpu_env, tcg_const_i32(s->pc - pc_start));
-        gen_eob(s);
+        /* TF handling for the syscall insn is different. The TF bit is  
checked
+           after the syscall insn completes. This allows #DB to not be
+           generated after one has entered CPL0 if TF is set in FMASK.  */
+        gen_eob_worker(s, false, true);
          break;
      case 0x107: /* sysret */
          if (!s->pe) {
diff mbox

Patch

diff --git a/target/i386/translate.c b/target/i386/translate.c
index 59e11fc..7e9d073 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -6435,10 +6435,7 @@  static target_ulong disas_insn(CPUX86State *env,  
DisasContext *s,
                                        tcg_const_i32(s->pc - s->cs_base));
              set_cc_op(s, CC_OP_EFLAGS);
          }
-        /* TF handling for the syscall insn is different. The TF bit is  
checked
-           after the syscall insn completes. This allows #DB to not be
-           generated after one has entered CPL0 if TF is set in FMASK.  */
-        gen_eob_worker(s, false, true);
+        gen_eob(s);
          break;