JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_proc.cc (format_proc_cpuinfo): Remove Intel-specific flags

Browse Source 
from /proc/cpuinfo on non-Intel processors. Added new AMD-specific
	flags. Changed Intel flag names to match Linux.
This commit is contained in:
Corinna Vinschen 2004-07-26 13:19:03 +00:00
parent 3bf0227220
commit 2646298531
2 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2004-07-26 Christopher January <chris@atomice.net>
* fhandler_proc.cc (format_proc_cpuinfo): Remove Intel-specific flags
from /proc/cpuinfo on non-Intel processors. Added new AMD-specific
flags. Changed Intel flag names to match Linux.
2004-07-24 Christopher Faylor <cgf@timesys.com> 2004-07-24 Christopher Faylor <cgf@timesys.com>
* dcrt0.cc (dll_crt0_0): Use proper boolean arguments. * dcrt0.cc (dll_crt0_0): Use proper boolean arguments.

85
winsup/cygwin/fhandler_proc.cc
View File

@ -698,14 +698,14 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
cpuid (&maxf, &vendor_id[0], &vendor_id[2], &vendor_id[1], 0); cpuid (&maxf, &vendor_id[0], &vendor_id[2], &vendor_id[1], 0);
maxf &= 0xffff; maxf &= 0xffff;
vendor_id[3] = 0; vendor_id[3] = 0;
// vendor identification // vendor identification
bool is_amd = false, is_intel = false; bool is_amd = false, is_intel = false;
if (!strcmp ((char*)vendor_id, "AuthenticAMD")) if (!strcmp ((char*)vendor_id, "AuthenticAMD"))
is_amd = true; is_amd = true;
else if (!strcmp ((char*)vendor_id, "GenuineIntel")) else if (!strcmp ((char*)vendor_id, "GenuineIntel"))
is_intel = true; is_intel = true;
bufptr += __small_sprintf (bufptr, "vendor_id : %s\n", (char *)vendor_id); bufptr += __small_sprintf (bufptr, "vendor_id : %s\n", (char *)vendor_id);
unsigned cpu_mhz = 0; unsigned cpu_mhz = 0;
if (wincap.is_winnt ()) if (wincap.is_winnt ())
@ -841,9 +841,9 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
print (" psn"); print (" psn");
if (features1 & (1 << 19)) if (features1 & (1 << 19))
print (" clfl"); print (" clfl");
if (features1 & (1 << 21)) if (is_intel && features1 & (1 << 21))
print (" dtes"); print (" dtes");
if (features1 & (1 << 22)) if (is_intel && features1 & (1 << 22))
print (" acpi"); print (" acpi");
if (features1 & (1 << 23)) if (features1 & (1 << 23))
print (" mmx"); print (" mmx");
@ -851,45 +851,56 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
print (" fxsr"); print (" fxsr");
if (features1 & (1 << 25)) if (features1 & (1 << 25))
print (" sse"); print (" sse");
if (features1 & (1 << 26)) if (is_intel)
print (" sse2"); {
if (features1 & (1 << 27)) if (features1 & (1 << 26))
print (" ss"); print (" sse2");
if (features1 & (1 << 28)) if (features1 & (1 << 27))
print (" htt"); print (" ss");
if (features1 & (1 << 29)) if (features1 & (1 << 28))
print (" tmi"); print (" htt");
if (features1 & (1 << 30)) if (features1 & (1 << 29))
print (" ia-64"); print (" tmi");
if (features1 & (1 << 31)) if (features1 & (1 << 30))
print (" pbe"); print (" ia-64");
if (features2 & (1 << 0)) if (features1 & (1 << 31))
print (" sse3"); print (" pbe");
if (features2 & (1 << 3))
print (" mon"); if (features2 & (1 << 0))
if (features2 & (1 << 4)) print (" pni");
print (" dscpl"); if (features2 & (1 << 3))
if (features2 & (1 << 8)) print (" monitor");
print (" tm2"); if (features2 & (1 << 4))
if (features2 & (1 << 10)) print (" ds_cpl");
print (" cid"); if (features2 & (1 << 7))
print (" tm2");
if (is_amd) if (features2 & (1 << 8))
print (" est");
if (features2 & (1 << 10))
print (" cid");
}
if (is_amd && maxe >= 0x80000001)
{ {
// uses AMD extended calls to check // uses AMD extended calls to check
// for 3dnow and 3dnow extended support // for 3dnow and 3dnow extended support
// (source: AMD Athlon Processor Recognition Application Note) // (source: AMD Athlon Processor Recognition Application Note)
unsigned int a = 0, b, c, d;
cpuid (&a, &b, &c, &d, 0x80000000); if (maxe >= 0x80000001) // has basic capabilities
if (a >= 0x80000001) // has basic capabilities
{ {
cpuid (&a, &b, &c, &d, 0x80000001); cpuid (&unused, &unused, &unused, &features2, 0x80000001);
if(d & (1 << 30)) // 31th bit is on if (features2 & (1 << 11))
print (" syscall");
if (features2 & (1 << 19))
print (" mp");
if (features2 & (1 << 22))
print (" mmxext");
if (features2 & (1 << 29))
print (" lm");
if (features2 & (1 << 30)) // 31th bit is on
print (" 3dnowext"); print (" 3dnowext");
if (features2 & (1 << 31)) // 32th bit (highest) is on
if(d & (1 << 31)) // 32th bit (highest) is on
print (" 3dnow"); print (" 3dnow");
} }
} }