RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-29 07:53:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[RuntimeDyld][AArch64] Make encode/decodeAddend more typesafe by using the relocation enum type. NFCI.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214204 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Juergen Ributzka 2014-07-29 19:57:11 +00:00
parent d7a5d9444d
commit 26dd3e6531
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
View File

@ -28,7 +28,7 @@ using namespace llvm::object;
namespace llvm {
int64_t RuntimeDyldMachO::decodeAddend(uint8_t *LocalAddress, unsigned NumBytes,
uint32_t RelType) const {
MachO::RelocationInfoType) const {
int64_t Addend = 0;
memcpy(&Addend, LocalAddress, NumBytes);
return Addend;

5
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
View File

@ -54,7 +54,7 @@ protected:
/// Extract the addend encoded in the instruction.
int64_t decodeAddend(uint8_t *LocalAddress, unsigned NumBytes,
uint32_t RelType) const;
MachO::RelocationInfoType RelType) const;
/// Construct a RelocationValueRef representing the relocation target.
/// For Symbols in known sections, this will return a RelocationValueRef
@ -138,7 +138,8 @@ protected:
RI->getOffset(Offset);
uint8_t *LocalAddress = Section.Address + Offset;
unsigned NumBytes = 1 << Size;
uint32_t RelType = Obj.getAnyRelocationType(RelInfo);
MachO::RelocationInfoType RelType =
static_cast<MachO::RelocationInfoType>(Obj.getAnyRelocationType(RelInfo));
int64_t Addend = impl().decodeAddend(LocalAddress, NumBytes, RelType);
return RelocationEntry(SectionID, Offset, RelType, Addend, IsPCRel, Size);

14
lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h
View File

@ -28,7 +28,7 @@ public:
/// Extract the addend encoded in the instruction / memory location.
int64_t decodeAddend(uint8_t *LocalAddress, unsigned NumBytes,
uint32_t RelType) const {
MachO::RelocationInfoType RelType) const {
int64_t Addend = 0;
// Verify that the relocation has the correct size and alignment.
switch (RelType) {
@ -120,7 +120,7 @@ public:
}
/// Extract the addend encoded in the instruction.
void encodeAddend(uint8_t *LocalAddress, uint32_t RelType,
void encodeAddend(uint8_t *LocalAddress, MachO::RelocationInfoType RelType,
int64_t Addend) const {
// Verify that the relocation has the correct alignment.
switch (RelType) {
@ -285,8 +285,10 @@ public:
const SectionEntry &Section = Sections[RE.SectionID];
uint8_t *LocalAddress = Section.Address + RE.Offset;
MachO::RelocationInfoType RelType =
static_cast<MachO::RelocationInfoType>(RE.RelType);
switch (RE.RelType) {
switch (RelType) {
default:
llvm_unreachable("Invalid relocation type!");
case MachO::ARM64_RELOC_UNSIGNED: {
@ -304,7 +306,7 @@ public:
// Check if branch is in range.
uint64_t FinalAddress = Section.LoadAddress + RE.Offset;
int64_t PCRelVal = Value - FinalAddress + RE.Addend;
encodeAddend(LocalAddress, RE.RelType, PCRelVal);
encodeAddend(LocalAddress, RelType, PCRelVal);
break;
}
case MachO::ARM64_RELOC_GOT_LOAD_PAGE21:
@ -314,7 +316,7 @@ public:
uint64_t FinalAddress = Section.LoadAddress + RE.Offset;
int64_t PCRelVal =
((Value + RE.Addend) & (-4096)) - (FinalAddress & (-4096));
encodeAddend(LocalAddress, RE.RelType, PCRelVal);
encodeAddend(LocalAddress, RelType, PCRelVal);
break;
}
case MachO::ARM64_RELOC_GOT_LOAD_PAGEOFF12:
@ -324,7 +326,7 @@ public:
Value += RE.Addend;
// Mask out the page address and only use the lower 12 bits.
Value &= 0xFFF;
encodeAddend(LocalAddress, RE.RelType, Value);
encodeAddend(LocalAddress, RelType, Value);
break;
}
case MachO::ARM64_RELOC_SUBTRACTOR: