lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

patch: check offsets from first code word

Browse source
This commit is contained in:
Liam 2023-11-20 11:36:35 -05:00 committed by t895
parent 3ec3cca4d8
commit f542a3bb7a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/arm/nce/patch.cpp
View file

@ -20,6 +20,7 @@ using namespace oaknut::util;
using NativeExecutionParameters = Kernel::KThread::NativeExecutionParameters; using NativeExecutionParameters = Kernel::KThread::NativeExecutionParameters;
constexpr size_t MaxRelativeBranch = 128_MiB; constexpr size_t MaxRelativeBranch = 128_MiB;
constexpr u32 ModuleCodeIndex = 0x24 / sizeof(u32);
Patcher::Patcher() : c(m_patch_instructions) {} Patcher::Patcher() : c(m_patch_instructions) {}
@ -42,7 +43,7 @@ void Patcher::PatchText(const Kernel::PhysicalMemory& program_image,
std::span<const u32>{reinterpret_cast<const u32*>(text.data()), text.size() / sizeof(u32)}; std::span<const u32>{reinterpret_cast<const u32*>(text.data()), text.size() / sizeof(u32)};
// Loop through instructions, patching as needed. // Loop through instructions, patching as needed.
for (u32 i = 0; i < static_cast<u32>(text_words.size()); i++) { for (u32 i = ModuleCodeIndex; i < static_cast<u32>(text_words.size()); i++) {
const u32 inst = text_words[i]; const u32 inst = text_words[i];
const auto AddRelocations = [&] { const auto AddRelocations = [&] {
@ -161,8 +162,8 @@ void Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
} }
// Cortex-A57 seems to treat all exclusives as ordered, but newer processors do not. // Cortex-A57 seems to treat all exclusives as ordered, but newer processors do not.
// Convert to ordered to preserve this assumption // Convert to ordered to preserve this assumption.
for (u32 i = 0; i < static_cast<u32>(text_words.size()); i++) { for (u32 i = ModuleCodeIndex; i < static_cast<u32>(text_words.size()); i++) {
const u32 inst = text_words[i]; const u32 inst = text_words[i];
if (auto exclusive = Exclusive{inst}; exclusive.Verify()) { if (auto exclusive = Exclusive{inst}; exclusive.Verify()) {
text_words[i] = exclusive.AsOrdered(); text_words[i] = exclusive.AsOrdered();