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

[Kevin Enderby]

Author: enderby
Date: Mon Jul 13 18:15:14 2009
New Revision: 75545

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

Added:
    llvm/trunk/test/MC/AsmParser/directive_abort.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=75545&r1=75544&r2=75545&view=diff

==============================================================================
--- llvm/trunk/include/llvm/MC/MCStreamer.h (original)
+++ llvm/trunk/include/llvm/MC/MCStreamer.h Mon Jul 13 18:15:14 2009
@@ -141,6 +141,13 @@
     virtual void EmitZerofill(MCSection *Section, MCSymbol *Symbol = 0,
                               unsigned Size = 0,unsigned Pow2Alignment = 0) = 0;
 
+    /// AbortAssembly - Stop and don't produce output, printing @param
+    /// AbortReason if non-NULL to indicate the reason the assembly is
+    /// terminated.
+    ///
+    /// @param AbortReason - The reason assembly is terminated, if non-NULL.
+    virtual void AbortAssembly(const char *AbortReason) = 0;
+
     /// @}
     /// @name Generating Data
     /// @{

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

==============================================================================
--- llvm/trunk/lib/MC/MCAsmStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmStreamer.cpp Mon Jul 13 18:15:14 2009
@@ -51,6 +51,8 @@
     virtual void EmitZerofill(MCSection *Section, MCSymbol *Symbol = NULL,
                               unsigned Size = 0, unsigned Pow2Alignment = 0);
 
+    virtual void AbortAssembly(const char *AbortReason = NULL);
+
     virtual void EmitBytes(const char *Data, unsigned Length);
 
     virtual void EmitValue(const MCValue &Value, unsigned Size);
@@ -123,6 +125,14 @@
   OS << ".subsections_via_symbols\n";
 }
 
+void MCAsmStreamer::AbortAssembly(const char *AbortReason) {
+  OS << ".abort";
+  if (AbortReason != NULL)
+    OS << ' ' << AbortReason;
+  OS << '\n';
+  
+}
+
 void MCAsmStreamer::EmitAssignment(MCSymbol *Symbol, const MCValue &Value,
                                    bool MakeAbsolute) {
   assert(!Symbol->getSection() && "Cannot assign to a label!");

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

==============================================================================
--- llvm/trunk/test/MC/AsmParser/directive_abort.s (added)
+++ llvm/trunk/test/MC/AsmParser/directive_abort.s Mon Jul 13 18:15:14 2009
@@ -0,0 +1,8 @@
+# RUN: llvm-mc %s | FileCheck %s
+
+# CHECK: TEST0:
+# CHECK: .abort "please stop assembing"
+# CHECK: .abort
+TEST0:  
+	.abort       "please stop assembing"
+.abort

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

==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Mon Jul 13 18:15:14 2009
@@ -529,6 +529,8 @@
 
     if (!strcmp(IDVal, ".subsections_via_symbols"))
       return ParseDirectiveDarwinSubsectionsViaSymbols();
+    if (!strcmp(IDVal, ".abort"))
+      return ParseDirectiveAbort();
 
     Warning(IDLoc, "ignoring directive for now");
     EatToEndOfStatement();
@@ -1068,3 +1070,26 @@
 
   return false;
 }
+
+/// ParseDirectiveAbort
+///  ::= .abort [ "abort_string" ]
+bool AsmParser::ParseDirectiveAbort() {
+  const char *Str = NULL;
+  if (Lexer.isNot(asmtok::EndOfStatement)) {
+    if (Lexer.isNot(asmtok::String))
+      return TokError("expected string in '.abort' directive");
+    
+    Str = Lexer.getCurStrVal();
+
+    Lexer.Lex();
+  }
+
+  if (Lexer.isNot(asmtok::EndOfStatement))
+    return TokError("unexpected token in '.abort' directive");
+  
+  Lexer.Lex();
+
+  Out.AbortAssembly(Str);
+
+  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=75545&r1=75544&r2=75545&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.h Mon Jul 13 18:15:14 2009
@@ -115,6 +115,8 @@
 
   // Darwin specific ".subsections_via_symbols"
   bool ParseDirectiveDarwinSubsectionsViaSymbols();
+
+  bool ParseDirectiveAbort(); // ".abort"
 };
 
 } // end namespace llvm