[MPlayer-dev-eng] [PATCH] Remove cputable.h?
Zuxy Meng
zuxy.meng at gmail.com
Thu Feb 19 12:57:28 CET 2009
Hi,
We've stopped updating this header for quite some time. Besides, most
x86 CPUs nowadays (from Tualatin onwards for Intel, K6 for AMD) are
equipped with built-in name string. So should we now consider removing
the table altogether?
--
Zuxy
Beauty is truth,
While truth is beauty.
PGP KeyID: E8555ED6
-------------- next part --------------
Index: cputable.h
===================================================================
--- cputable.h ??? 28664?
+++ cputable.h ??????
@@ -1,549 +0,0 @@
-/*
- * Map CPUID to real CPU name.
- * Family F codenames owe much thanks to Neil Phillips, author of x86test.
- *
- * Copyright (C) 2001 Felix Buenemann <atmosfear at users.sourceforge.net>
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_CPUTABLE_H
-#define MPLAYER_CPUTABLE_H
-
-#define MAX_VENDORS 8 /* Number of CPU Vendors */
-
-//#define N_UNKNOWN "unknown"
-//#define N_UNKNOWNEXT "unknown extended model"
-#define N_UNKNOWN ""
-#define N_UNKNOWNEXT ""
-
-#define F_UNKNOWN { \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN \
-}
-
-static const char *cpuname
- /* Vendor */ [MAX_VENDORS]
- /* Family */ [16]
- /* Model */ [16]
- ={
- /* Intel Corporation, "GenuineIntel" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 i386 */ F_UNKNOWN, /* XXX new 386 chips may support CPUID! */
- /* 4 i486 */ {
- /* 0 */ "i486DX-25/33", /* only few of these */
- /* 1 */ "i486DX-50", /* support CPUID! */
- /* 2 */ "i486SX",
- /* 3 */ "i486DX2", /* CPUID only on new chips! */
- /* 4 */ "i486SL",
- /* 5 */ "i486SX2",
- /* 6 */ N_UNKNOWN,
- /* 7 */ "i486DX2/write-back", /* returns 3 in write-through mode */
- /* 8 */ "i486DX4",
- /* 9 */ "i486DX4/write-back",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 5 i586 */ {
- /* 0 */ "Pentium P5 A-step",
- /* 1 */ "Pentium P5",
- /* 2 */ "Pentium P54C",
- /* 3 */ "Pentium OverDrive P24T",
- /* 4 */ "Pentium MMX P55C",
- /* 5 */ N_UNKNOWN, /* XXX DX4 OverDrive? */
- /* 6 */ N_UNKNOWN, /* XXX P5 OverDrive? */
- /* 7 */ "Pentium P54C (new)",
- /* 8 */ "Pentium MMX P55C (new)",
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 6 i686 */ {
- /* 0 */ "PentiumPro A-step",
- /* 1 */ "PentiumPro",
- /* 2 */ N_UNKNOWN,
- /* 3 */ "Pentium II Klamath/Pentium II OverDrive",
- /* 4 */ N_UNKNOWN, /* XXX P55CT - OverDrive for P54? */
- /* 5 */ "Celeron Covington/Pentium II Deschutes,Tonga/Pentium II Xeon",
- /* 6 */ "Celeron A Mendocino/Pentium II Dixon",
- /* 7 */ "Pentium III Katmai/Pentium III Xeon Tanner",
- /* 8 */ "Celeron 2/Pentium III Coppermine,Geyserville",
- /* 9 */ "Pentium M Banias", /* XXX check */
- /* A */ "Pentium III Xeon Cascades",
- /* B */ "Celeron 2/Pentium III Tualatin",
- /* C */ N_UNKNOWN,
- /* D */ "Pentium M Dothan",
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 7 Itanium */ { /* XXX check */
- /* 0 */ "Itanium Merced",
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F extended family (P4/new IA-64)*/ {
- /* 0 */ "Pentium 4 Willamette; Xeon Foster",
- /* 1 */ "Pentium 4 Willamette; Xeon Foster",
- /* 2 */ "Pentium 4/Celeron 4 Northwood; Pentium 4 EE/Xeon Prestonia,Gallatin",
- /* 3 */ "Pentium 4/Celeron D Prescott; Xeon Nocona",
- /* 4 */ "Pentium 4/Celeron D Prescott; Pentium D/XE Smithfield; Xeon Nocona,Irwindale",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- }
- #if 0 /* out of table index boundaries */
- /* 1F Itanium 2 */ { /* XXX check */
- /* 0 */ "Itanium 2 McKinley",
- /* 1 */ "Itanium 2 Madison", /* I coded on that :-) */
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- #endif
- },
- /* United Microelectronics Corporation, "UMC UMC UMC " */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 486 (U5) */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ "486DX U5D",
- /* 2 */ "486SX U5S",
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 5 */ F_UNKNOWN,
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Advanced Micro Devices, "AuthenticAMD" (very rare: "AMD ISBETTER") */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 486/5x86 */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ "486DX2",
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ "486DX2/write-back",
- /* 8 */ "486DX4/5x86",
- /* 9 */ "486DX4/write-back",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ "5x86",
- /* F */ "5x86/write-back"
- },
- /* 5 K5/K6 */ {
- /* 0 */ "K5 SSA5 (PR75,PR90,PR100)",
- /* 1 */ "K5 5k86 (PR120,PR133)",
- /* 2 */ "K5 5k86 (PR166)",
- /* 3 */ "K5 5k86 (PR200)",
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ "K6",
- /* 7 */ "K6 Little Foot",
- /* 8 */ "K6-2",
- /* 9 */ "K6-III Chomper",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ "K6-2+/K6-III+ Sharptooth",
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 K7 */ {
- /* 0 */ N_UNKNOWN, /* Argon? */
- /* 1 */ "Athlon K7",
- /* 2 */ "Athlon K75 Pluto,Orion",
- /* 3 */ "Duron Spitfire",
- /* 4 */ "Athlon Thunderbird",
- /* 5 */ N_UNKNOWN,
- /* 6 */ "Duron/Athlon 4/MP/XP Palomino",
- /* 7 */ "Duron Morgan,Camaro",
- /* 8 */ "Sempron/Athlon MP/XP Thoroughbred; Duron Applebred",
- /* 9 */ N_UNKNOWN,
- /* A */ "Sempron/Athlon MP/XP/XP-M Barton,Thorton",
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F K8 */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ "Opteron Egypt,Italy,Denmark",
- /* 2 */ N_UNKNOWN,
- /* 3 */ "Athlon 64 X2 Manchester,Toledo",
- /* 4 */ "Athlon 64 Clawhammer; Athlon 64 X2 Toledo; Turion Newark,Lancaster",
- /* 5 */ "Athlon 64 FX/Opteron Sledgehammer,Athens,Troy,Venus",
- /* 6 */ N_UNKNOWN,
- /* 7 */ "Athlon 64/FX Sledgehammer,San Diego,Venice",
- /* 8 */ "Mobile Athlon 64 Newcastle; Mobile Sempron Dublin",
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ "Athlon 64 Newcastle; Athlon 64 X2 Manchester",
- /* E */ N_UNKNOWN,
- /* C */ "Athlon 64 Newcastle,Odesssa,Oakville,Venice; Sempron Palermo,Paris,Dublin",
- /* D */ N_UNKNOWN,
- /* F */ "Athlon 64 Newcastle,Winchester,San Diego,Venice; Sempron Palermo"
- }
-
- },
- /* Cyrix Corp./VIA Inc., "CyrixInstead" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 5x86 */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ "MediaGX",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ "5x86", /* CPUID maybe only on newer chips */
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 5 M1 */ {
- /* 0 */ "M1 test-sample", /*?*/
- /* 1 */ N_UNKNOWN,
- /* 2 */ "6x86 M1",
- /* 3 */ "6x86L M1",
- /* 4 */ "GXm",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 M2 */ {
- /* 0 */ "6x86MX M2/M-II",
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ "Cyrix III Joshua (M2 core)",
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* NexGen Inc., "NexGenDriven" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 Nx586 */ {
- /* 0 */ "Nx586/Nx586FPU", /* only newer ones support CPUID! */
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* IDT/Centaur/VIA, "CentaurHauls" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 IDT C6 WinChip */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ "WinChip C6",
- /* 5 */ N_UNKNOWN,
- /* 6 */ "Samuel",
- /* 7 */ N_UNKNOWN,
- /* 8 */ "WinChip 2 C6+,W2,W2A,W2B",
- /* 9 */ "WinChip 3 W3",
- /* A */ "WinChip 4 W4A", /* XXX check */
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 VIA C3 */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ "Cyrix III Samuel (WinChip C5A core)",
- /* 7 */ "C3 Samuel 2 (WinChip C5B core)/C3 Ezra",
- /* 8 */ "C3 Ezra-T",
- /* 9 */ "C3 Nehemiah",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Rise, "RiseRiseRise" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 mP6 */ {
- /* 0 */ "mP6 iDragon 6401,6441 Kirin",
- /* 1 */ "mP6 iDragon 6510 Lynx",
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ "mP6 iDragon II",
- /* 9 */ "mP6 iDragon II (new)",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Transmeta, "GenuineTMx86" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 Crusoe */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ "Crusoe TM3x00,TM5x00",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- }
-};
-
-#undef N_UNKNOWNEXT
-#undef N_UNKNOWN
-#undef F_UNKNOWN
-
-static const struct {
- char string[13];
- char name[48];
-} cpuvendors[MAX_VENDORS] ={
- {"GenuineIntel","Intel"},
- {"UMC UMC UMC ","United Microelectronics Corporation"},
- {"AuthenticAMD","Advanced Micro Devices"},
- {"CyrixInstead","Cyrix/VIA"},
- {"NexGenDriven","NexGen"},
- {"CentaurHauls","IDT/Centaur/VIA"},
- {"RiseRiseRise","Rise"},
- {"GenuineTMx86","Transmeta"}
-};
-
-#endif /* MPLAYER_CPUTABLE_H */
Index: cpudetect.c
===================================================================
--- cpudetect.c ??? 28664?
+++ cpudetect.c ??????
@@ -229,16 +237,7 @@
#endif // RUNTIME_CPUDETECT
}
-
-#define CPUID_EXTFAMILY ((regs2[0] >> 20)&0xFF) /* 27..20 */
-#define CPUID_EXTMODEL ((regs2[0] >> 16)&0x0F) /* 19..16 */
-#define CPUID_TYPE ((regs2[0] >> 12)&0x04) /* 13..12 */
-#define CPUID_FAMILY ((regs2[0] >> 8)&0x0F) /* 11..08 */
-#define CPUID_MODEL ((regs2[0] >> 4)&0x0F) /* 07..04 */
-#define CPUID_STEPPING ((regs2[0] >> 0)&0x0F) /* 03..00 */
-
char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]){
-#include "cputable.h" /* get cpuname and cpuvendors */
char vendor[13];
char *retname;
int i;
@@ -247,6 +246,7 @@
mp_msg(MSGT_CPUDETECT,MSGL_FATAL,"Error: GetCpuFriendlyName() not enough memory\n");
exit(1);
}
+ retname[0] = '\0';
sprintf(vendor,"%.4s%.4s%.4s",(char*)(regs+1),(char*)(regs+3),(char*)(regs+2));
@@ -254,46 +254,15 @@
if (regs[0] >= 0x80000004)
{
// CPU has built-in namestring
- retname[0] = '\0';
for (i = 0x80000002; i <= 0x80000004; i++)
{
do_cpuid(i, regs);
strncat(retname, (char*)regs, 16);
}
- return retname;
}
-
- for(i=0; i<MAX_VENDORS; i++){
- if(!strcmp(cpuvendors[i].string,vendor)){
- if(cpuname[i][CPUID_FAMILY][CPUID_MODEL]){
- snprintf(retname,255,"%s %s",cpuvendors[i].name,cpuname[i][CPUID_FAMILY][CPUID_MODEL]);
- } else {
- snprintf(retname,255,"unknown %s %d. Generation CPU",cpuvendors[i].name,CPUID_FAMILY);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"unknown %s CPU:\n",cpuvendors[i].name);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"Vendor: %s\n",cpuvendors[i].string);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"Type: %d\n",CPUID_TYPE);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"Family: %d (ext: %d)\n",CPUID_FAMILY,CPUID_EXTFAMILY);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"Model: %d (ext: %d)\n",CPUID_MODEL,CPUID_EXTMODEL);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"Stepping: %d\n",CPUID_STEPPING);
- mp_msg(MSGT_CPUDETECT,MSGL_WARN,"Please send the above info along with the exact CPU name"
- "to the MPlayer-Developers, so we can add it to the list!\n");
- }
- }
- }
- retname[255] = 0;
-
- //printf("Detected CPU: %s\n", retname);
return retname;
}
-#undef CPUID_EXTFAMILY
-#undef CPUID_EXTMODEL
-#undef CPUID_TYPE
-#undef CPUID_FAMILY
-#undef CPUID_MODEL
-#undef CPUID_STEPPING
-
-
#if defined(__linux__) && defined(_POSIX_SOURCE) && !ARCH_X86_64
static void sigill_handler_sse( int signal, struct sigcontext sc )
{
More information about the MPlayer-dev-eng
mailing list