commit 1c0eb972ed6fb27363c157b584b0e3dfc65e09fd
author Rafael Espindola <rafael.espindola@gmail.com> Thu Jun 02 16:00:25 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Jun 02 16:00:25 2016 +0000
tree 7b5d2c0f3f41cda624d65c86068a6ca8a2e5bacf
parent 1016f192157b7cf1d4d3c3dee077c94a7a22a00c

Simplify mask computation.

llvm-svn: 271525

lld/ELF/Target.cpp

diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp
index 9aef608..4891f04 100644
--- a/lld/ELF/Target.cpp
+++ b/lld/ELF/Target.cpp
@@ -1203,8 +1203,8 @@
 
 static void updateAArch64Addr(uint8_t *L, uint64_t Imm) {
   uint32_t ImmLo = (Imm & 0x3) << 29;
-  uint32_t ImmHi = ((Imm & 0x1FFFFC) >> 2) << 5;
-  uint64_t Mask = (0x3 << 29) | (0x7FFFF << 5);
+  uint32_t ImmHi = (Imm & 0x1FFFFC) << 3;
+  uint64_t Mask = (0x3 << 29) | (0x1FFFFC << 3);
   write32le(L, (read32le(L) & ~Mask) | ImmLo | ImmHi);
 }
 
@@ -1240,11 +1240,11 @@
   case R_AARCH64_ADR_PREL_PG_HI21:
   case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
     checkInt<33>(Val, Type);
-    updateAArch64Addr(Loc, (Val >> 12) & 0x1FFFFF); // X[32:12]
+    updateAArch64Addr(Loc, Val >> 12);
     break;
   case R_AARCH64_ADR_PREL_LO21:
     checkInt<21>(Val, Type);
-    updateAArch64Addr(Loc, Val & 0x1FFFFF);
+    updateAArch64Addr(Loc, Val);
     break;
   case R_AARCH64_CALL26:
   case R_AARCH64_JUMP26: