Merge branch 'master' into feature/ich2

2026-02-25 04:45:31 -07:00 · 2023-10-13 12:43:40 -04:00
parent c1e3213c02 99c37c0698
commit 4d27f8ba56
8 changed files with 181 additions and 85 deletions
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -1920,7 +1920,10 @@ cpu_CPUID(void)
                EDX = 0x49656e69;
                ECX = 0x6c65746e;
            } else if (EAX == 1) {
-                EAX = CPUID;
+                if ((CPUID == 0x0436) && (cr0 & (1 << 29)))
+                    EAX = 0x0470;
+                else
+                    EAX = CPUID;
                EBX = ECX = 0;
                EDX       = CPUID_FPU | CPUID_VME;
            } else