[MPlayer-cvslog] r23027 - in trunk: configure cpuinfo.c

[diego]

Author: diego
Date: Fri Apr 20 20:57:09 2007
New Revision: 23027

Modified:
   trunk/configure
   trunk/cpuinfo.c

Log:
Intel's Conroe-L makes use of extended models, so adjust CPU detection
routines accordingly.
patch by Zuxy Meng, zuxy.meng gmail com


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Apr 20 20:57:09 2007
@@ -1641,7 +1641,7 @@ case "$host_arch" in
 	fi
 	;;
     6) iproc=686
-	if test "$pmodel" -eq 15; then
+	if test "$pmodel" -ge 15; then
 		proc=core2
 	elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then
 		proc=pentium-m

Modified: trunk/cpuinfo.c
==============================================================================
--- trunk/cpuinfo.c	(original)
+++ trunk/cpuinfo.c	Fri Apr 20 20:57:09 2007
@@ -241,10 +241,9 @@ main(int argc, char **argv)
     stepping = regs.eax & 0xf;
 
     if (family == 0xf)
-    {
       family += (regs.eax >> 20) & 0xff;
+    if (family == 0xf || family == 6)
       model += ((regs.eax >> 16) & 0xf) << 4;
-    }
 
     printf("cpu family\t: %d\n"
            "model\t\t: %d\n"