diff options
Diffstat (limited to 'lld/lib/ReaderWriter')
5 files changed, 12 insertions, 12 deletions
diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp index fd691ce90be..d77566bb82f 100644 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp @@ -42,7 +42,7 @@ static void relocR_AARCH64_ABS64(uint8_t *location, uint64_t P, uint64_t S, /// \brief R_AARCH64_PREL32 - word32: S + A - P static void relocR_AARCH64_PREL32(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - int32_t result = (int32_t)((S + A) - P); + int32_t result = (int32_t)(S + A - P); write32le(location, result + (int32_t)read32le(location)); } @@ -84,7 +84,7 @@ static void relocR_AARCH64_ADR_PREL_PG_HI21(uint8_t *location, uint64_t P, /// \brief R_AARCH64_ADR_PREL_LO21 - S + A - P static void relocR_AARCH64_ADR_PREL_LO21(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - uint64_t result = (S + A) - P; + uint64_t result = S + A - P; uint32_t immlo = result & 0x3; uint32_t immhi = result & 0x1FFFFC; immlo = immlo << 29; @@ -114,7 +114,7 @@ static void relocR_AARCH64_ADD_ABS_LO12_NC(uint8_t *location, uint64_t P, } static void relocJump26(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - int32_t result = (int32_t)((S + A) - P); + int32_t result = (int32_t)(S + A - P); result &= 0x0FFFFFFC; result >>= 2; DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -"; @@ -128,7 +128,7 @@ static void relocJump26(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { /// \brief R_AARCH64_CONDBR19 static void relocR_AARCH64_CONDBR19(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - int32_t result = (int32_t)((S + A) - P); + int32_t result = (int32_t)(S + A - P); result &= 0x01FFFFC; result <<= 3; DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -"; diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp index 7c9a4d8a5e2..0ab25c31643 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp @@ -441,7 +441,7 @@ static void relocR_ARM_ALU_PC_GN_NC(uint8_t *location, uint32_t result) { /// \brief R_ARM_ALU_PC_G0_NC - ((S + A) | T) - P => S + A - P static void relocR_ARM_ALU_PC_G0_NC(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - int32_t result = (int32_t)((S + A) - P); + int32_t result = (int32_t)(S + A - P); if (result < 0) llvm_unreachable( @@ -460,7 +460,7 @@ static void relocR_ARM_ALU_PC_G0_NC(uint8_t *location, uint64_t P, uint64_t S, /// \brief R_ARM_ALU_PC_G1_NC - ((S + A) | T) - P => S + A - P static void relocR_ARM_ALU_PC_G1_NC(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - int32_t result = (int32_t)((S + A) - P); + int32_t result = (int32_t)(S + A - P); if (result < 0) llvm_unreachable( @@ -479,7 +479,7 @@ static void relocR_ARM_ALU_PC_G1_NC(uint8_t *location, uint64_t P, uint64_t S, /// \brief R_ARM_LDR_PC_G2 - S + A - P static void relocR_ARM_LDR_PC_G2(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - int32_t result = (int32_t)((S + A) - P); + int32_t result = (int32_t)(S + A - P); if (result < 0) llvm_unreachable( diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp index 93e4bc7883b..b7632bb28f3 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp @@ -38,7 +38,7 @@ static uint32_t scatterBits(uint32_t val, uint32_t mask) { static void relocBNPCREL(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A, int32_t nBits) { - int32_t result = (uint32_t)(((S + A) - P) >> 2); + int32_t result = (uint32_t)((S + A - P) >> 2); int32_t range = 1 << nBits; if (result < range && result > -range) { result = scatterBits(result, findv4bitmask(loc)); diff --git a/lld/lib/ReaderWriter/ELF/X86/X86RelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/X86/X86RelocationHandler.cpp index 6fc4fefe481..dc950851c26 100644 --- a/lld/lib/ReaderWriter/ELF/X86/X86RelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/X86/X86RelocationHandler.cpp @@ -24,7 +24,7 @@ static int reloc32(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) { /// \brief R_386_PC32 - word32: S + A - P static int relocPC32(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) { - uint32_t result = (uint32_t)((S + A) - P); + uint32_t result = (uint32_t)(S + A - P); write32le(location, result + read32le(location)); return 0; } diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp index 77b4fcfa098..8342783a564 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp @@ -23,7 +23,7 @@ static void reloc64(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { /// \brief R_X86_64_PC32 - word32: S + A - P static void relocPC32(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - uint32_t result = (uint32_t)((S + A) - P); + uint32_t result = (uint32_t)(S + A - P); write32le(location, result + read32le(location)); } @@ -50,14 +50,14 @@ static void reloc16(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { /// \brief R_X86_64_PC16 - word16: S + A - P static void relocPC16(uint8_t *location, uint64_t P, uint64_t S, int64_t A) { - uint16_t result = (uint16_t)((S + A) - P); + uint16_t result = (uint16_t)(S + A - P); write16le(location, result | read16le(location)); // TODO: Check for overflow. } /// \brief R_X86_64_PC64 - word64: S + A - P static void relocPC64(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) { - int64_t result = (uint64_t)((S + A) - P); + int64_t result = (uint64_t)(S + A - P); write64le(location, result | read64le(location)); } |
