<div dir="ltr">I really don't like this change. These helpers are not generic; they are closely tied to AArch64 instruction encoding and this patch loses the clear connection from the names of the helpers. I strongly prefer the original names.<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 8, 2016 at 9:18 AM, Rui Ueyama via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Thu Dec  8 11:18:09 2016<br>
New Revision: 289072<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=289072&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=289072&view=rev</a><br>
Log:<br>
Make function names shorter. NFC.<br>
<br>
Modified:<br>
    lld/trunk/ELF/Target.cpp<br>
<br>
Modified: lld/trunk/ELF/Target.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=289072&r1=289071&r2=289072&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/ELF/Target.<wbr>cpp?rev=289072&r1=289071&r2=<wbr>289072&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/Target.cpp (original)<br>
+++ lld/trunk/ELF/Target.cpp Thu Dec  8 11:18:09 2016<br>
@@ -1320,7 +1320,7 @@ void AArch64TargetInfo::writePlt(<wbr>uint8_t<br>
   relocateOne(Buf + 8, R_AARCH64_ADD_ABS_LO12_NC, GotEntryAddr);<br>
 }<br>
<br>
-static void updateAArch64Addr(uint8_t *L, uint64_t Imm) {<br>
+static void write32addr(uint8_t *L, uint64_t Imm) {<br>
   uint32_t ImmLo = (Imm & 0x3) << 29;<br>
   uint32_t ImmHi = (Imm & 0x1FFFFC) << 3;<br>
   uint64_t Mask = (0x3 << 29) | (0x1FFFFC << 3);<br>
@@ -1334,8 +1334,8 @@ static uint64_t getBits(uint64_t Val, in<br>
   return (Val >> Start) & Mask;<br>
 }<br>
<br>
-// Update the immediate field in a ldr, str, and add instruction.<br>
-static inline void updateAArch64LdStrAdd(uint8_t *L, uint64_t Imm) {<br>
+// Update the immediate field in a AARCH64 ldr, str, and add instruction.<br>
+static void or32imm(uint8_t *L, uint64_t Imm) {<br>
   or32le(L, (Imm & 0xFFF) << 10);<br>
 }<br>
<br>
@@ -1358,18 +1358,18 @@ void AArch64TargetInfo::<wbr>relocateOne(uint<br>
     write64le(Loc, Val);<br>
     break;<br>
   case R_AARCH64_ADD_ABS_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, Val);<br>
+    or32imm(Loc, Val);<br>
     break;<br>
   case R_AARCH64_ADR_GOT_PAGE:<br>
   case R_AARCH64_ADR_PREL_PG_HI21:<br>
   case R_AARCH64_TLSIE_ADR_GOTTPREL_<wbr>PAGE21:<br>
   case R_AARCH64_TLSDESC_ADR_PAGE21:<br>
     checkInt<33>(Loc, Val, Type);<br>
-    updateAArch64Addr(Loc, Val >> 12);<br>
+    write32addr(Loc, Val >> 12);<br>
     break;<br>
   case R_AARCH64_ADR_PREL_LO21:<br>
     checkInt<21>(Loc, Val, Type);<br>
-    updateAArch64Addr(Loc, Val);<br>
+    write32addr(Loc, Val);<br>
     break;<br>
   case R_AARCH64_CALL26:<br>
   case R_AARCH64_JUMP26:<br>
@@ -1387,19 +1387,19 @@ void AArch64TargetInfo::<wbr>relocateOne(uint<br>
     or32le(Loc, (Val & 0xFF8) << 7);<br>
     break;<br>
   case R_AARCH64_LDST8_ABS_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, getBits(Val, 0, 11));<br>
+    or32imm(Loc, getBits(Val, 0, 11));<br>
     break;<br>
   case R_AARCH64_LDST16_ABS_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, getBits(Val, 1, 11));<br>
+    or32imm(Loc, getBits(Val, 1, 11));<br>
     break;<br>
   case R_AARCH64_LDST32_ABS_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, getBits(Val, 2, 11));<br>
+    or32imm(Loc, getBits(Val, 2, 11));<br>
     break;<br>
   case R_AARCH64_LDST64_ABS_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, getBits(Val, 3, 11));<br>
+    or32imm(Loc, getBits(Val, 3, 11));<br>
     break;<br>
   case R_AARCH64_LDST128_ABS_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, getBits(Val, 4, 11));<br>
+    or32imm(Loc, getBits(Val, 4, 11));<br>
     break;<br>
   case R_AARCH64_MOVW_UABS_G0_NC:<br>
     or32le(Loc, (Val & 0xFFFF) << 5);<br>
@@ -1419,11 +1419,11 @@ void AArch64TargetInfo::<wbr>relocateOne(uint<br>
     break;<br>
   case R_AARCH64_TLSLE_ADD_TPREL_<wbr>HI12:<br>
     checkInt<24>(Loc, Val, Type);<br>
-    updateAArch64LdStrAdd(Loc, Val >> 12);<br>
+    or32imm(Loc, Val >> 12);<br>
     break;<br>
   case R_AARCH64_TLSLE_ADD_TPREL_<wbr>LO12_NC:<br>
   case R_AARCH64_TLSDESC_ADD_LO12_NC:<br>
-    updateAArch64LdStrAdd(Loc, Val);<br>
+    or32imm(Loc, Val);<br>
     break;<br>
   default:<br>
     fatal(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>