Recognize Pentium 4. Treat everything with model > 6 as model 7 for now,

in the hope that Intel doesn't start number backwards now that they
picked 15 for the P4.
This commit is contained in:
fvdl 2000-09-29 14:16:23 +00:00
parent 50cf734d26
commit 3cb9873a8d
1 changed files with 40 additions and 1 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.405 2000/09/29 13:15:48 fvdl Exp $ */
/* $NetBSD: machdep.c,v 1.406 2000/09/29 14:16:23 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -623,6 +623,16 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
"Pentium Pro, II or III" /* Default */
},
NULL
},
/* Family > 6 */
{
CPUCLASS_686,
{
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
"Pentium 4" /* Default */
},
NULL
} }
},
{
@ -662,6 +672,16 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
"K7 (Athlon)" /* Default */
},
NULL
},
/* Family > 6 */
{
CPUCLASS_686,
{
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
"Unknown K7 (Athlon)" /* Default */
},
NULL
} }
},
{
@ -698,6 +718,15 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
"6x86MX" /* Default */
},
cyrix6x86_cpu_setup
},
/* Family > 6 */
{
CPUCLASS_686,
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
"Unknown 6x86MX" /* Default */
},
NULL
} }
},
{
@ -725,6 +754,16 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
winchip_cpu_setup
},
/* Family 6, not yet available from IDT */
{
CPUCLASS_686,
{
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
"Pentium Pro compatible" /* Default */
},
NULL
},
/* Family > 6, not yet available from IDT */
{
CPUCLASS_686,
{