[MPlayer-cvslog] r38442 - trunk/cpudetect.c

[zuxy]

Author: zuxy
Date: Fri Nov 10 04:58:18 2023
New Revision: 38442

Log:
Fix cpu model for families > 0xf

Modified:
   trunk/cpudetect.c

Modified: trunk/cpudetect.c
==============================================================================
--- trunk/cpudetect.c	Fri Oct 20 22:15:59 2023	(r38441)
+++ trunk/cpudetect.c	Fri Nov 10 04:58:18 2023	(r38442)
@@ -289,12 +289,12 @@ void GetCpuCaps( CpuCaps *caps)
 
 // see AMD64 Architecture Programmer's Manual, Volume 3: General-purpose and
 // System Instructions, Table 3-2: Effective family computation, page 120.
+        if(caps->cpuType==0xf || caps->cpuType==6)
+            caps->cpuModel |= ((regs2[0]>>16)&0xf) << 4;
         if(caps->cpuType==0xf){
             // use extended family (P4, IA64, K8)
             caps->cpuType=0xf+((regs2[0]>>20)&255);
         }
-        if(caps->cpuType==0xf || caps->cpuType==6)
-            caps->cpuModel |= ((regs2[0]>>16)&0xf) << 4;
 
         caps->cpuStepping=regs2[0] & 0xf;