[llvm-commits] [llvm] r61556 - /llvm/trunk/lib/Target/X86/X86Subtarget.cpp
Evan Cheng
evan.cheng at apple.com
Thu Jan 1 21:29:20 PST 2009
Author: evancheng
Date: Thu Jan 1 23:29:20 2009
New Revision: 61556
URL: http://llvm.org/viewvc/llvm-project?rev=61556&view=rev
Log:
Fix x86 CPU id detection to identify Penryn (and future processors).
Modified:
llvm/trunk/lib/Target/X86/X86Subtarget.cpp
Modified: llvm/trunk/lib/Target/X86/X86Subtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.cpp?rev=61556&r1=61555&r2=61556&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86Subtarget.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86Subtarget.cpp Thu Jan 1 23:29:20 2009
@@ -180,8 +180,16 @@
unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
if (X86::GetCpuIDAndInfo(0x1, &EAX, &EBX, &ECX, &EDX))
return "generic";
- unsigned Family = (EAX >> 8) & 0xf; // Bits 8 - 11
- unsigned Model = (EAX >> 4) & 0xf; // Bits 4 - 7
+ unsigned Family = (EAX >> 8) & 0xf; // Bits 8 - 11
+ unsigned Model = (EAX >> 4) & 0xf; // Bits 4 - 7
+ if (Family == 6 || Family == 0xf) {
+ if (Family == 0xf)
+ // Examine extended family ID if family ID is F.
+ Family += (EAX >> 20) & 0xff; // Bits 20 - 27
+ // Examine extended model ID if family ID is 6 or F.
+ Model += ((EAX >> 16) & 0xf) << 4; // Bits 16 - 19
+ }
+
X86::GetCpuIDAndInfo(0x80000001, &EAX, &EBX, &ECX, &EDX);
bool Em64T = (EDX >> 29) & 0x1;
@@ -216,6 +224,7 @@
case 13: return "pentium-m";
case 14: return "yonah";
case 15: return "core2";
+ case 23: return "penryn";
default: return "i686";
}
case 15: {
More information about the llvm-commits
mailing list