[PATCH] D51225: Add R_HEX_11/10/9 support

[Sid Manning via Phabricator via llvm-commits]

sidneym updated this revision to Diff 162567.
sidneym retitled this revision from "Add R_HEX_11 support" to "Add R_HEX_11/10/9 support ".
sidneym edited the summary of this revision.
sidneym added a comment.

Added 9X and 10X as well, along with updated testing.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D51225

Files:
  ELF/Arch/Hexagon.cpp
  test/ELF/hexagon.s


Index: test/ELF/hexagon.s
===================================================================
--- test/ELF/hexagon.s
+++ test/ELF/hexagon.s
@@ -202,3 +202,18 @@
 # R_HEX_B9_PCREL_X:
 {r0=#1 ; jump ##_start}
 # CHECK: jump 0x11000
+
+# R_HEX_9_X
+p0 = !cmp.gtu(r0, ##_start)
+# CHECK: p0 = !cmp.gtu(r0,##69632)
+
+# R_HEX_10_X
+p0 = !cmp.gt(r0, ##_start)
+# CHECK: p0 = !cmp.gt(r0,##69632)
+
+# R_HEX_11_X
+r0 = memw(r1+##_start)
+# CHECK: r0 = memw(r1+##69632)
+
+memw(r0+##_start) = r1
+# CHECK: memw(r0+##69632) = r1
Index: ELF/Arch/Hexagon.cpp
===================================================================
--- ELF/Arch/Hexagon.cpp
+++ ELF/Arch/Hexagon.cpp
@@ -114,6 +114,12 @@
   return 0x00001fe0;
 }
 
+static uint32_t findMaskR11(uint32_t Insn) {
+  if ((0xff000000 & Insn) == 0xa1000000)
+    return 0x060020ff;
+  return 0x06003fe0;
+}
+
 static uint32_t findMaskR16(uint32_t Insn) {
   if ((0xff000000 & Insn) == 0x48000000)
     return 0x061f20ff;
@@ -142,6 +148,15 @@
   case R_HEX_8_X:
     or32le(Loc, applyMask(findMaskR8(read32le(Loc)), Val));
     break;
+  case R_HEX_9_X:
+    or32le(Loc, applyMask(0x00003fe0, Val & 0x3f));
+    break;
+  case R_HEX_10_X:
+    or32le(Loc, applyMask(0x00203fe0, Val & 0x3f));
+    break;
+  case R_HEX_11_X:
+    or32le(Loc, applyMask(findMaskR11(read32le(Loc)), Val & 0x3f));
+    break;
   case R_HEX_12_X:
     or32le(Loc, applyMask(0x000007e0, Val));
     break;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51225.162567.patch
Type: text/x-patch
Size: 1425 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180825/234d860e/attachment.bin>