Fix encoding of CBZ/CBNZ Thumb2 instructions with immediate offsets rather than labels.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138837 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
index ab2162cbebb9b0aa3efbb09cd905c862a03512d7..7cac54c610b882360cde9e724f0e48c114c2800f 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
@@ -501,7 +501,10 @@ getThumbBCCTargetOpValue(const MCInst &MI, unsigned OpIdx,
 uint32_t ARMMCCodeEmitter::
 getThumbCBTargetOpValue(const MCInst &MI, unsigned OpIdx,
                         SmallVectorImpl<MCFixup> &Fixups) const {
-  return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_arm_thumb_cb, Fixups);
+  const MCOperand MO = MI.getOperand(OpIdx);
+  if (MO.isExpr())
+    return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_arm_thumb_cb, Fixups);
+  return (MO.getImm() >> 1);
 }
 
 /// Return true if this branch has a non-always predication

diff --git a/test/MC/ARM/basic-thumb2-instructions.s b/test/MC/ARM/basic-thumb2-instructions.s
index 423e5bc316642873502e18e3b17103881004bdb1..61d651472ee48cf042f20ffe0ab6460b2ee05509 100644 (file)
--- a/test/MC/ARM/basic-thumb2-instructions.s
+++ b/test/MC/ARM/basic-thumb2-instructions.s
@@ -37,6 +37,15 @@ _func:
 @ CHECK: adc   r4, r2, #2139095040     @ encoding: [0x42,0xf1,0xff,0x44]
 @ CHECK: adc   r4, r2, #1664           @ encoding: [0x42,0xf5,0xd0,0x64]
 
+@------------------------------------------------------------------------------
+@ CBZ/CBNZ
+@------------------------------------------------------------------------------
+        cbnz    r7, #6
+        cbnz    r7, #12
+
+@ CHECK: cbnz    r7, #6                  @ encoding: [0x1f,0xb9]
+@ CHECK: cbnz    r7, #12                 @ encoding: [0x37,0xb9]
+
 @------------------------------------------------------------------------------
 @ IT
 @------------------------------------------------------------------------------