1. Make MCSection an abstract class.

2. Move section switch printing to MCSection virtual method which takes a
   TAI.  This eliminates textual formatting stuff from TLOF.
3. Eliminate SwitchToSectionDirective, getSectionFlagsAsString, and 
   TLOFELF::AtIsCommentChar.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78510 91177308-0d34-0410-b5e6-96231b3b80d8

11 files changed, 136 insertions, 157 deletions

diff --git a/include/llvm/MC/MCSection.h b/include/llvm/MC/MCSection.h
index 0669d0f39b..4e5969ab3e 100644
--- a/include/llvm/MC/MCSection.h
+++ b/include/llvm/MC/MCSection.h
@@ -20,6 +20,8 @@
 
 namespace llvm {
   class MCContext;
+  class TargetAsmInfo;
+  class raw_ostream;
   
   /// MCSection - Instances of this class represent a uniqued identifier for a
   /// section in the current translation unit.  The MCContext class uniques and
@@ -43,13 +45,13 @@ namespace llvm {
   public:
     virtual ~MCSection();
 
-    static MCSection *Create(const StringRef &Name, bool IsDirective, 
-                             SectionKind K, MCContext &Ctx);
-    
     const std::string &getName() const { return Name; }
     bool isDirective() const { return IsDirective; }
     
     SectionKind getKind() const { return Kind; }
+    
+    virtual void PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                      raw_ostream &OS) const = 0;
   };
 
   
@@ -60,7 +62,9 @@ namespace llvm {
     
     static MCSectionELF *Create(const StringRef &Name, bool IsDirective, 
                                 SectionKind K, MCContext &Ctx);
-    
+
+    virtual void PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                      raw_ostream &OS) const;
   };
 
   class MCSectionMachO : public MCSection {
@@ -70,6 +74,9 @@ namespace llvm {
     
     static MCSectionMachO *Create(const StringRef &Name, bool IsDirective, 
                                   SectionKind K, MCContext &Ctx);
+
+    virtual void PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                      raw_ostream &OS) const;
   };
   
   class MCSectionCOFF : public MCSection {
@@ -79,6 +86,9 @@ namespace llvm {
     
     static MCSectionCOFF *Create(const StringRef &Name, bool IsDirective, 
                                    SectionKind K, MCContext &Ctx);
+    
+    virtual void PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                      raw_ostream &OS) const;
   };
   
 } // end namespace llvm
diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 92b977154b..aa39c90c5a 100644
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -182,11 +182,6 @@ namespace llvm {
 
     //===--- Section Switching Directives ---------------------------------===//
     
-    /// SwitchToSectionDirective - This is the directive used when we want to
-    /// emit a global to an arbitrary section.  The section name is emited after
-    /// this.
-    const char *SwitchToSectionDirective; // Defaults to "\t.section\t"
-    
     /// JumpTableDirective - if non-null, the directive to emit before a jump
     /// table.
     const char *JumpTableDirective;
@@ -432,9 +427,6 @@ namespace llvm {
     unsigned getTextAlignFillValue() const {
       return TextAlignFillValue;
     }
-    const char *getSwitchToSectionDirective() const {
-      return SwitchToSectionDirective;
-    }
     const char *getGlobalDirective() const {
       return GlobalDirective;
     }
diff --git a/include/llvm/Target/TargetLoweringObjectFile.h b/include/llvm/Target/TargetLoweringObjectFile.h
index e517fd375a..0b6fd30a31 100644
--- a/include/llvm/Target/TargetLoweringObjectFile.h
+++ b/include/llvm/Target/TargetLoweringObjectFile.h
@@ -169,14 +169,6 @@ public:
     return 0;
   }
   
-  /// getSectionFlagsAsString - Turn the flags in the specified SectionKind
-  /// into a string that can be printed to the assembly file after the
-  /// ".section foo" part of a section directive.
-  virtual void getSectionFlagsAsString(SectionKind Kind,
-                                       SmallVectorImpl<char> &Str,
-                                       const TargetAsmInfo &TAI) const {
-  }
-  
 protected:
   virtual const MCSection *
   SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
@@ -187,7 +179,6 @@ protected:
   
 
 class TargetLoweringObjectFileELF : public TargetLoweringObjectFile {
-  bool AtIsCommentChar;  // True if @ is the comment character on this target.
   bool HasCrazyBSS;
 protected:
   /// TLSDataSection - Section directive for Thread Local data.
@@ -212,12 +203,9 @@ protected:
   const MCSection *getELFSection(const char *Name, bool isDirective,
                                  SectionKind Kind) const;
 public:
-  /// ELF Constructor - AtIsCommentChar is true if the CommentCharacter from TAI
-  /// is "@".
-  TargetLoweringObjectFileELF(bool atIsCommentChar = false,
-                              // FIXME: REMOVE AFTER UNIQUING IS FIXED.
+  TargetLoweringObjectFileELF(// FIXME: REMOVE AFTER UNIQUING IS FIXED.
                               bool hasCrazyBSS = false)
-    : AtIsCommentChar(atIsCommentChar), HasCrazyBSS(hasCrazyBSS) {}
+    : HasCrazyBSS(hasCrazyBSS) {}
   
   virtual void Initialize(MCContext &Ctx, const TargetMachine &TM);
   
@@ -230,10 +218,6 @@ public:
   getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, 
                            Mangler *Mang, const TargetMachine &TM) const;
   
-  void getSectionFlagsAsString(SectionKind Kind,
-                               SmallVectorImpl<char> &Str,
-                               const TargetAsmInfo &TAI) const;
-  
   virtual const MCSection *
   SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
                          Mangler *Mang, const TargetMachine &TM) const;
@@ -288,10 +272,6 @@ public:
   getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, 
                            Mangler *Mang, const TargetMachine &TM) const;
   
-  virtual void getSectionFlagsAsString(SectionKind Kind,
-                                       SmallVectorImpl<char> &Str,
-                                       const TargetAsmInfo &TAI) const;
-  
   virtual const MCSection *
   SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
                          Mangler *Mang, const TargetMachine &TM) const;
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 68cd4a49ab..61577a5707 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -94,18 +94,7 @@ void AsmPrinter::SwitchToSection(const MCSection *NS) {
 
   if (NS == 0) return;
   
-  // If section is named we need to switch into it via special '.section'
-  // directive and also append funky flags. Otherwise - section name is just
-  // some magic assembler directive.
-  if (!NS->isDirective()) {
-    SmallString<32> FlagsStr;
-    getObjFileLowering().getSectionFlagsAsString(NS->getKind(), FlagsStr, *TAI);
-
-    O << TAI->getSwitchToSectionDirective()
-      << CurrentSection->getName() << FlagsStr.c_str() << '\n';
-  } else {
-    O << CurrentSection->getName() << '\n';
-  }
+  NS->PrintSwitchToSection(*TAI, O);
 }
 
 void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const {
diff --git a/lib/MC/MCSection.cpp b/lib/MC/MCSection.cpp
index ec6078ea37..a1f5664859 100644
--- a/lib/MC/MCSection.cpp
+++ b/lib/MC/MCSection.cpp
@@ -9,8 +9,14 @@
 
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
+//===----------------------------------------------------------------------===//
+// MCSection
+//===----------------------------------------------------------------------===//
+
 MCSection::~MCSection() {
 }
 
@@ -22,26 +28,124 @@ MCSection::MCSection(const StringRef &N, bool isDirective, SectionKind K,
   Entry = this;
 }
 
-MCSection *MCSection::
-Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
-  return new (Ctx) MCSection(Name, IsDirective, K, Ctx);
-}
-
+//===----------------------------------------------------------------------===//
+// MCSectionELF
+//===----------------------------------------------------------------------===//
 
 MCSectionELF *MCSectionELF::
 Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
   return new (Ctx) MCSectionELF(Name, IsDirective, K, Ctx);
 }
 
+void MCSectionELF::PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                        raw_ostream &OS) const {
+  if (isDirective()) {
+    OS << getName() << '\n';
+    return;
+  }
+
+  OS << "\t.section\t" << getName();
+  
+  // Handle the weird solaris syntax if desired.
+  if (TAI.usesSunStyleELFSectionSwitchSyntax() &&
+      !getKind().isMergeableConst() && !getKind().isMergeableCString()) {
+    if (!getKind().isMetadata())
+      OS << ",#alloc";
+    if (getKind().isText())
+      OS << ",#execinstr";
+    if (getKind().isWriteable())
+      OS << ",#write";
+    if (getKind().isThreadLocal())
+      OS << ",#tls";
+  } else {
+    OS << ",\"";
+  
+    if (!getKind().isMetadata())
+      OS << 'a';
+    if (getKind().isText())
+      OS << 'x';
+    if (getKind().isWriteable())
+      OS << 'w';
+    if (getKind().isMergeable1ByteCString() ||
+        getKind().isMergeable2ByteCString() ||
+        getKind().isMergeable4ByteCString() ||
+        getKind().isMergeableConst4() ||
+        getKind().isMergeableConst8() ||
+        getKind().isMergeableConst16())
+      OS << 'M';
+    if (getKind().isMergeable1ByteCString() ||
+        getKind().isMergeable2ByteCString() ||
+        getKind().isMergeable4ByteCString())
+      OS << 'S';
+    if (getKind().isThreadLocal())
+      OS << 'T';
+    
+    OS << "\",";
+    
+    // If comment string is '@', e.g. as on ARM - use '%' instead
+    if (TAI.getCommentString()[0] == '@')
+      OS << '%';
+    else
+      OS << '@';
+    
+    if (getKind().isBSS() || getKind().isThreadBSS())
+      OS << "nobits";
+    else
+      OS << "progbits";
+    
+    if (getKind().isMergeable1ByteCString()) {
+      OS << ",1";
+    } else if (getKind().isMergeable2ByteCString()) {
+      OS << ",2";
+    } else if (getKind().isMergeable4ByteCString()) {
+      OS << ",4";
+    } else if (getKind().isMergeableConst4()) {
+      OS << ",4";
+    } else if (getKind().isMergeableConst8()) {
+      OS << ",8";
+    } else if (getKind().isMergeableConst16()) {
+      OS << ",16";
+    }
+  }
+}
+
+//===----------------------------------------------------------------------===//
+// MCSectionMachO
+//===----------------------------------------------------------------------===//
 
 MCSectionMachO *MCSectionMachO::
 Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
   return new (Ctx) MCSectionMachO(Name, IsDirective, K, Ctx);
 }
 
+void MCSectionMachO::PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                          raw_ostream &OS) const {
+  if (!isDirective())
+    OS << "\t.section\t" << getName() << '\n';
+  else
+    OS << getName() << '\n';
+}
+
+//===----------------------------------------------------------------------===//
+// MCSectionCOFF
+//===----------------------------------------------------------------------===//
 
 MCSectionCOFF *MCSectionCOFF::
 Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
   return new (Ctx) MCSectionCOFF(Name, IsDirective, K, Ctx);
 }
 
+void MCSectionCOFF::PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                         raw_ostream &OS) const {
+  
+  if (isDirective()) {
+    OS << getName() << '\n';
+    return;
+  }
+  OS << "\t.section\t" << getName() << ",\"";
+  if (getKind().isText())
+    OS << 'x';
+  if (getKind().isWriteable())
+    OS << 'w';
+  OS << "\"\n";
+}
diff --git a/lib/Target/ARM/ARMTargetObjectFile.h b/lib/Target/ARM/ARMTargetObjectFile.h
index 55f13b170a..9a9f5bb28d 100644
--- a/lib/Target/ARM/ARMTargetObjectFile.h
+++ b/lib/Target/ARM/ARMTargetObjectFile.h
@@ -16,7 +16,7 @@ namespace llvm {
   
   class ARMElfTargetObjectFile : public TargetLoweringObjectFileELF {
   public:
-    ARMElfTargetObjectFile() : TargetLoweringObjectFileELF(true) {}
+    ARMElfTargetObjectFile() : TargetLoweringObjectFileELF() {}
     
     void Initialize(MCContext &Ctx, const TargetMachine &TM) {
       TargetLoweringObjectFileELF::Initialize(Ctx, TM);
diff --git a/lib/Target/PIC16/PIC16Section.h b/lib/Target/PIC16/PIC16Section.h
index 08801412b7..4c2ae05707 100644
--- a/lib/Target/PIC16/PIC16Section.h
+++ b/lib/Target/PIC16/PIC16Section.h
@@ -16,6 +16,7 @@
 
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
 
@@ -28,9 +29,14 @@ namespace llvm {
                                   SectionKind K, MCContext &Ctx) {
       return new (Ctx) MCSectionPIC16(Name, IsDirective, K, Ctx);
     }
+    
+    
+    virtual void PrintSwitchToSection(const TargetAsmInfo &TAI,
+                                      raw_ostream &OS) const {
+      OS << getName() << '\n';
+    }
+
   };
-  
-  
 
 } // end namespace llvm
 
diff --git a/lib/Target/PIC16/PIC16TargetAsmInfo.cpp b/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
index 50fba39112..fdd1ae008e 100644
--- a/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
+++ b/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
@@ -33,7 +33,6 @@ PIC16TargetAsmInfo() {
   ZeroDirective = NULL;
   AsciiDirective = " dt ";
   AscizDirective = NULL;
-  SwitchToSectionDirective = "";
     
   RomData8bitsDirective = " dw ";
   RomData16bitsDirective = " rom_di ";
diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp
index c2b1888ad3..0cbd597dae 100644
--- a/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -60,7 +60,7 @@ cl::desc("enable preincrement load/store generation on PPC (experimental)"),
 static TargetLoweringObjectFile *CreateTLOF(const PPCTargetMachine &TM) {
   if (TM.getSubtargetImpl()->isDarwin())
     return new TargetLoweringObjectFileMachO();
-  return new TargetLoweringObjectFileELF(false, true);
+  return new TargetLoweringObjectFileELF(true);
 }
 
 
diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index 5ec36b6d15..6ac54e0bf0 100644
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -53,7 +53,6 @@ TargetAsmInfo::TargetAsmInfo() {
   AlignDirective = "\t.align\t";
   AlignmentIsInBytes = true;
   TextAlignFillValue = 0;
-  SwitchToSectionDirective = "\t.section\t";
   JumpTableDirective = 0;
   GlobalDirective = "\t.globl\t";
   SetDirective = 0;
diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp
index bd3b37668d..e41e7a958c 100644
--- a/lib/Target/TargetLoweringObjectFile.cpp
+++ b/lib/Target/TargetLoweringObjectFile.cpp
@@ -404,91 +404,6 @@ getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind,
   
   return getELFSection(GV->getSection().c_str(), false, Kind);
 }
-      
-      
-      
-void TargetLoweringObjectFileELF::
-getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str,
-                        const TargetAsmInfo &TAI) const {
-  // Handle the weird solaris syntax if desired.
-  if (TAI.usesSunStyleELFSectionSwitchSyntax() &&
-      !Kind.isMergeableConst() && !Kind.isMergeableCString()) {
-    // FIXME: Inefficient.
-    std::string Res;
-    if (!Kind.isMetadata())
-      Res += ",#alloc";
-    if (Kind.isText())
-      Res += ",#execinstr";
-    if (Kind.isWriteable())
-      Res += ",#write";
-    if (Kind.isThreadLocal())
-      Res += ",#tls";
-    Str.append(Res.begin(), Res.end());
-    return;    
-  }
-  
-  Str.push_back(',');
-  Str.push_back('"');
-  
-  if (!Kind.isMetadata())
-    Str.push_back('a');
-  if (Kind.isText())
-    Str.push_back('x');
-  if (Kind.isWriteable())
-    Str.push_back('w');
-  if (Kind.isMergeable1ByteCString() ||
-      Kind.isMergeable2ByteCString() ||
-      Kind.isMergeable4ByteCString() ||
-      Kind.isMergeableConst4() ||
-      Kind.isMergeableConst8() ||
-      Kind.isMergeableConst16())
-    Str.push_back('M');
-  if (Kind.isMergeable1ByteCString() ||
-      Kind.isMergeable2ByteCString() ||
-      Kind.isMergeable4ByteCString())
-    Str.push_back('S');
-  if (Kind.isThreadLocal())
-    Str.push_back('T');
-  
-  Str.push_back('"');
-  Str.push_back(',');
-  
-  // If comment string is '@', e.g. as on ARM - use '%' instead
-  if (AtIsCommentChar)
-    Str.push_back('%');
-  else
-    Str.push_back('@');
-  
-  const char *KindStr;
-  if (Kind.isBSS() || Kind.isThreadBSS())
-    KindStr = "nobits";
-  else
-    KindStr = "progbits";
-  
-  Str.append(KindStr, KindStr+strlen(KindStr));
-  
-  if (Kind.isMergeable1ByteCString()) {
-    Str.push_back(',');
-    Str.push_back('1');
-  } else if (Kind.isMergeable2ByteCString()) {
-    Str.push_back(',');
-    Str.push_back('2');
-  } else if (Kind.isMergeable4ByteCString()) {
-    Str.push_back(',');
-    Str.push_back('4');
-  } else if (Kind.isMergeableConst4()) {
-    Str.push_back(',');
-    Str.push_back('4');
-  } else if (Kind.isMergeableConst8()) {
-    Str.push_back(',');
-    Str.push_back('8');
-  } else if (Kind.isMergeableConst16()) {
-    Str.push_back(',');
-    Str.push_back('1');
-    Str.push_back('6');
-  }
-}
-
 
 static const char *getSectionPrefixForUniqueGlobal(SectionKind Kind) {
   if (Kind.isText())                 return ".gnu.linkonce.t.";
@@ -865,21 +780,6 @@ getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind,
   return getCOFFSection(GV->getSection().c_str(), false, Kind);
 }
 
-
-void TargetLoweringObjectFileCOFF::
-getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str,
-                        const TargetAsmInfo &TAI) const {
-  // FIXME: Inefficient.
-  std::string Res = ",\"";
-  if (Kind.isText())
-    Res += 'x';
-  if (Kind.isWriteable())
-    Res += 'w';
-  Res += "\"";
-  
-  Str.append(Res.begin(), Res.end());
-}
-
 static const char *getCOFFSectionPrefixForUniqueGlobal(SectionKind Kind) {
   if (Kind.isText())
     return ".text$linkonce";