RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-10-28 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
* displayCpu.c: Fixed formatting for prettier printing;
	don't print more than 8 flags on a single line of output.
This commit is contained in:
Till Straumann
2009-10-29 03:16:47 +00:00
parent a6d48e3941
commit b80e8572ca
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libcpu/i386/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-10-28 Till Straumann <strauman@slac.stanford.edu>
* displayCpu.c: Fixed formatting for prettier printing;
don't print more than 8 flags on a single line of output.
2009-10-28 Till Straumann <strauman@slac.stanford.edu> 2009-10-28 Till Straumann <strauman@slac.stanford.edu>
* cpuModel.S, cpuModel.h, displayCpu.c: Save/cache CPUID:ECX * cpuModel.S, cpuModel.h, displayCpu.c: Save/cache CPUID:ECX

31
c/src/lib/libcpu/i386/displayCpu.c
View File

@@ -174,7 +174,7 @@ static const char * getmodel(int x86, int model)
void printCpuInfo(void) void printCpuInfo(void)
{ {
int i; int i,j;
static const char *x86_cap_flags[] = { static const char *x86_cap_flags[] = {
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
"cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov", "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov",
@@ -188,35 +188,42 @@ void printCpuInfo(void)
"24", "25", "26", "27", "28", "29", "30", "31" "24", "25", "26", "27", "28", "29", "30", "31"
}; };
printk("cpu\t\t\t: %c86\n", x86+'0'); printk("cpu : %c86\n", x86+'0');
printk("model\t\t: %s\n", printk("model : %s\n",
have_cpuid ? getmodel(x86, x86_model) : "unknown"); have_cpuid ? getmodel(x86, x86_model) : "unknown");
if (x86_vendor_id [0] == '\0') if (x86_vendor_id [0] == '\0')
strcpy(x86_vendor_id, "unknown"); strcpy(x86_vendor_id, "unknown");
printk("vendor_id\t: %s\n", x86_vendor_id); printk("vendor_id : %s\n", x86_vendor_id);
if (x86_mask) if (x86_mask)
if (strncmp(x86_vendor_id, "Cyrix", 5) != 0) { if (strncmp(x86_vendor_id, "Cyrix", 5) != 0) {
printk("stepping\t: %d\n", x86_mask); printk("stepping : %d\n", x86_mask);
} }
else { /* we have a Cyrix */ else { /* we have a Cyrix */
printk("stepping\t: %s\n", Cx86_type[Cx86_step]); printk("stepping : %s\n", Cx86_type[Cx86_step]);
} }
else else
printk("stepping\t: unknown\n"); printk("stepping : unknown\n");
printk("fpu\t\t\t: %s\n", (hard_math ? "yes" : "no")); printk("fpu : %s\n", (hard_math ? "yes" : "no"));
printk("cpuid\t\t: %s\n", (have_cpuid ? "yes" : "no")); printk("cpuid : %s\n", (have_cpuid ? "yes" : "no"));
printk("flags\t\t:"); printk("flags :");
for ( i = 0 ; i < 32 ; i++ ) { for ( i = j = 0 ; i < 32 ; i++ ) {
if ( x86_capability & (1 << i) ) { if ( x86_capability & (1 << i) ) {
if ( j && 0 == (j & 7) )
printk("\n ");
printk(" %s", x86_cap_flags[i]); printk(" %s", x86_cap_flags[i]);
j++;
} }
} }
printk("\n"); printk("\n");
for ( i = 0 ; i < 32 ; i++ ) { printk("flags (ext.):");
for ( i = j = 0 ; i < 32 ; i++ ) {
if ( x86_capability_x & (1 << i) ) { if ( x86_capability_x & (1 << i) ) {
if ( j && 0 == (j & 7) )
printk("\n ");
printk(" %s", x86_cap_x_flags[i]); printk(" %s", x86_cap_x_flags[i]);
j++;
} }
} }
printk("\n"); printk("\n");