R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added separate function to resolve relative addresses in address.h

Browse Source
This commit is contained in:
IcePixelx 2021-08-17 23:02:14 +02:00
parent 3c641687f1
commit 768f2341f1
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
shared/include/address.h
View File

@ -276,26 +276,21 @@ public:
MemoryAddress FollowNearCall(std::ptrdiff_t opcodeOffset = 0x1, std::ptrdiff_t nextInstructionOffset = 0x5)
{
// Skip E9 opcode.
std::uintptr_t skipOpCode = ptr + opcodeOffset;
// Get 4-byte long relative address.
std::int32_t relativeAddress = *reinterpret_cast<std::int32_t*>(skipOpCode);
// Get location of next instruction.
std::uintptr_t nextInstruction = ptr + nextInstructionOffset;
// Get function location via adding relative address to next instruction.
return MemoryAddress(nextInstruction + relativeAddress);
return ResolveRelativeAddress(opcodeOffset, nextInstructionOffset);
}
MemoryAddress FollowNearCallSelf(std::ptrdiff_t opcodeOffset = 0x1, std::ptrdiff_t nextInstructionOffset = 0x5)
{
// Skip E9 opcode.
std::uintptr_t skipOpCode = ptr + opcodeOffset;
return ResolveRelativeAddressSelf(opcodeOffset, nextInstructionOffset);
}
MemoryAddress ResolveRelativeAddressSelf(std::ptrdiff_t registerOffset = 0x1, std::ptrdiff_t nextInstructionOffset = 0x4)
{
// Skip register.
std::uintptr_t skipRegister = ptr + registerOffset;
// Get 4-byte long relative address.
std::int32_t relativeAddress = *reinterpret_cast<std::int32_t*>(skipOpCode);
std::int32_t relativeAddress = *reinterpret_cast<std::int32_t*>(skipRegister);
// Get location of next instruction.
std::uintptr_t nextInstruction = ptr + nextInstructionOffset;
@ -304,7 +299,22 @@ public:
ptr = nextInstruction + relativeAddress;
return *this;
}
MemoryAddress ResolveRelativeAddress(std::ptrdiff_t registerOffset = 0x1, std::ptrdiff_t nextInstructionOffset = 0x4)
{
// Skip register.
std::uintptr_t skipRegister = ptr + registerOffset;
// Get 4-byte long relative address.
std::int32_t relativeAddress = *reinterpret_cast<std::int32_t*>(skipRegister);
// Get location of next instruction.
std::uintptr_t nextInstruction = ptr + nextInstructionOffset;
// Get function location via adding relative address to next instruction.
return MemoryAddress(nextInstruction + relativeAddress);
}
private:
std::uintptr_t ptr = 0;
};
@ -339,14 +349,6 @@ public:
return ModuleSections();
}
void PrintSections()
{
for (ModuleSections& currentSection : moduleSections)
{
printf(" [+Module: %s+]%s, %p\n", moduleName.c_str(), currentSection.sectionName.c_str(), reinterpret_cast<void*>(currentSection.sectionStartAddress));
}
}
Module() = default;
Module(std::string moduleName) : moduleName(moduleName)
{