[llvm-commits] [llvm] r84230 - in /llvm/trunk: lib/MC/MCAsmStreamer.cpp test/MC/AsmParser/labels.s test/MC/AsmParser/variables.s tools/llvm-mc/AsmParser.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Oct 15 20:34:54 2009
New Revision: 84230

URL: http://llvm.org/viewvc/llvm-project?rev=84230&view=rev
Log:
MC: When parsing a variable reference, substitute absolute variables immediately
since they are allowed to be redefined.

Added:
    llvm/trunk/test/MC/AsmParser/variables.s
Modified:
    llvm/trunk/lib/MC/MCAsmStreamer.cpp
    llvm/trunk/test/MC/AsmParser/labels.s
    llvm/trunk/tools/llvm-mc/AsmParser.cpp

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

==============================================================================
--- llvm/trunk/lib/MC/MCAsmStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmStreamer.cpp Thu Oct 15 20:34:54 2009
@@ -123,9 +123,12 @@
   OS << " = ";
   Value->print(OS, &MAI);
   OS << '\n';
+
+  // FIXME: Lift context changes into super class.
+  Symbol->setValue(Value);
 }
 
-void MCAsmStreamer::EmitSymbolAttribute(MCSymbol *Symbol, 
+void MCAsmStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
                                         SymbolAttr Attribute) {
   switch (Attribute) {
   case Global: OS << ".globl"; break;

Modified: llvm/trunk/test/MC/AsmParser/labels.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/labels.s?rev=84230&r1=84229&r2=84230&view=diff

==============================================================================
--- llvm/trunk/test/MC/AsmParser/labels.s (original)
+++ llvm/trunk/test/MC/AsmParser/labels.s Thu Oct 15 20:34:54 2009
@@ -12,21 +12,21 @@
         .long 0
 
         .text
-foo:    
+foo:
 // CHECK: addl $24, a$b(%eax)
-        addl $24, "a$b"(%eax)    
+        addl $24, "a$b"(%eax)
 // CHECK: addl $24, a$b+10(%eax)
         addl $24, ("a$b" + 10)(%eax)
-        
+
 // CHECK: b$c = 10
 "b$c" = 10
-// CHECK: addl $b$c, %eax
+// CHECK: addl $10, %eax
         addl "b$c", %eax
-        
+
 // CHECK: "a 0" = 11
         .set "a 0", 11
-        
-// CHECK: .long "a 0"
+
+// CHECK: .long 11
         .long "a 0"
 
 // XXCHCK: .section "a 1,a 2"
@@ -48,12 +48,12 @@
         .lcomm "a 7", 1
 
 // FIXME: We don't bother to support .lsym.
-        
+
 // CHECX: .lsym "a 8",1
 //        .lsym "a 8", 1
 
 // CHECK: "a 9" = a-b
         .set "a 9", a - b
-        
+
 // CHECK: .long "a 9"
         .long "a 9"

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

==============================================================================
--- llvm/trunk/test/MC/AsmParser/variables.s (added)
+++ llvm/trunk/test/MC/AsmParser/variables.s Thu Oct 15 20:34:54 2009
@@ -0,0 +1,15 @@
+// RUN: llvm-mc %s
+
+        .data
+        t0_v0 = 1
+        t0_v1 = t0_v0
+        .if t0_v1 != 1
+        .abort "invalid value"
+        .endif
+
+        t1_v0 = 1
+        t1_v1 = t0_v0
+        t1_v0 = 2
+        .if t0_v1 != 1
+        .abort "invalid value"
+        .endif

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

==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Thu Oct 15 20:34:54 2009
@@ -21,6 +21,7 @@
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
+#include "llvm/MC/MCValue.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetAsmParser.h"
@@ -220,12 +221,22 @@
     Res = MCUnaryExpr::CreateLNot(Res, getContext());
     return false;
   case AsmToken::String:
-  case AsmToken::Identifier:
-    // This is a label, this should be parsed as part of an expression, to
-    // handle things like LFOO+4.
-    Res = MCSymbolRefExpr::Create(Lexer.getTok().getIdentifier(), getContext());
+  case AsmToken::Identifier: {
+    // This is a symbol reference.
+    MCSymbol *Sym = CreateSymbol(Lexer.getTok().getIdentifier());
     Lexer.Lex(); // Eat identifier.
+
+    // If this is an absolute variable reference, substitute it now to preserve
+    // semantics in the face of reassignment.
+    if (Sym->getValue() && isa<MCConstantExpr>(Sym->getValue())) {
+      Res = Sym->getValue();
+      return false;
+    }
+
+    // Otherwise create a symbol ref.
+    Res = MCSymbolRefExpr::Create(Sym, getContext());
     return false;
+  }
   case AsmToken::Integer:
     Res = MCConstantExpr::Create(Lexer.getTok().getIntVal(), getContext());
     Lexer.Lex(); // Eat token.