MC: Parse .org directives.

llvm-svn: 74218

3 files changed, 42 insertions, 1 deletions

diff --git a/llvm/test/MC/AsmParser/directive_org.s b/llvm/test/MC/AsmParser/directive_org.s
new file mode 100644
index 00000000000..ac50f635e6b
--- /dev/null
+++ b/llvm/test/MC/AsmParser/directive_org.s
@@ -0,0 +1,11 @@
+# RUN: llvm-mc %s > %t
+
+# RUN: grep -A 2 TEST0 %t > %t2
+# RUN: grep ".org 1, 0" %t2 | count 1
+TEST0:  
+        .org 1
+
+# RUN: grep -A 2 TEST1 %t > %t2
+# RUN: grep ".org 1, 3" %t2 | count 1
+TEST1:  
+        .org 1, 3
diff --git a/llvm/tools/llvm-mc/AsmParser.cpp b/llvm/tools/llvm-mc/AsmParser.cpp
index 25955187dab..2b697a66ad2 100644
--- a/llvm/tools/llvm-mc/AsmParser.cpp
+++ b/llvm/tools/llvm-mc/AsmParser.cpp
@@ -324,6 +324,8 @@ bool AsmParser::ParseStatement() {
       return ParseDirectiveValue(8);
     if (!strcmp(IDVal, ".fill"))
       return ParseDirectiveFill();
+    if (!strcmp(IDVal, ".org"))
+      return ParseDirectiveOrg();
     if (!strcmp(IDVal, ".space"))
       return ParseDirectiveSpace();
 
@@ -332,7 +334,6 @@ bool AsmParser::ParseStatement() {
     return false;
   }
 
-
   MCInst Inst;
   if (ParseX86InstOperands(Inst))
     return true;
@@ -558,3 +559,31 @@ bool AsmParser::ParseDirectiveFill() {
 
   return false;
 }
+
+/// ParseDirectiveOrg
+///  ::= .org expression [ , expression ]
+bool AsmParser::ParseDirectiveOrg() {
+  int64_t Offset;
+  if (ParseExpression(Offset))
+    return true;
+
+  // Parse optional fill expression.
+  int64_t FillExpr = 0;
+  if (Lexer.isNot(asmtok::EndOfStatement)) {
+    if (Lexer.isNot(asmtok::Comma))
+      return TokError("unexpected token in '.org' directive");
+    Lexer.Lex();
+    
+    if (ParseExpression(FillExpr))
+      return true;
+
+    if (Lexer.isNot(asmtok::EndOfStatement))
+      return TokError("unexpected token in '.org' directive");
+  }
+
+  Lexer.Lex();
+  
+  Out.EmitValueToOffset(MCValue::get(Offset), FillExpr);
+
+  return false;
+}
diff --git a/llvm/tools/llvm-mc/AsmParser.h b/llvm/tools/llvm-mc/AsmParser.h
index 4b51ab17ac2..da256c275ca 100644
--- a/llvm/tools/llvm-mc/AsmParser.h
+++ b/llvm/tools/llvm-mc/AsmParser.h
@@ -63,6 +63,7 @@ private:
   bool ParseDirectiveFill(); // ".fill"
   bool ParseDirectiveSpace(); // ".space"
   bool ParseDirectiveSet(); // ".set"
+  bool ParseDirectiveOrg(); // ".org"
   
 };