target/i386: Fix bad patch application to translate.c
PATCH 1/1 target/i386: Fix bad patch application to translate.c
In commit c52ab08aee6f7d4717fc6b517174043126bd302f, the patch snippet for the "syscall" insn got applied to "iret".
Signed-off-by Doug Evans <[email protected]>
--- target/i386/translate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
target/i386/translate.c +5 -5
@@ -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) {
Signature · 1 line
2.8.0.rc3.226.g39d4020
Quoted 4 lines · Doug Evans
In commit
c52ab08aee6f7d4717fc6b517174043126bd302f, the patch snippet for the "syscall" insn got applied to "iret".Signed-off-by Doug Evans <[email protected]>
Patch was corrupt, I have fixed line wrapping by hand and had to use git-am --ignore-whitespace to apply it.
I suggest using git-send-email, as e-mail clients often break patch contents when copying&pasting.
Fixed patch below, for reference:
--- target/i386/translate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
target/i386/translate.c +5 -5
@@ -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) {
Signature · 1 line
2.7.4
Quoted 40 lines
--- target/i386/translate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)target/i386/translate.c +0
-1@@ -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
target/i386/translate.c +2
-4-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
target/i386/translate.c +3
-0+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) {Signature · 1 line
2.8.0.rc3.226.g39d4020
Signature · 1 line
Eduardo