target-i386: Fix SMSW for 64-bit mode

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.

Backports commit a657f79e32422634415c09f3f15c73d610297af5 from qemu
This commit is contained in:
Richard Henderson 2018-02-21 21:18:47 -05:00 committed by Lioncash
parent a233d7b13e
commit 085a3c9aab
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7

View File

@ -7959,12 +7959,14 @@ case 0x101:
CASE_MODRM_OP(4): /* smsw */ CASE_MODRM_OP(4): /* smsw */
gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0); gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0);
#if defined TARGET_X86_64 && defined HOST_WORDS_BIGENDIAN tcg_gen_ld_tl(tcg_ctx, cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]));
tcg_gen_ld32u_tl(tcg_ctx, cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]) + 4); if (CODE64(s)) {
#else mod = (modrm >> 6) & 3;
tcg_gen_ld32u_tl(tcg_ctx, cpu_T0, cpu_env, offsetof(CPUX86State, cr[0])); ot = (mod != 3 ? MO_16 : s->dflag);
#endif } else {
gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 1); ot = MO_16;
}
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1);
break; break;
CASE_MODRM_OP(6): /* lmsw */ CASE_MODRM_OP(6): /* lmsw */