From 23739b3dc669a5fd9e92ac40e88adb541dd8ca79 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 6 May 2020 00:22:21 +0200 Subject: [PATCH] Some CPU fixes, fixes #736. --- src/cpu/codegen_x86-64.c | 2 +- src/cpu/codegen_x86.c | 2 +- src/cpu_common/cpu.c | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/cpu/codegen_x86-64.c b/src/cpu/codegen_x86-64.c index 051a3b414..8c3d87387 100644 --- a/src/cpu/codegen_x86-64.c +++ b/src/cpu/codegen_x86-64.c @@ -1083,7 +1083,7 @@ generate_call: int jump_cycles = 0; if (codegen_timing_jump_cycles != NULL) - codegen_timing_jump_cycles(); + jump_cycles = codegen_timing_jump_cycles(); if (jump_cycles) { diff --git a/src/cpu/codegen_x86.c b/src/cpu/codegen_x86.c index 8755f2cd2..85e2af2b1 100644 --- a/src/cpu/codegen_x86.c +++ b/src/cpu/codegen_x86.c @@ -2047,7 +2047,7 @@ generate_call: int jump_cycles = 0; if (codegen_timing_jump_cycles != NULL) - codegen_timing_jump_cycles(); + jump_cycles = codegen_timing_jump_cycles(); if (jump_cycles) { diff --git a/src/cpu_common/cpu.c b/src/cpu_common/cpu.c index 79728c50e..0c643f9d9 100644 --- a/src/cpu_common/cpu.c +++ b/src/cpu_common/cpu.c @@ -2210,10 +2210,7 @@ cpu_CPUID(void) { EAX = CPUID; EBX = ECX = 0; - EDX = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_CMPXCHG8B | CPUID_MTRR/* | CPUID_SEP*/ | CPUID_CMOV; -#ifdef USE_SEP - EDX |= CPUID_SEP; -#endif + EDX = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_CMPXCHG8B | CPUID_MTRR | CPUID_SEP | CPUID_CMOV; } else if (EAX == 2) {