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

[Sid Manning via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL340739: [ELF][HEXAGON] Add R_HEX_11/10/9_X support (authored by sidneym, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D51225?vs=162567&id=162666#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D51225

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


Index: lld/trunk/test/ELF/hexagon.s
===================================================================
--- lld/trunk/test/ELF/hexagon.s
+++ lld/trunk/test/ELF/hexagon.s
@@ -206,3 +206,18 @@
 # R_HEX_B13_PCREL
 if (r0 == #0) jump:t #_start
 # CHECK: if (r0==#0) jump:t 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: lld/trunk/ELF/Arch/Hexagon.cpp
===================================================================
--- lld/trunk/ELF/Arch/Hexagon.cpp
+++ lld/trunk/ELF/Arch/Hexagon.cpp
@@ -115,6 +115,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;
@@ -143,6 +149,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.162666.patch
Type: text/x-patch
Size: 1502 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180827/e8dbc1f9/attachment.bin>