LLD: ELF: Replace a macro with an inlined function.

[ruiu]

Summary

FINDV4BITMASK macro is defined as a macro so that the macro body is inlined.
We should use inlined functions instead of macros.

[ruiu]

By the way, HexagonEncodings.h contains a huge table with hex numbers with zero comments. It's totally undecipherable. Do you mind if I ask you to add a comment there?

[shankarke]

LGTM.

[shankarke]

The file is a autogenerated file. But sure. I will add a comment.

[Eugene.Zelenko]

Committed in r233719.

lib/ReaderWriter/ELF/Hexagon/HexagonRelocationFunctions.h

 //===- HexagonRelocationFunction.h ----------------------------------------===//
 //
 //                             The LLVM Linker
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
 #ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_FUNCTIONS_H
 #define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_FUNCTIONS_H
 
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Endian.h"
+
 namespace lld {
 namespace elf {
 
 /// \brief HexagonInstruction which is used to store various values
 typedef struct {
   uint32_t insnMask;
   uint32_t insnCmpMask;
   uint32_t insnBitMask;
   bool isDuplex;
 } Instruction;
 
 #include "HexagonEncodings.h"
 
-#define FINDV4BITMASK(INSN)                                                    \
-  findBitMask((uint32_t) * ((llvm::support::ulittle32_t *) INSN),              \
-              insn_encodings,                                                  \
-              sizeof(insn_encodings) / sizeof(Instruction))
-
 /// \brief finds the scatter Bits that need to be used to apply relocations
-inline uint32_t
-findBitMask(uint32_t insn, Instruction *encodings, int32_t numInsns) {
-  for (int32_t i = 0; i < numInsns; i++) {
-    if (((insn & 0xc000) == 0) && !(encodings[i].isDuplex))
+inline uint32_t findv4bitmask(uint8_t *location) {
+  uint32_t insn = llvm::support::endian::read32le(location);
+  for (int32_t i = 0, e = llvm::array_lengthof(insn_encodings); i < e; i++) {
+    if (((insn & 0xc000) == 0) && !(insn_encodings[i].isDuplex))
       continue;
-
-    if (((insn & 0xc000) != 0) && (encodings[i].isDuplex))
+    if (((insn & 0xc000) != 0) && (insn_encodings[i].isDuplex))
       continue;
-
-    if (((encodings[i].insnMask) & insn) == encodings[i].insnCmpMask)
-      return encodings[i].insnBitMask;
+    if (((insn_encodings[i].insnMask) & insn) == insn_encodings[i].insnCmpMask)
+      return insn_encodings[i].insnBitMask;
   }
   llvm_unreachable("found unknown instruction");
 }
 
 } // elf
 } // lld
 
 #endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_FUNCTIONS_H

lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp

 #define APPLY_RELOC(result)                                                    \
   write32le(location, result | read32le(location));
 
 static int relocBNPCREL(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
                         int32_t nBits) {
   int32_t result = (uint32_t)(((S + A) - P) >> 2);
   int32_t range = 1 << nBits;
   if (result < range && result > -range) {
-    result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+    result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
     APPLY_RELOC(result);
     return 0;
   }
   return 1;
 }
 
 /// \brief Word32_LO: 0x00c03fff : (S + A) : Truncate
 static int relocLO16(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) {

 }
 
 // R_HEX_BN_PCREL_X
 static int relocHexBNPCRELX(uint8_t *location, uint64_t P, uint64_t S,
                             uint64_t A, int nbits) {
   int32_t result = ((S + A - P) & 0x3f);
   int32_t range = 1 << nbits;
   if (result < range && result > -range) {
-    result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+    result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
     APPLY_RELOC(result);
     return 0;
   }
   return 1;
 }
 
 // R_HEX_6_PCREL_X
 static int relocHex6PCRELX(uint8_t *location, uint64_t P, uint64_t S,
                            uint64_t A) {
   int32_t result = (S + A - P);
-  result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+  result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
   APPLY_RELOC(result);
   return 0;
 }
 
 // R_HEX_N_X : Word32_U6 : (S + A) : Unsigned Truncate
 static int relocHex_N_X(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) {
   uint32_t result = (S + A);
-  result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
+  result = lld::scatterBits<uint32_t>(result, findv4bitmask(location));
   APPLY_RELOC(result);
   return 0;
 }
 
 // GP REL relocations
 static int relocHexGPRELN(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
                           uint64_t GP, int nShiftBits) {
   int32_t result = (int64_t)((S + A - GP) >> nShiftBits);
   int32_t range = 1L << 16;
   if (result <= range) {
-    result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
+    result = lld::scatterBits<uint32_t>(result, findv4bitmask(location));
     APPLY_RELOC(result);
     return 0;
   }
   return 1;
 }
 
 /// \brief Word32_LO: 0x00c03fff : (G) : Truncate
 static int relocHexGOTLO16(uint8_t *location, uint64_t A, uint64_t GOT) {
static int relocHexGOT32(uint8_t *location, uint64_t A, uint64_t GOT) {
   return 0;
 }
 
 /// \brief Word32_U16 : (G) : Truncate
 static int relocHexGOT16(uint8_t *location, uint64_t A, uint64_t GOT) {
   int32_t result = (int32_t)(GOT-A);
   int32_t range = 1L << 16;
   if (result <= range) {
-    result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+    result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
     APPLY_RELOC(result);
     return 0;
   }
   return 1;
 }
 
 static int relocHexGOT32_6_X(uint8_t *location, uint64_t A, uint64_t GOT) {
   int32_t result = (int32_t)((A-GOT) >> 6);
-  result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+  result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
   APPLY_RELOC(result);
   return 0;
 }
 
 static int relocHexGOT16_X(uint8_t *location, uint64_t A, uint64_t GOT) {
   int32_t result = (int32_t)(A-GOT);
   int32_t range = 1L << 6;
   if (result <= range) {
-    result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+    result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
     APPLY_RELOC(result);
     return 0;
   }
   return 1;
 }
 
 static int relocHexGOT11_X(uint8_t *location, uint64_t A, uint64_t GOT) {
   uint32_t result = (uint32_t)(A-GOT);
-  result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
+  result = lld::scatterBits<uint32_t>(result, findv4bitmask(location));
   APPLY_RELOC(result);
   return 0;
 }
 
 static int relocHexGOTRELSigned(uint8_t *location, uint64_t P, uint64_t S,
                                 uint64_t A, uint64_t GOT, int shiftBits = 0) {
   int32_t result = (int32_t)((S + A - GOT) >> shiftBits);
-  result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
+  result = lld::scatterBits<int32_t>(result, findv4bitmask(location));
   APPLY_RELOC(result);
   return 0;
 }
 
 static int relocHexGOTRELUnsigned(uint8_t *location, uint64_t P, uint64_t S,
                                   uint64_t A, uint64_t GOT, int shiftBits = 0) {
   uint32_t result = (uint32_t)((S + A - GOT) >> shiftBits);
-  result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
+  result = lld::scatterBits<uint32_t>(result, findv4bitmask(location));
   APPLY_RELOC(result);
   return 0;
 }
 
 static int relocHexGOTREL_HILO16(uint8_t *location, uint64_t P, uint64_t S,
                                  uint64_t A, uint64_t GOT, int shiftBits = 0) {
   int32_t result = (int32_t)((S + A - GOT) >> shiftBits);
   result = lld::scatterBits<int32_t>(result, 0x00c03fff);