[llvm-commits] [llvm] r131045 - /llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp

[Eric Christopher]

Author: echristo
Date: Fri May  6 23:37:27 2011
New Revision: 131045

URL: http://llvm.org/viewvc/llvm-project?rev=131045&view=rev
Log:
Fix the non-MC encoding of pkhbt and pkhtb.

Patch by Stephen Hines.

Modified:
    llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp?rev=131045&r1=131044&r2=131045&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp Fri May  6 23:37:27 2011
@@ -1372,6 +1372,12 @@
   // Set the conditional execution predicate
   Binary |= II->getPredicate(&MI) << ARMII::CondShift;
 
+  // PKH instructions are finished at this point
+  if (TID.Opcode == ARM::PKHBT || TID.Opcode == ARM::PKHTB) {
+    emitWordLE(Binary);
+    return;
+  }
+
   unsigned OpIdx = 0;
 
   // Encode Rd