[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/46] target/i386: Fix handling of VEX prefixes
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 17/46] target/i386: Fix handling of VEX prefixes |
Date: |
Wed, 20 Dec 2017 18:14:29 +0100 |
From: Peter Maydell <address@hidden>
In commit e3af7c788b73a6495eb9d94992ef11f6ad6f3c56 we
replaced direct calls to to cpu_ld*_code() with calls
to the x86_ld*_code() wrappers which incorporate an
advance of s->pc. Unfortunately we didn't notice that
in one place the old code was deliberately not incrementing
s->pc:
@@ -4501,7 +4528,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState
*cpu)
static const int pp_prefix[4] = {
0, PREFIX_DATA, PREFIX_REPZ, PREFIX_REPNZ
};
- int vex3, vex2 = cpu_ldub_code(env, s->pc);
+ int vex3, vex2 = x86_ldub_code(env, s);
if (!CODE64(s) && (vex2 & 0xc0) != 0xc0) {
/* 4.1.4.6: In 32-bit mode, bits [7:6] must be 11b,
This meant we were mishandling this set of instructions.
Remove the manual advance of s->pc for the "is VEX" case
(which is now done by x86_ldub_code()) and instead rewind
PC in the case where we decide that this isn't really VEX.
Signed-off-by: Peter Maydell <address@hidden>
Cc: address@hidden
Reported-by: Alexandro Sanchez Bach <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target/i386/translate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/translate.c b/target/i386/translate.c
index f410938..23d7eec 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -4548,9 +4548,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState
*cpu)
if (!CODE64(s) && (vex2 & 0xc0) != 0xc0) {
/* 4.1.4.6: In 32-bit mode, bits [7:6] must be 11b,
otherwise the instruction is LES or LDS. */
+ s->pc--; /* rewind the advance_pc() x86_ldub_code() did */
break;
}
- s->pc++;
/* 4.1.1-4.1.3: No preceding lock, 66, f2, f3, or rex prefixes. */
if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ
--
1.8.3.1
- [Qemu-devel] [PULL 07/46] MAITAINERS: List Fam Zheng as reviewer for SCSI patches, (continued)
- [Qemu-devel] [PULL 07/46] MAITAINERS: List Fam Zheng as reviewer for SCSI patches, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 09/46] hyperv: set partition-wide MSRs only on first vcpu, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 10/46] hyperv: ensure SINTx msrs are reset properly, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 08/46] x86/cpu: Enable new SSE/AVX/AVX512 cpu features, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 12/46] cpus: make pause_all_cpus() play with SMP on single threaded TCG, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 13/46] cpu-exec: fix missed CPU kick during interrupt injection, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 11/46] hyperv: make SynIC version msr constant, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 14/46] target/i386: Fix compiler warnings, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 15/46] baum: Truncate braille device size to 84x1, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 18/46] tests/boot-serial-test: Make sure that we check the timeout regularly, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 17/46] target/i386: Fix handling of VEX prefixes,
Paolo Bonzini <=
- [Qemu-devel] [PULL 19/46] tests/boot-serial-test: Add code to allow to specify our own kernel or bios, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 22/46] hw/moxie/moxiesim: Add support for loading a BIOS on moxiesim, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 21/46] tests/boot-serial-test: Add tests for microblaze boards, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 16/46] sockets: remove obsolete code that updated listen address, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 20/46] tests/boot-serial-test: Add support for the mcf5208evb board, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 24/46] tests/boot-serial-test: Add support for the raspi2 machine, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 23/46] tests/boot-serial-test: Add a test for the moxiesim machine, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 26/46] cpu: suffix cpu address spaces with cpu index, Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 25/46] cpu: refactor cpu_address_space_init(), Paolo Bonzini, 2017/12/20
- [Qemu-devel] [PULL 29/46] exec: Don't reuse unassigned_mem_ops for io_mem_rom, Paolo Bonzini, 2017/12/20