[llvm-commits] [llvm] r75685 - in /llvm/trunk: include/llvm/MC/MCStreamer.h lib/MC/MCAsmStreamer.cpp test/MC/AsmParser/directive_lsym.s tools/llvm-mc/AsmParser.cpp tools/llvm-mc/AsmParser.h

[Kevin Enderby]

Author: enderby
Date: Tue Jul 14 16:35:03 2009
New Revision: 75685

URL: http://llvm.org/viewvc/llvm-project?rev=75685&view=rev
Log:
Added llvm-mc support for parsing the .lsym directive.

Added:
    llvm/trunk/test/MC/AsmParser/directive_lsym.s
Modified:
    llvm/trunk/include/llvm/MC/MCStreamer.h
    llvm/trunk/lib/MC/MCAsmStreamer.cpp
    llvm/trunk/tools/llvm-mc/AsmParser.cpp
    llvm/trunk/tools/llvm-mc/AsmParser.h

Modified: llvm/trunk/include/llvm/MC/MCStreamer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCStreamer.h?rev=75685&r1=75684&r2=75685&view=diff

==============================================================================
--- llvm/trunk/include/llvm/MC/MCStreamer.h (original)
+++ llvm/trunk/include/llvm/MC/MCStreamer.h Tue Jul 14 16:35:03 2009
@@ -126,6 +126,12 @@
     /// @param DescValue - The value to set into the n_desc field.
     virtual void EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) = 0;
 
+    /// EmitLocalSymbol - Emit a local symbol of @param Value to @param Symbol.
+    ///
+    /// @param Symbol - The local symbol being created.
+    /// @param Value - The value for the symbol.
+    virtual void EmitLocalSymbol(MCSymbol *Symbol, const MCValue &Value) = 0;
+
     /// EmitCommonSymbol - Emit a common or local common symbol of @param Size
     /// with the @param Pow2Alignment if non-zero.
     ///

Modified: llvm/trunk/lib/MC/MCAsmStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmStreamer.cpp?rev=75685&r1=75684&r2=75685&view=diff

==============================================================================
--- llvm/trunk/lib/MC/MCAsmStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmStreamer.cpp Tue Jul 14 16:35:03 2009
@@ -47,6 +47,8 @@
 
     virtual void EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue);
 
+    virtual void EmitLocalSymbol(MCSymbol *Symbol, const MCValue &Value);
+
     virtual void EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
                                   unsigned Pow2Alignment, bool IsLocal);
 
@@ -172,6 +174,10 @@
   OS << ".desc" << ' ' << Symbol->getName() << ',' << DescValue << '\n';
 }
 
+void MCAsmStreamer::EmitLocalSymbol(MCSymbol *Symbol, const MCValue &Value) {
+  OS << ".lsym" << ' ' << Symbol->getName() << ',' << Value << '\n';
+}
+
 void MCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
                                      unsigned Pow2Alignment, bool IsLocal) {
   if (IsLocal)

Added: llvm/trunk/test/MC/AsmParser/directive_lsym.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/directive_lsym.s?rev=75685&view=auto

==============================================================================
--- llvm/trunk/test/MC/AsmParser/directive_lsym.s (added)
+++ llvm/trunk/test/MC/AsmParser/directive_lsym.s Tue Jul 14 16:35:03 2009
@@ -0,0 +1,8 @@
+# RUN: llvm-mc %s | FileCheck %s
+
+# CHECK: TEST0:
+# CHECK: .lsym bar,foo
+# CHECK: .lsym baz,3
+TEST0:  
+        .lsym   bar, foo
+        .lsym baz, 2+1

Modified: llvm/trunk/tools/llvm-mc/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.cpp?rev=75685&r1=75684&r2=75685&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Tue Jul 14 16:35:03 2009
@@ -528,6 +528,8 @@
       return ParseDirectiveDarwinZerofill();
     if (!strcmp(IDVal, ".desc"))
       return ParseDirectiveDarwinSymbolDesc();
+    if (!strcmp(IDVal, ".lsym"))
+      return ParseDirectiveDarwinLsym();
 
     if (!strcmp(IDVal, ".subsections_via_symbols"))
       return ParseDirectiveDarwinSubsectionsViaSymbols();
@@ -1126,3 +1128,33 @@
 
   return false;
 }
+
+/// ParseDirectiveLsym
+///  ::= .lsym identifier , expression
+bool AsmParser::ParseDirectiveDarwinLsym() {
+  if (Lexer.isNot(asmtok::Identifier))
+    return TokError("expected identifier in directive");
+  
+  // handle the identifier as the key symbol.
+  SMLoc IDLoc = Lexer.getLoc();
+  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+  Lexer.Lex();
+
+  if (Lexer.isNot(asmtok::Comma))
+    return TokError("unexpected token in '.lsym' directive");
+  Lexer.Lex();
+
+  MCValue Expr;
+  if (ParseRelocatableExpression(Expr))
+    return true;
+
+  if (Lexer.isNot(asmtok::EndOfStatement))
+    return TokError("unexpected token in '.lsym' directive");
+  
+  Lexer.Lex();
+
+  // Create the Sym with the value of the Expr
+  Out.EmitLocalSymbol(Sym, Expr);
+
+  return false;
+}

Modified: llvm/trunk/tools/llvm-mc/AsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.h?rev=75685&r1=75684&r2=75685&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.h Tue Jul 14 16:35:03 2009
@@ -110,6 +110,7 @@
   /// accepts a single symbol (which should be a label or an external).
   bool ParseDirectiveSymbolAttribute(MCStreamer::SymbolAttr Attr);
   bool ParseDirectiveDarwinSymbolDesc(); // Darwin specific ".desc"
+  bool ParseDirectiveDarwinLsym(); // Darwin specific ".lsym"
 
   bool ParseDirectiveComm(bool IsLocal); // ".comm" and ".lcomm"
   bool ParseDirectiveDarwinZerofill(); // Darwin specific ".zerofill"