ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup patches

This commit is contained in:
Eladash 2023-07-24 13:24:30 +03:00 committed by Elad Ashkenazi
parent 9d3e626b55
commit 95fb7859d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Utilities/bin_patch.cpp
View File

@ -1046,7 +1046,7 @@ static usz apply_modification(std::basic_string<u32>& applied, patch_engine::pat
auto ptr = mem_translate(offset, memory_size); auto ptr = mem_translate(offset, memory_size);
if (!ptr && memory_size != 0) if (!ptr && memory_size != 0 && !relocate_instructions_at)
{ {
// Memory translation failed // Memory translation failed
continue; continue;
@ -1076,7 +1076,7 @@ static usz apply_modification(std::basic_string<u32>& applied, patch_engine::pat
} }
case patch_type::code_alloc: case patch_type::code_alloc:
{ {
const u32 out_branch = vm::try_get_addr(mem_translate(offset & -4, 4)).first; const u32 out_branch = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
// Allow only if points to a PPU executable instruction // Allow only if points to a PPU executable instruction
if (out_branch < 0x10000 || out_branch >= 0x4000'0000 || !vm::check_addr<4>(out_branch, vm::page_executable)) if (out_branch < 0x10000 || out_branch >= 0x4000'0000 || !vm::check_addr<4>(out_branch, vm::page_executable))
@ -1160,7 +1160,7 @@ static usz apply_modification(std::basic_string<u32>& applied, patch_engine::pat
case patch_type::jump: case patch_type::jump:
case patch_type::jump_link: case patch_type::jump_link:
{ {
const u32 out_branch = vm::try_get_addr(mem_translate(offset & -4, 4)).first; const u32 out_branch = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
const u32 dest = static_cast<u32>(p.value.long_value); const u32 dest = static_cast<u32>(p.value.long_value);
// Allow only if points to a PPU executable instruction // Allow only if points to a PPU executable instruction
@ -1176,7 +1176,7 @@ static usz apply_modification(std::basic_string<u32>& applied, patch_engine::pat
{ {
const std::string& str = p.original_value; const std::string& str = p.original_value;
const u32 out_branch = vm::try_get_addr(mem_translate(offset & -4, 4)).first; const u32 out_branch = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
const usz sep_pos = str.find_first_of(':'); const usz sep_pos = str.find_first_of(':');
// Must contain only a single ':' or none // Must contain only a single ':' or none