From 3474b907ddf954b68db1d9c53e8753a3a86d1996 Mon Sep 17 00:00:00 2001 From: Simon Atanasyan Date: Fri, 4 Mar 2016 10:55:04 +0000 Subject: [PATCH] [ELF][MIPS] s/applyMipsHi16Reloc/writeMipsHi16/ NFC llvm-svn: 262703 --- lld/ELF/Target.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp index fd4647bf5286..f10485442866 100644 --- a/lld/ELF/Target.cpp +++ b/lld/ELF/Target.cpp @@ -1641,7 +1641,7 @@ static void applyMipsPcReloc(uint8_t *Loc, uint32_t Type, uint64_t P, } template -static void applyMipsHi16Reloc(uint8_t *Loc, uint64_t S, int64_t A) { +static void writeMipsHi16(uint8_t *Loc, uint64_t S, int64_t A) { uint32_t Instr = read32(Loc); write32(Loc, (Instr & 0xffff0000) | mipsHigh(S + A)); } @@ -1659,7 +1659,7 @@ void MipsTargetInfo::writePltZero(uint8_t *Buf) const { write32(Buf + 28, 0x2718fffe); // subu $24, $24, 2 uint64_t Got = Out::GotPlt->getVA(); uint64_t Plt = Out::Plt->getVA(); - applyMipsHi16Reloc(Buf, Got, 0); + writeMipsHi16(Buf, Got, 0); relocateOne(Buf + 4, Buf + 8, R_MIPS_LO16, Plt + 4, Got); relocateOne(Buf + 8, Buf + 12, R_MIPS_LO16, Plt + 8, Got); } @@ -1673,7 +1673,7 @@ void MipsTargetInfo::writePlt(uint8_t *Buf, uint64_t GotEntryAddr, write32(Buf + 4, 0x8df90000); // l[wd] $25, %lo(.got.plt entry)($15) write32(Buf + 8, 0x03200008); // jr $25 write32(Buf + 12, 0x25f80000); // addiu $24, $15, %lo(.got.plt entry) - applyMipsHi16Reloc(Buf, GotEntryAddr, 0); + writeMipsHi16(Buf, GotEntryAddr, 0); relocateOne(Buf + 4, Buf + 8, R_MIPS_LO16, PltEntryAddr + 4, GotEntryAddr); relocateOne(Buf + 12, Buf + 16, R_MIPS_LO16, PltEntryAddr + 8, GotEntryAddr); } @@ -1739,10 +1739,10 @@ void MipsTargetInfo::relocateOne(uint8_t *Loc, uint8_t *BufEnd, if (PairedLoc) { uint64_t AHL = ((Instr & 0xffff) << 16) + SignExtend64<16>(read32(PairedLoc) & 0xffff); - applyMipsHi16Reloc(Loc, S, AHL); + writeMipsHi16(Loc, S, AHL); } else { warning("Can't find matching R_MIPS_LO16 relocation for R_MIPS_HI16"); - applyMipsHi16Reloc(Loc, S, 0); + writeMipsHi16(Loc, S, 0); } break; }