[PATCH] D23501: Correct the upper bound for a CBZ/CBNZ branch target.

[Prakhar Bahuguna via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL278789: Correct the upper bound for a CBZ/CBNZ branch target. (authored by prakhar).

Changed prior to commit:
  https://reviews.llvm.org/D23501?vs=68143&id=68155#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23501

Files:
  llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
  llvm/trunk/test/MC/ARM/thumb-cb-negative-offsets.s

Index: llvm/trunk/test/MC/ARM/thumb-cb-negative-offsets.s
===================================================================
--- llvm/trunk/test/MC/ARM/thumb-cb-negative-offsets.s
+++ llvm/trunk/test/MC/ARM/thumb-cb-negative-offsets.s
@@ -16,4 +16,16 @@
 
   .space 1000
 label1:
-  .word 4
+  nop
+
+@ CHECK: out of range pc-relative fixup value
+  cbz r0, label2
+  .space 130
+label2:
+  nop
+
+@ CHECK-NOT: label3
+  cbnz r0, label3
+  .space 128
+label3:
+  nop
Index: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
===================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
@@ -578,8 +578,10 @@
     // Offset by 4, and don't encode the low two bits.
     return ((Value - 4) >> 2) & 0xff;
   case ARM::fixup_arm_thumb_cb: {
-    // CB instructions can only branch to offsets in [0, 126] in multiples of 2
-    if (Ctx && ((int64_t)Value < 0 || Value > 0x3e || Value & 1)) {
+    // CB instructions can only branch to offsets in [4, 126] in multiples of 2
+    // so ensure that the raw value LSB is zero and it lies in [2, 130].
+    // An offset of 2 will be relaxed to a NOP.
+    if (Ctx && ((int64_t)Value < 2 || Value > 0x82 || Value & 1)) {
       Ctx->reportError(Fixup.getLoc(), "out of range pc-relative fixup value");
       return 0;
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23501.68155.patch
Type: text/x-patch
Size: 1401 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160816/cb3f27f2/attachment.bin>