[mips] [IAS] Emit .set macro/nomacro.

Toma Tabacu · Toma Tabacu · commit 772155cbc6a2 · 2015-05-14T13:42:10.000Z
Reviewers: dsanders Reviewed By: dsanders Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D9563 llvm-svn: 237363
diff --git a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -3434,6 +3434,7 @@ bool MipsAsmParser::parseSetMacroDirective() {
     return false;
   }
   AssemblerOptions.back()->setMacro();
+  getTargetStreamer().emitDirectiveSetMacro();
   Parser.Lex(); // Consume the EndOfStatement.
   return false;
 }
@@ -3451,6 +3452,7 @@ bool MipsAsmParser::parseSetNoMacroDirective() {
     return false;
   }
   AssemblerOptions.back()->setNoMacro();
+  getTargetStreamer().emitDirectiveSetNoMacro();
   Parser.Lex(); // Consume the EndOfStatement.
   return false;
 }
diff --git a/llvm/test/MC/Mips/mips_directives.s b/llvm/test/MC/Mips/mips_directives.s
@@ -17,6 +17,7 @@ $BB0_2:
 # CHECK-NOT: nop
 # CHECK:   jal 1328             # encoding: [0x0c,0x00,0x01,0x4c]
 # CHECK-NOT: nop
+# CHECK: .set nomacro
 
     .set    noreorder
      b 1332
@@ -33,6 +34,7 @@ $JTI0_0:
 # CHECK:     .4byte    2013265916
     .set  at=$12
     .set macro
+# CHECK:   .set macro
 # CHECK:   .set reorder
 # CHECK:   b 1332               # encoding: [0x10,0x00,0x01,0x4d]
 # CHECK:   nop                  # encoding: [0x00,0x00,0x00,0x00]
diff --git a/llvm/test/MC/Mips/module-directive-bad.s b/llvm/test/MC/Mips/module-directive-bad.s
@@ -203,15 +203,15 @@
 
     .set macro
     .module fp=64
-# FIXME: emitDirectiveSetMacro should call forbidModuleDirective().
+# CHECK: :[[@LINE-1]]:13: error: .module directive must appear before any code
 
     .llvm_internal_mips_reallow_module_directive
     .module fp=32
 # CHECK-NOT: :[[@LINE-1]]:13: error: .module directive must appear before any code
 
     .set nomacro
     .module fp=64
-# FIXME: emitDirectiveSetNoMacro should call forbidModuleDirective().
+# CHECK: :[[@LINE-1]]:13: error: .module directive must appear before any code
 
     .llvm_internal_mips_reallow_module_directive
     .module fp=32

Original file line number	Diff line number	Diff line change
`@@ -3434,6 +3434,7 @@ bool MipsAsmParser::parseSetMacroDirective() {`
`3434`	`3434`	`return false;`
`3435`	`3435`	`}`
`3436`	`3436`	`AssemblerOptions.back()->setMacro();`
	`3437`	`+ getTargetStreamer().emitDirectiveSetMacro();`
`3437`	`3438`	`Parser.Lex(); // Consume the EndOfStatement.`
`3438`	`3439`	`return false;`
`3439`	`3440`	`}`
`@@ -3451,6 +3452,7 @@ bool MipsAsmParser::parseSetNoMacroDirective() {`
`3451`	`3452`	`return false;`
`3452`	`3453`	`}`
`3453`	`3454`	`AssemblerOptions.back()->setNoMacro();`
	`3455`	`+ getTargetStreamer().emitDirectiveSetNoMacro();`
`3454`	`3456`	`Parser.Lex(); // Consume the EndOfStatement.`
`3455`	`3457`	`return false;`
`3456`	`3458`	`}`