Changes in directory llvm/lib/Target/X86:
X86Subtarget.cpp updated: 1.19 -> 1.20 --- Log message: Correctly determine CPU vendor. --- Diffs of the changes: (+5 -11) X86Subtarget.cpp | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) Index: llvm/lib/Target/X86/X86Subtarget.cpp diff -u llvm/lib/Target/X86/X86Subtarget.cpp:1.19 llvm/lib/Target/X86/X86Subtarget.cpp:1.20 --- llvm/lib/Target/X86/X86Subtarget.cpp:1.19 Sat Jan 28 12:47:32 2006 +++ llvm/lib/Target/X86/X86Subtarget.cpp Sat Jan 28 13:48:34 2006 @@ -68,18 +68,12 @@ bool Em64T = EDX & (1 << 29); union { - unsigned u[12]; - char c[48]; + unsigned u[3]; + char c[12]; } text; - GetCpuIDAndInfo(0x80000002, text.u+0, text.u+1, text.u+2, text.u+3); - GetCpuIDAndInfo(0x80000003, text.u+4, text.u+5, text.u+6, text.u+7); - GetCpuIDAndInfo(0x80000004, text.u+8, text.u+9, text.u+10, text.u+11); - char *t = text.c; - while (*t == ' ') - t++; - - if (memcmp(t, "Intel", 5) == 0) { + GetCpuIDAndInfo(0, &EAX, text.u+0, text.u+2, text.u+1); + if (memcmp(text.c, "GenuineIntel", 12) == 0) { switch (Family) { case 3: return "i386"; @@ -118,7 +112,7 @@ default: return "generic"; } - } else if (memcmp(t, "AMD", 3) == 0) { + } else if (memcmp(text.c, "AuthenticAMD", 12) == 0) { // FIXME: fill in remaining family/model combinations switch (Family) { case 15: _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits