X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FMC%2FMCSymbol.cpp;h=c2fad1674aa4308e769ae6db771771ea1db3d34a;hb=23946fcaaefaf3c1a9d1ef86a3786f622c005f1a;hp=64cc15af1b1e18eb83f17ec34fbc7dab0d192a1e;hpb=e19f9783231d7881efbcf2876c11f7914cf516f1;p=oota-llvm.git

diff --git a/lib/MC/MCSymbol.cpp b/lib/MC/MCSymbol.cpp
index 64cc15af1b1..c2fad1674aa 100644
--- a/lib/MC/MCSymbol.cpp
+++ b/lib/MC/MCSymbol.cpp
@@ -8,7 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCSymbol.h"
-#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCExpr.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
@@ -25,23 +26,11 @@ static bool isAcceptableChar(char C) {
   return true;
 }
 
-static char HexDigit(int V) {
-  return V < 10 ? V+'0' : V+'A'-10;
-}
-
-static void MangleLetter(raw_ostream &OS, unsigned char C) {
-  OS << '_' << HexDigit(C >> 4) << HexDigit(C & 15) << '_';
-}
-
-/// NameNeedsEscaping - Return true if the identifier \arg Str needs quotes
-/// for this assembler.
-static bool NameNeedsEscaping(const StringRef &Str, const MCAsmInfo &MAI) {
+/// NameNeedsQuoting - Return true if the identifier \arg Str needs quotes to be
+/// syntactically correct.
+static bool NameNeedsQuoting(StringRef Str) {
   assert(!Str.empty() && "Cannot create an empty MCSymbol");
   
-  // If the first character is a number, we need quotes.
-  if (Str[0] >= '0' && Str[0] <= '9')
-    return true;
-
   // If any of the characters in the string is an unacceptable character, force
   // quotes.
   for (unsigned i = 0, e = Str.size(); i != e; ++i)
@@ -50,38 +39,46 @@ static bool NameNeedsEscaping(const StringRef &Str, const MCAsmInfo &MAI) {
   return false;
 }
 
-static void PrintMangledName(raw_ostream &OS, StringRef Str) {
-  // The first character is not allowed to be a number.
-  if (Str[0] >= '0' && Str[0] <= '9') {
-    MangleLetter(OS, Str[0]);
-    Str = Str.substr(1);
-  }
-  
-  for (unsigned i = 0, e = Str.size(); i != e; ++i) {
-    if (!isAcceptableChar(Str[i]))
-      MangleLetter(OS, Str[i]);
-    else
-      OS << Str[i];
+const MCSymbol &MCSymbol::AliasedSymbol() const {
+  const MCSymbol *S = this;
+  while (S->isVariable()) {
+    const MCExpr *Value = S->getVariableValue();
+    if (Value->getKind() != MCExpr::SymbolRef)
+      return *S;
+    const MCSymbolRefExpr *Ref = static_cast<const MCSymbolRefExpr*>(Value);
+    S = &Ref->getSymbol();
   }
+  return *S;
 }
 
+void MCSymbol::setVariableValue(const MCExpr *Value) {
+  assert(!IsUsed && "Cannot set a variable that has already been used.");
+  assert(Value && "Invalid variable value!");
+  assert((isUndefined() || (isAbsolute() && isa<MCConstantExpr>(Value))) &&
+         "Invalid redefinition!");
+  this->Value = Value;
 
-void MCSymbol::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
-  if (MAI == 0 || !NameNeedsEscaping(getName(), *MAI)) {
-    OS << getName();
-    return;
+  // Variables should always be marked as in the same "section" as the value.
+  const MCSection *Section = Value->FindAssociatedSection();
+  if (Section) {
+    setSection(*Section);
+  } else {
+    setUndefined();
   }
+}
 
-  // On darwin and other systems that allow quoted names, just do that.
-  if (MAI->doesAllowQuotesInName()) {
-    OS << '"' << getName() << '"';
+void MCSymbol::print(raw_ostream &OS) const {
+  // The name for this MCSymbol is required to be a valid target name.  However,
+  // some targets support quoting names with funny characters.  If the name
+  // contains a funny character, then print it quoted.
+  if (!NameNeedsQuoting(getName())) {
+    OS << getName();
     return;
   }
-  
-  // Otherwise, we have to mangle the name.
-  PrintMangledName(OS, getName());
+    
+  OS << '"' << getName() << '"';
 }
 
 void MCSymbol::dump() const {
-  print(errs(), 0);
+  print(dbgs());
 }