[llvm-branch-commits] [llvm-branch] r104893 - in /llvm/branches/Apple/Morbo: lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp test/CodeGen/ARM/inlineasm.ll

[Evan Cheng]

Author: evancheng
Date: Thu May 27 17:21:45 2010
New Revision: 104893

URL: http://llvm.org/viewvc/llvm-project?rev=104893&view=rev
Log:
Merge 104891.

Modified:
    llvm/branches/Apple/Morbo/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
    llvm/branches/Apple/Morbo/test/CodeGen/ARM/inlineasm.ll

Modified: llvm/branches/Apple/Morbo/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp?rev=104893&r1=104892&r2=104893&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp Thu May 27 17:21:45 2010
@@ -1003,20 +1003,10 @@
       printOperand(MI, OpNum);
       return false;
     case 'Q':
-      if (TM.getTargetData()->isLittleEndian())
-        break;
-      // Fallthrough
     case 'R':
-      if (TM.getTargetData()->isBigEndian())
-        break;
-      // Fallthrough
     case 'H': // Write second word of DI / DF reference.
-      // Verify that this operand has two consecutive registers.
-      if (!MI->getOperand(OpNum).isReg() ||
-          OpNum+1 == MI->getNumOperands() ||
-          !MI->getOperand(OpNum+1).isReg())
-        return true;
-      ++OpNum;   // Return the high-part.
+      llvm_unreachable("llvm does not support 'Q', 'R', and 'H' modifiers!");
+      return true;
     }
   }
 

Modified: llvm/branches/Apple/Morbo/test/CodeGen/ARM/inlineasm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/test/CodeGen/ARM/inlineasm.ll?rev=104893&r1=104892&r2=104893&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/test/CodeGen/ARM/inlineasm.ll (original)
+++ llvm/branches/Apple/Morbo/test/CodeGen/ARM/inlineasm.ll Thu May 27 17:21:45 2010
@@ -6,14 +6,6 @@
 }
 
 define void @test2() {
-	%tmp1 = call i64 asm "ldmia $1!, {$0, ${0:H}}", "=r,=*r,1"( i32** null, i32* null )		; <i64> [#uses=2]
-	%tmp2 = lshr i64 %tmp1, 32		; <i64> [#uses=1]
-	%tmp3 = trunc i64 %tmp2 to i32		; <i32> [#uses=1]
-	%tmp4 = call i32 asm "pkhbt $0, $1, $2, lsl #16", "=r,r,r"( i32 0, i32 %tmp3 )		; <i32> [#uses=0]
-	ret void
-}
-
-define void @test3() {
 	tail call void asm sideeffect "/* number: ${0:c} */", "i"( i32 1 )
 	ret void
 }