[llvm-commits] CVS: llvm/lib/Target/X86/X86Subtarget.h X86TargetAsmInfo.cpp

[Bill Wendling]

Changes in directory llvm/lib/Target/X86:

X86Subtarget.h updated: 1.26 -> 1.27
X86TargetAsmInfo.cpp updated: 1.27 -> 1.28
---
Log message:

Instead of yet another enum indicating the "assembly language flavor",
just use the one that's in the subtarget.



---
Diffs of the changes:  (+6 -9)

 X86Subtarget.h       |    4 ++++
 X86TargetAsmInfo.cpp |   11 ++---------
 2 files changed, 6 insertions(+), 9 deletions(-)


Index: llvm/lib/Target/X86/X86Subtarget.h
diff -u llvm/lib/Target/X86/X86Subtarget.h:1.26 llvm/lib/Target/X86/X86Subtarget.h:1.27
--- llvm/lib/Target/X86/X86Subtarget.h:1.26	Fri Jan 12 13:20:47 2007
+++ llvm/lib/Target/X86/X86Subtarget.h	Tue Jan 16 03:29:17 2007
@@ -111,6 +111,10 @@
   bool has3DNow() const { return X863DNowLevel >= ThreeDNow; }
   bool has3DNowA() const { return X863DNowLevel >= ThreeDNowA; }
 
+  unsigned getAsmFlavor() const {
+    return AsmFlavor != Unset ? unsigned(AsmFlavor) : 0;
+  }
+
   bool isFlavorAtt() const { return AsmFlavor == ATT; }
   bool isFlavorIntel() const { return AsmFlavor == Intel; }
 


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.27 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.28
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.27	Mon Jan 15 22:13:03 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Tue Jan 16 03:29:17 2007
@@ -21,12 +21,6 @@
 #include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
-// ASM variant to use.
-enum {
-  X86_ATT   = 0,
-  X86_INTEL = 1
-};
-
 static const char* x86_asm_table[] = {"{si}", "S",
                                       "{di}", "D",
                                       "{ax}", "a",
@@ -44,7 +38,6 @@
   // FIXME - Should be simplified.
 
   AsmTransCBE = x86_asm_table;
-  AssemblerDialect = X86_ATT;
   
   switch (Subtarget->TargetType) {
   case X86Subtarget::isDarwin:
@@ -169,9 +162,9 @@
     TextSectionStartSuffix = "\tsegment 'CODE'";
     DataSectionStartSuffix = "\tsegment 'DATA'";
     SectionEndDirectiveSuffix = "\tends\n";
-
-    AssemblerDialect = X86_INTEL;
   }
+
+  AssemblerDialect = Subtarget->getAsmFlavor();
 }
 
 bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {