maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF][MIPS] Factor out the code reading and calculating AHL addend into the separate function. NFC 

llvm-svn: 262706
This commit is contained in:
Simon Atanasyan 2016-03-04 10:55:20 +00:00
parent deed55d706
commit 3b37785fee
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lld/ELF/Target.cpp
View File

@ -1646,6 +1646,12 @@ static void writeMipsHi16(uint8_t *Loc, uint64_t V) {
write32<E>(Loc, (Instr & 0xffff0000) | mipsHigh(V)); write32<E>(Loc, (Instr & 0xffff0000) | mipsHigh(V));
} }
template <endianness E>
static int64_t readMipsAHL(uint8_t *HiLoc, uint8_t *LoLoc) {
return ((read32<E>(HiLoc) & 0xffff) << 16) +
SignExtend64<16>(read32<E>(LoLoc) & 0xffff);
}
template <class ELFT> template <class ELFT>
void MipsTargetInfo<ELFT>::writePltZero(uint8_t *Buf) const { void MipsTargetInfo<ELFT>::writePltZero(uint8_t *Buf) const {
const endianness E = ELFT::TargetEndianness; const endianness E = ELFT::TargetEndianness;
@ -1734,18 +1740,14 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint8_t *BufEnd,
case R_MIPS_GPREL32: case R_MIPS_GPREL32:
write32<E>(Loc, S + int32_t(read32<E>(Loc)) - getMipsGpAddr<ELFT>()); write32<E>(Loc, S + int32_t(read32<E>(Loc)) - getMipsGpAddr<ELFT>());
break; break;
case R_MIPS_HI16: { case R_MIPS_HI16:
uint32_t Instr = read32<E>(Loc); if (PairedLoc)
if (PairedLoc) { writeMipsHi16<E>(Loc, S + readMipsAHL<E>(Loc, PairedLoc));
uint64_t AHL = ((Instr & 0xffff) << 16) + else {
SignExtend64<16>(read32<E>(PairedLoc) & 0xffff);
writeMipsHi16<E>(Loc, S + AHL);
} else {
warning("Can't find matching R_MIPS_LO16 relocation for R_MIPS_HI16"); warning("Can't find matching R_MIPS_LO16 relocation for R_MIPS_HI16");
writeMipsHi16<E>(Loc, S); writeMipsHi16<E>(Loc, S);
} }
break; break;
}
case R_MIPS_JALR: case R_MIPS_JALR:
// Ignore this optimization relocation for now // Ignore this optimization relocation for now
break; break;
@ -1770,17 +1772,14 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint8_t *BufEnd,
case R_MIPS_PC32: case R_MIPS_PC32:
applyMipsPcReloc<E, 32, 0>(Loc, Type, P, S); applyMipsPcReloc<E, 32, 0>(Loc, Type, P, S);
break; break;
case R_MIPS_PCHI16: { case R_MIPS_PCHI16:
if (PairedLoc) { if (PairedLoc)
uint64_t AHL = ((read32<E>(Loc) & 0xffff) << 16) + writeMipsHi16<E>(Loc, S + readMipsAHL<E>(Loc, PairedLoc) - P);
SignExtend64<16>(read32<E>(PairedLoc) & 0xffff); else {
writeMipsHi16<E>(Loc, S + AHL - P);
} else {
warning("Can't find matching R_MIPS_PCLO16 relocation for R_MIPS_PCHI16"); warning("Can't find matching R_MIPS_PCLO16 relocation for R_MIPS_PCHI16");
writeMipsHi16<E>(Loc, S - P); writeMipsHi16<E>(Loc, S - P);
} }
break; break;
}
case R_MIPS_PCLO16: { case R_MIPS_PCLO16: {
uint32_t Instr = read32<E>(Loc); uint32_t Instr = read32<E>(Loc);
int64_t AHL = SignExtend64<16>(Instr & 0xffff); int64_t AHL = SignExtend64<16>(Instr & 0xffff);