diff options
| author | des <des@FreeBSD.org> | 1998-05-22 22:15:14 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 1998-05-22 22:15:14 +0000 |
| commit | 8f5039aea8bc742f81234a3c0de80ee7dce3b0a3 (patch) | |
| tree | 1e8edda0655dbf94011a5f876e0da400e393bf0c /sys/i386 | |
| parent | 3e376801df781d96466739ca0d0345c2e39e5de2 (diff) | |
| download | FreeBSD-src-8f5039aea8bc742f81234a3c0de80ee7dce3b0a3.zip FreeBSD-src-8f5039aea8bc742f81234a3c0de80ee7dce3b0a3.tar.gz | |
Use switch instead of if/else chain for 686 model identification.
Add precise model identification for 586-family CPUs.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/identcpu.c | 49 |
1 files changed, 41 insertions, 8 deletions
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index c7fc3af..d2012a5 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $Id: identcpu.c,v 1.46 1998/05/19 19:40:45 peter Exp $ + * $Id: identcpu.c,v 1.47 1998/05/21 22:53:24 des Exp $ */ #include "opt_cpu.h" @@ -144,7 +144,34 @@ printcpuinfo(void) strcat(cpu_model, "i486 "); break; case 0x500: - strcat(cpu_model, "Pentium"); /* nb no space */ + /* Check the particular flavor of 586 */ + strcat(cpu_model, "Pentium"); + switch (cpu_id & 0xf0) { + case 0x00: + strcat(cpu_model, " A-step"); + break; + case 0x10: + strcat(cpu_model, "/P5"); + break; + case 0x20: + strcat(cpu_model, "/P54C"); + break; + case 0x30: + strcat(cpu_model, "/P54T Overdrive"); + break; + case 0x40: + strcat(cpu_model, "/P55C"); + break; + case 0x70: + strcat(cpu_model, "/P54C"); + break; + case 0x80: + strcat(cpu_model, "/P55C (quarter-micron)"); + break; + default: + /* nothing */ + break; + } #if defined(I586_CPU) && !defined(NO_F00F_HACK) /* * XXX - If/when Intel fixes the bug, this @@ -156,19 +183,25 @@ printcpuinfo(void) break; case 0x600: /* Check the particular flavor of 686 */ - if ((cpu_id & 0xf0) == 0x00) + switch (cpu_id & 0xf0) { + case 0x00: strcat(cpu_model, "Pentium Pro A-step"); - else if ((cpu_id & 0xf0) == 0x10) + break; + case 0x10: strcat(cpu_model, "Pentium Pro"); - else if ((cpu_id & 0xf0) == 0x30) { + break; + case 0x30: strcat(cpu_model, "Pentium II"); cpu = CPU_PII; - } - else if ((cpu_id & 0xf0) == 0x50) { + break; + case 0x50: strcat(cpu_model, "Pentium II (quarter-micron)"); cpu = CPU_PII; + break; + default: + strcat(cpu_model, "Unknown 80686"); + break; } - else strcat(cpu_model, "Unknown 80686"); break; default: strcat(cpu_model, "unknown"); |
