pass in more section kinds, enough to get the .align 0x90

[oota-llvm.git] / lib / MC / MCContext.cpp

diff --git a/lib/MC/MCContext.cpp b/lib/MC/MCContext.cpp
index a730a07467520be2119c44807045a043afbfd494..45d2c025361dfdf1b0f16029a9cfd1cabdf61e45 100644 (file)
--- a/lib/MC/MCContext.cpp
+++ b/lib/MC/MCContext.cpp
@@ -1,4 +1,4 @@
-//===- lib/MachineCode/MCContext.cpp - Machine Code Context ---------------===//
+//===- lib/MC/MCContext.cpp - Machine Code Context ------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -8,70 +8,55 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCContext.h"
-
-#include "llvm/MC/MCAtom.h"
-#include "llvm/MC/MCImm.h"
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCSymbol.h"
+#include "llvm/MC/MCValue.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/Twine.h"
 using namespace llvm;
 
-MCContext::MCContext()
-{
+MCContext::MCContext() {
 }
 
 MCContext::~MCContext() {
+  // NOTE: The sections are all allocated out of a bump pointer allocator,
+  // we don't need to free them here.
 }
 
-MCSection *MCContext::GetSection(const char *Name) {
-  MCSection *&Entry = Sections[Name];
-  
-  if (!Entry)
-    Entry = new (this) MCSection(Name);
-
-  return Entry;
-}
-    
-MCAtom *MCContext::CreateAtom(MCSection *Section) {
-  return new (this) MCAtom(Section);
-}
-
-MCSymbol *MCContext::CreateSymbol(MCAtom *Atom, const char *Name) {
+MCSymbol *MCContext::CreateSymbol(StringRef Name) {
   assert(Name[0] != '\0' && "Normal symbols cannot be unnamed!");
 
   // Create and bind the symbol, and ensure that names are unique.
   MCSymbol *&Entry = Symbols[Name];
   assert(!Entry && "Duplicate symbol definition!");
-  return Entry = new (this) MCSymbol(Atom, Name, false);
+  return Entry = new (*this) MCSymbol(Name, false);
 }
 
-MCSymbol *MCContext::CreateTemporarySymbol(MCAtom *Atom, const char *Name) {
-  // If unnamed, just create a symbol.
-  if (Name[0] == '\0')
-    new (this) MCSymbol(Atom, "", true);
-    
-  // Otherwise create as usual.
+MCSymbol *MCContext::GetOrCreateSymbol(StringRef Name) {
   MCSymbol *&Entry = Symbols[Name];
-  assert(!Entry && "Duplicate symbol definition!");
-  return Entry = new (this) MCSymbol(Atom, Name, true);
-}
+  if (Entry) return Entry;
 
-MCSymbol *MCContext::LookupSymbol(const char *Name) const {
-  return Symbols.lookup(Name);
-}
-
-void MCContext::ClearSymbolValue(MCSymbol *Sym) {
-  SymbolValues.erase(Sym);
+  return Entry = new (*this) MCSymbol(Name, false);
 }
 
-void MCContext::SetSymbolValue(MCSymbol *Sym, const MCImm &Value) {
-  SymbolValues[Sym] = Value;
+MCSymbol *MCContext::GetOrCreateSymbol(const Twine &Name) {
+  SmallString<128> NameSV;
+  Name.toVector(NameSV);
+  return GetOrCreateSymbol(NameSV.str());
 }
 
-const MCImm *MCContext::GetSymbolValue(MCSymbol *Sym) const {
-  DenseMap<MCSymbol*, MCImm>::iterator it = SymbolValues.find(Sym);
 
-  if (it == SymbolValues.end())
-    return 0;
+MCSymbol *MCContext::CreateTemporarySymbol(StringRef Name) {
+  // If unnamed, just create a symbol.
+  if (Name.empty())
+    new (*this) MCSymbol("", true);
+    
+  // Otherwise create as usual.
+  MCSymbol *&Entry = Symbols[Name];
+  assert(!Entry && "Duplicate symbol definition!");
+  return Entry = new (*this) MCSymbol(Name, true);
+}
 
-  return &it->second;
+MCSymbol *MCContext::LookupSymbol(StringRef Name) const {
+  return Symbols.lookup(Name);
 }