diff options
| author | davej <davej> | 2003-01-18 16:59:42 +0000 |
|---|---|---|
| committer | davej <davej> | 2003-01-18 16:59:42 +0000 |
| commit | 2a1ba44a447e391ee1270f392983f3d060a54066 (patch) | |
| tree | d38d9e98bf1a9cfaaaf2fb3a58ceb02d59f52510 /Intel | |
| parent | 9c769c72084ddbc209d72e7f8716b85b6ade188d (diff) | |
Decode cache sizes before CPU determination.
Diffstat (limited to 'Intel')
| -rw-r--r-- | Intel/Intel.h | 1 | ||||
| -rw-r--r-- | Intel/cachesize.c | 13 | ||||
| -rw-r--r-- | Intel/identify.c | 3 | ||||
| -rw-r--r-- | Intel/info.c | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/Intel/Intel.h b/Intel/Intel.h index ec1dbcb..1b44f05 100644 --- a/Intel/Intel.h +++ b/Intel/Intel.h @@ -1,6 +1,7 @@ #ifndef _INTEL_H #define _INTEL_H void decode_Intel_caches (struct cpudata *cpu); +void show_Intel_caches(struct cpudata *cpu); void decode_Intel_bluesmoke(int cpunum, int family); void dump_p4_MSRs(struct cpudata *cpu); void dump_p6_MSRs(struct cpudata *cpu); diff --git a/Intel/cachesize.c b/Intel/cachesize.c index 8c0c3db..b7091bc 100644 --- a/Intel/cachesize.c +++ b/Intel/cachesize.c @@ -1,5 +1,5 @@ /* - * $Id: cachesize.c,v 1.5 2003/01/18 16:54:34 davej Exp $ + * $Id: cachesize.c,v 1.6 2003/01/18 16:59:42 davej Exp $ * This file is part of x86info. * (C) 2001 Dave Jones. * @@ -118,9 +118,6 @@ void decode_Intel_caches (struct cpudata *cpu) long regs[4]; unsigned char *dp = (unsigned char *)regs; - if (!show_cacheinfo) - return; - if (cpu->maxi < 2) return; @@ -143,6 +140,12 @@ void decode_Intel_caches (struct cpudata *cpu) if (dp[j]!=0) decode_Intel_cache (dp[j], cpu); } +} + +void show_Intel_caches(struct cpudata *cpu) +{ + if (!show_cacheinfo) + return; if (cpu->cachesize_L1_I) printf ("L1I:%d\n", cpu->cachesize_L1_I); @@ -157,5 +160,3 @@ void decode_Intel_caches (struct cpudata *cpu) printf ("\n"); } - - diff --git a/Intel/identify.c b/Intel/identify.c index a6f4f9b..49736a7 100644 --- a/Intel/identify.c +++ b/Intel/identify.c @@ -1,5 +1,5 @@ /* - * $Id: identify.c,v 1.43 2003/01/06 16:36:27 davej Exp $ + * $Id: identify.c,v 1.44 2003/01/18 16:59:42 davej Exp $ * This file is part of x86info. * (C) 2001 Dave Jones. * @@ -44,6 +44,7 @@ void Identify_Intel (struct cpudata *cpu) cpu->brand = (ebx & 0xf); reserved = eax >> 14; + decode_Intel_caches(cpu); switch (cpu->family) { case 4: nameptr += sprintf (cpu->name, "%s", "i486 "); diff --git a/Intel/info.c b/Intel/info.c index 836d3de..1fbdd84 100644 --- a/Intel/info.c +++ b/Intel/info.c @@ -1,5 +1,5 @@ /* - * $Id: info.c,v 1.3 2002/12/13 23:10:44 davej Exp $ + * $Id: info.c,v 1.4 2003/01/18 16:59:42 davej Exp $ * This file is part of x86info. * (C) 2001 Dave Jones. * @@ -37,7 +37,7 @@ void display_Intel_info (struct cpudata *cpu) dump_p4_MSRs(cpu); } - decode_Intel_caches(cpu); + show_Intel_caches(cpu); if (cpu->maxi >= 3) { /* Pentium III CPU serial number */ |