[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/6] target/i386: Fix bad patch application to transl
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 4/6] target/i386: Fix bad patch application to translate.c |
Date: |
Thu, 12 Jan 2017 15:53:54 -0200 |
From: Doug Evans <address@hidden>
In commit c52ab08aee6f7d4717fc6b517174043126bd302f,
the patch snippet for the "syscall" insn got applied to "iret".
Signed-off-by: Doug Evans <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/i386/translate.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 59e11fcd1f..7adfff09fc 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;
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) {
--
2.11.0.259.g40922b1
- [Qemu-devel] [PULL 0/6] x86 and machine queue, 2017-01-17, Eduardo Habkost, 2017/01/12
- [Qemu-devel] [PULL 1/6] qom: remove unused header, Eduardo Habkost, 2017/01/12
- [Qemu-devel] [PULL 2/6] monitor: reuse user_creatable_add_opts() instead of user_creatable_add(), Eduardo Habkost, 2017/01/12
- [Qemu-devel] [PULL 3/6] monitor: fix qmp/hmp query-memdev not reporting IDs of memory backends, Eduardo Habkost, 2017/01/12
- [Qemu-devel] [PULL 4/6] target/i386: Fix bad patch application to translate.c,
Eduardo Habkost <=
- [Qemu-devel] [PULL 6/6] qmp: Report QOM type name on query-cpu-definitions, Eduardo Habkost, 2017/01/12
- [Qemu-devel] [PULL 5/6] numa: make -numa parser dynamically allocate CPUs masks, Eduardo Habkost, 2017/01/12
- Re: [Qemu-devel] [PULL 0/6] x86 and machine queue, 2017-01-17, Peter Maydell, 2017/01/13