[llvm] r186407 - [XCore] Fix printing of inline asm operands.

[Richard Osborne]

Author: friedgold
Date: Tue Jul 16 07:48:34 2013
New Revision: 186407

URL: http://llvm.org/viewvc/llvm-project?rev=186407&view=rev
Log:
[XCore] Fix printing of inline asm operands.

Previously an asm operand with no operand modifier would give the error
"invalid operand in inline asm".

Added:
    llvm/trunk/test/CodeGen/XCore/inline-asm.ll
Modified:
    llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp?rev=186407&r1=186406&r2=186407&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp Tue Jul 16 07:48:34 2013
@@ -240,18 +240,14 @@ void XCoreAsmPrinter::printOperand(const
 bool XCoreAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
                                       unsigned AsmVariant,const char *ExtraCode,
                                       raw_ostream &O) {
-  // Does this asm operand have a single letter operand modifier?
-  if (ExtraCode && ExtraCode[0])
-    if (ExtraCode[1] != 0) return true; // Unknown modifier.
+  // Print the operand if there is no operand modifier.
+  if (!ExtraCode || !ExtraCode[0]) {
+    printOperand(MI, OpNo, O);
+    return false;
+  }
 
-    switch (ExtraCode[0]) {
-    default:
-      // See if this is a generic print operand
-      return AsmPrinter::PrintAsmOperand(MI, OpNo, AsmVariant, ExtraCode, O);
-    }
-
-  printOperand(MI, OpNo, O);
-  return false;
+  // Otherwise fallback on the default implementation.
+  return AsmPrinter::PrintAsmOperand(MI, OpNo, AsmVariant, ExtraCode, O);
 }
 
 void XCoreAsmPrinter::EmitInstruction(const MachineInstr *MI) {

Added: llvm/trunk/test/CodeGen/XCore/inline-asm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/XCore/inline-asm.ll?rev=186407&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/XCore/inline-asm.ll (added)
+++ llvm/trunk/test/CodeGen/XCore/inline-asm.ll Tue Jul 16 07:48:34 2013
@@ -0,0 +1,32 @@
+; RUN: llc < %s -march=xcore | FileCheck %s
+; CHECK-LABEL: f1:
+; CHECK: foo r0
+define i32 @f1() nounwind {
+entry:
+  %asmtmp = tail call i32 asm sideeffect "foo $0", "=r"() nounwind
+  ret i32 %asmtmp
+}
+
+; CHECK-LABEL: f2:
+; CHECK: foo 5
+define void @f2() nounwind {
+entry:
+  tail call void asm sideeffect "foo $0", "i"(i32 5) nounwind
+  ret void
+}
+
+; CHECK-LABEL: f3:
+; CHECK: foo 42
+define void @f3() nounwind {
+entry:
+  tail call void asm sideeffect "foo ${0:c}", "i"(i32 42) nounwind
+  ret void
+}
+
+; CHECK-LABEL: f4:
+; CHECK: foo -99
+define void @f4() nounwind {
+entry:
+  tail call void asm sideeffect "foo ${0:n}", "i"(i32 99) nounwind
+  ret void
+}