[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] target-i386: Fix SMSW for 64-bit mode
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 3/7] target-i386: Fix SMSW for 64-bit mode |
Date: |
Sat, 12 Mar 2016 18:17:05 -0800 |
In non-64-bit modes, the instruction always stores 16 bits.
But in 64-bit mode, when the destination is a register, the
instruction can write 32 or 64 bits.
Signed-off-by: Richard Henderson <address@hidden>
---
target-i386/translate.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 10cc2fa..b73c237 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -7282,12 +7282,14 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
CASE_MODRM_OP(4): /* smsw */
gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0);
-#if defined TARGET_X86_64 && defined HOST_WORDS_BIGENDIAN
- tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]) +
4);
-#else
- tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]));
-#endif
- gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 1);
+ tcg_gen_ld_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]));
+ if (CODE64(s)) {
+ mod = (modrm >> 6) & 3;
+ ot = (mod != 3 ? MO_16 : s->dflag);
+ } else {
+ ot = MO_16;
+ }
+ gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1);
break;
CASE_MODRM_OP(6): /* lmsw */
--
2.5.0
- [Qemu-devel] [PULL 0/7] target-i386 fixes, Richard Henderson, 2016/03/12
- [Qemu-devel] [PULL 4/7] target-i386: Fix addr16 prefix, Richard Henderson, 2016/03/12
- [Qemu-devel] [PULL 2/7] target-i386: Fix SMSW and LMSW from/to register, Richard Henderson, 2016/03/12
- [Qemu-devel] [PULL 3/7] target-i386: Fix SMSW for 64-bit mode,
Richard Henderson <=
- [Qemu-devel] [PULL 1/7] target-i386: Avoid repeated calls to the bnd_jmp helper, Richard Henderson, 2016/03/12
- [Qemu-devel] [PULL 6/7] target-i386: Fix inhibit irq mask handling, Richard Henderson, 2016/03/12
- [Qemu-devel] [PULL 5/7] target-i386: Use gen_nop_modrm for prefetch instructions, Richard Henderson, 2016/03/12
- [Qemu-devel] [PULL 7/7] target-i386: Dump unknown opcodes with -d unimp, Richard Henderson, 2016/03/12
- Re: [Qemu-devel] [PULL 0/7] target-i386 fixes, Peter Maydell, 2016/03/14