Commit 410e9814 authored by Doug Evans's avatar Doug Evans Committed by Eduardo Habkost
Browse files

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



In commit c52ab08a,
the patch snippet for the "syscall" insn got applied to "iret".

Signed-off-by: default avatarDoug Evans <dje@google.com>
Message-Id: <f403045cde4049058c05446d5c04@google.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent e1ff3c67

target/i386/translate.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

    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) {