| Message ID | 20230620151634.21053-7-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | target/i386: add a few simple features | expand |
On 6/20/23 17:16, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > --- > target/i386/cpu.c | 4 ++++ > target/i386/tcg/translate.c | 5 ++++- > 2 files changed, 8 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 695e01582bf..978d24b5ec7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6238,6 +6238,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *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; case 0x80000002: case 0x80000003: diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 89df7bb528a..9aec7ec8288 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -5684,7 +5684,10 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) break; #ifdef TARGET_X86_64 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_eip_cur(s); gen_helper_syscall(cpu_env, cur_insn_len_i32(s));
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- target/i386/cpu.c | 4 ++++ target/i386/tcg/translate.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)