[llvm-commits] [llvm] r93886 - in /llvm/trunk: include/llvm/MC/MCAsmInfo.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/MC/MCAsmInfo.cpp lib/Target/X86/X86MCAsmInfo.cpp

Chris Lattner sabre at nondot.org
Tue Jan 19 10:37:01 PST 2010


Author: lattner
Date: Tue Jan 19 12:37:01 2010
New Revision: 93886

URL: http://llvm.org/viewvc/llvm-project?rev=93886&view=rev
Log:
remove MAI::ZeroDirectiveSuffix, which is only used by MASM,
which we don't support anymore.

Modified:
    llvm/trunk/include/llvm/MC/MCAsmInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/MC/MCAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86MCAsmInfo.cpp

Modified: llvm/trunk/include/llvm/MC/MCAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfo.h?rev=93886&r1=93885&r2=93886&view=diff

==============================================================================
--- llvm/trunk/include/llvm/MC/MCAsmInfo.h (original)
+++ llvm/trunk/include/llvm/MC/MCAsmInfo.h Tue Jan 19 12:37:01 2010
@@ -113,7 +113,6 @@
     /// "\t.zero\t" and "\t.space\t".  If this is set to null, the
     /// Data*bitsDirective's will be used to emit zero bytes.
     const char *ZeroDirective;               // Defaults to "\t.zero\t"
-    const char *ZeroDirectiveSuffix;         // Defaults to ""
 
     /// AsciiDirective - This directive allows emission of an ascii string with
     /// the standard C escape characters embedded into it.
@@ -375,9 +374,6 @@
     const char *getZeroDirective() const {
       return ZeroDirective;
     }
-    const char *getZeroDirectiveSuffix() const {
-      return ZeroDirectiveSuffix;
-    }
     const char *getAsciiDirective() const {
       return AsciiDirective;
     }

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=93886&r1=93885&r2=93886&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Tue Jan 19 12:37:01 2010
@@ -916,16 +916,12 @@
 /// EmitZeros - Emit a block of zeros.
 ///
 void AsmPrinter::EmitZeros(uint64_t NumZeros, unsigned AddrSpace) const {
-  if (NumZeros) {
-    if (MAI->getZeroDirective()) {
-      O << MAI->getZeroDirective() << NumZeros;
-      if (MAI->getZeroDirectiveSuffix())
-        O << MAI->getZeroDirectiveSuffix();
-      O << '\n';
-    } else {
-      for (; NumZeros; --NumZeros)
-        O << MAI->getData8bitsDirective(AddrSpace) << "0\n";
-    }
+  if (NumZeros == 0) return;
+  if (MAI->getZeroDirective()) {
+    O << MAI->getZeroDirective() << NumZeros << '\n';
+  } else {
+    for (; NumZeros; --NumZeros)
+      O << MAI->getData8bitsDirective(AddrSpace) << "0\n";
   }
 }
 

Modified: llvm/trunk/lib/MC/MCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfo.cpp?rev=93886&r1=93885&r2=93886&view=diff

==============================================================================
--- llvm/trunk/lib/MC/MCAsmInfo.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmInfo.cpp Tue Jan 19 12:37:01 2010
@@ -37,7 +37,6 @@
   AllowQuotesInName = false;
   AllowNameToStartWithDigit = false;
   ZeroDirective = "\t.zero\t";
-  ZeroDirectiveSuffix = 0;
   AsciiDirective = "\t.ascii\t";
   AscizDirective = "\t.asciz\t";
   Data8bitsDirective = "\t.byte\t";

Modified: llvm/trunk/lib/Target/X86/X86MCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86MCAsmInfo.cpp?rev=93886&r1=93885&r2=93886&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86MCAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86MCAsmInfo.cpp Tue Jan 19 12:37:01 2010
@@ -109,7 +109,6 @@
   PrivateGlobalPrefix = "$";
   AlignDirective = "\tALIGN\t";
   ZeroDirective = "\tdb\t";
-  ZeroDirectiveSuffix = " dup(0)";
   AsciiDirective = "\tdb\t";
   AscizDirective = 0;
   Data8bitsDirective = "\tdb\t";





More information about the llvm-commits mailing list