OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/i386: Intel only supports SYSCALL/SYSRET in long mode 

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-06-19 15:41:42 +02:00
parent 431c51e9d4
commit fd5dcb1ccd
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/i386/cpu.c
View File

@ -6238,6 +6238,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*ecx |= 1 << 1; /* CmpLegacy bit */ *ecx |= 1 << 1; /* CmpLegacy bit */
} }
} }
if (tcg_enabled() && env->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 &&
!(env->hflags & HF_LMA_MASK)) {
*edx &= ~CPUID_EXT2_SYSCALL;
}
break; break;
case 0x80000002: case 0x80000002:
case 0x80000003: case 0x80000003:

9
target/i386/tcg/translate.c
View File

@ -5692,7 +5692,10 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
break; break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case 0x105: /* syscall */ case 0x105: /* syscall */
/* XXX: is it usable in real mode ? */ /* For Intel SYSCALL is only valid in long mode */
if (!LMA(s) && env->cpuid_vendor1 == CPUID_VENDOR_INTEL_1) {
goto illegal_op;
}
gen_update_cc_op(s); gen_update_cc_op(s);
gen_update_eip_cur(s); gen_update_eip_cur(s);
gen_helper_syscall(cpu_env, cur_insn_len_i32(s)); gen_helper_syscall(cpu_env, cur_insn_len_i32(s));
@ -5702,6 +5705,10 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
gen_eob_worker(s, false, true); gen_eob_worker(s, false, true);
break; break;
case 0x107: /* sysret */ case 0x107: /* sysret */
/* For Intel SYSRET is only valid in long mode */
if (!LMA(s) && env->cpuid_vendor1 == CPUID_VENDOR_INTEL_1) {
goto illegal_op;
}
if (!PE(s)) { if (!PE(s)) {
gen_exception_gpf(s); gen_exception_gpf(s);
} else { } else {