replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF][MIPS] Factor out the code writing relocation result into low 16-bit of destination. NFC 

llvm-svn: 262707
This commit is contained in:
Simon Atanasyan 2016-03-04 10:55:24 +00:00
parent 3b37785fee
commit 0dcf541692
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
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));
}
template <endianness E>
static void writeMipsLo16(uint8_t *Loc, uint64_t V) {
uint32_t Instr = read32<E>(Loc);
write32<E>(Loc, (Instr & 0xffff0000) | (V & 0xffff));
}
template <endianness E>
static int64_t readMipsAHL(uint8_t *HiLoc, uint8_t *LoLoc) {
return ((read32<E>(HiLoc) & 0xffff) << 16) +
@ -1664,10 +1670,9 @@ void MipsTargetInfo<ELFT>::writePltZero(uint8_t *Buf) const {
write32<E>(Buf + 24, 0x0320f809); // jalr $25
write32<E>(Buf + 28, 0x2718fffe); // subu $24, $24, 2
uint64_t Got = Out<ELFT>::GotPlt->getVA();
uint64_t Plt = Out<ELFT>::Plt->getVA();
writeMipsHi16<E>(Buf, Got);
relocateOne(Buf + 4, Buf + 8, R_MIPS_LO16, Plt + 4, Got);
relocateOne(Buf + 8, Buf + 12, R_MIPS_LO16, Plt + 8, Got);
writeMipsLo16<E>(Buf + 4, Got);
writeMipsLo16<E>(Buf + 8, Got);
}
template <class ELFT>
@ -1680,8 +1685,8 @@ void MipsTargetInfo<ELFT>::writePlt(uint8_t *Buf, uint64_t GotEntryAddr,
write32<E>(Buf + 8, 0x03200008); // jr $25
write32<E>(Buf + 12, 0x25f80000); // addiu $24, $15, %lo(.got.plt entry)
writeMipsHi16<E>(Buf, GotEntryAddr);
relocateOne(Buf + 4, Buf + 8, R_MIPS_LO16, PltEntryAddr + 4, GotEntryAddr);
relocateOne(Buf + 12, Buf + 16, R_MIPS_LO16, PltEntryAddr + 8, GotEntryAddr);
writeMipsLo16<E>(Buf + 4, GotEntryAddr);
writeMipsLo16<E>(Buf + 12, GotEntryAddr);
}
template <class ELFT>
@ -1727,14 +1732,14 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint8_t *BufEnd,
int64_t V = S - getMipsGpAddr<ELFT>();
if (Type == R_MIPS_GOT16)
checkInt<16>(V, Type);
write32<E>(Loc, (read32<E>(Loc) & 0xffff0000) | (V & 0xffff));
writeMipsLo16<E>(Loc, V);
break;
}
case R_MIPS_GPREL16: {
uint32_t Instr = read32<E>(Loc);
int64_t V = S + SignExtend64<16>(Instr & 0xffff) - getMipsGpAddr<ELFT>();
checkInt<16>(V, Type);
write32<E>(Loc, (Instr & 0xffff0000) | (V & 0xffff));
writeMipsLo16<E>(Loc, V);
break;
}
case R_MIPS_GPREL32:
@ -1751,12 +1756,9 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint8_t *BufEnd,
case R_MIPS_JALR:
// Ignore this optimization relocation for now
break;
case R_MIPS_LO16: {
uint32_t Instr = read32<E>(Loc);
int64_t AHL = SignExtend64<16>(Instr & 0xffff);
write32<E>(Loc, (Instr & 0xffff0000) | ((S + AHL) & 0xffff));
case R_MIPS_LO16:
writeMipsLo16<E>(Loc, S + SignExtend64<16>(read32<E>(Loc) & 0xffff));
break;
}
case R_MIPS_PC16:
applyMipsPcReloc<E, 16, 2>(Loc, Type, P, S);
break;
@ -1780,12 +1782,9 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint8_t *BufEnd,
writeMipsHi16<E>(Loc, S - P);
}
break;
case R_MIPS_PCLO16: {
uint32_t Instr = read32<E>(Loc);
int64_t AHL = SignExtend64<16>(Instr & 0xffff);
write32<E>(Loc, (Instr & 0xffff0000) | ((S + AHL - P) & 0xffff));
case R_MIPS_PCLO16:
writeMipsLo16<E>(Loc, S + SignExtend64<16>(read32<E>(Loc) & 0xffff) - P);
break;
}
default:
fatal("unrecognized reloc " + Twine(Type));
}