[lld] r234302 - [ARM] Rename applyThmReloc => applyThumb32Reloc
Denis Protivensky
dprotivensky at accesssoftek.com
Tue Apr 7 00:14:13 PDT 2015
Author: denis-protivensky
Date: Tue Apr 7 02:14:13 2015
New Revision: 234302
URL: http://llvm.org/viewvc/llvm-project?rev=234302&view=rev
Log:
[ARM] Rename applyThmReloc => applyThumb32Reloc
Modified:
lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp?rev=234302&r1=234301&r2=234302&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp Tue Apr 7 02:14:13 2015
@@ -117,9 +117,9 @@ static inline void applyArmReloc(uint8_t
write32le(location, (read32le(location) & ~mask) | (result & mask));
}
-static inline void applyThmReloc(uint8_t *location, uint16_t resHi,
- uint16_t resLo, uint16_t maskHi,
- uint16_t maskLo = 0xFFFF) {
+static inline void applyThumb32Reloc(uint8_t *location, uint16_t resHi,
+ uint16_t resLo, uint16_t maskHi,
+ uint16_t maskLo = 0xFFFF) {
assert(!(resHi & ~maskHi) && !(resLo & ~maskLo));
write16le(location, (read16le(location) & ~maskHi) | (resHi & maskHi));
location += 2;
@@ -196,7 +196,7 @@ static void relocR_ARM_THM_B_L(uint8_t *
const uint16_t bitI1 = (~(bitJ1 ^ bitS)) & 0x1;
const uint16_t resLo = (bitI1 << 13) | (bitI2 << 11) | imm11;
- applyThmReloc(location, resHi, resLo, 0x7FF, 0x2FFF);
+ applyThumb32Reloc(location, resHi, resLo, 0x7FF, 0x2FFF);
}
/// \brief R_ARM_THM_CALL - ((S + A) | T) - P
@@ -220,7 +220,7 @@ static void relocR_ARM_THM_CALL(uint8_t
relocR_ARM_THM_B_L(location, result, useJs);
if (switchMode) {
- applyThmReloc(location, 0, 0, 0, 0x1001);
+ applyThumb32Reloc(location, 0, 0, 0, 0x1001);
}
}
@@ -367,7 +367,7 @@ static void relocR_ARM_THM_MOV(uint8_t *
const uint16_t bitI = (result >> 11) & 0x1;
const uint16_t resHi = (bitI << 10) | imm4;
- applyThmReloc(location, resHi, resLo, 0x40F, 0x70FF);
+ applyThumb32Reloc(location, resHi, resLo, 0x40F, 0x70FF);
}
/// \brief R_ARM_THM_MOVW_ABS_NC - (S + A) | T
More information about the llvm-commits
mailing list