archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 17:01:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

spu/arm64: fix 16 byte branch patch alignment

Browse source
This commit is contained in:
sguo35 2022-07-13 11:32:44 -07:00 • committed by Ivan
parent b37217b181
commit 73ed657e00
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/Cell/SPURecompiler.cpp
View file

@ -1578,7 +1578,12 @@ spu_function_t spu_runtime::make_branch_patchpoint(u16 data) const
// Save the jmp addr to GHC CC 3rd arg -> REG_Hp // Save the jmp addr to GHC CC 3rd arg -> REG_Hp
Label replace_addr = c.newLabel(); Label replace_addr = c.newLabel();
c.adr(a64::x21, replace_addr); c.adr(a64::x21, replace_addr);
// 16 byte alignment for the jump replacement
c.nop();
c.nop();
c.nop();
Label branch_target = c.newLabel(); Label branch_target = c.newLabel();
c.bind(replace_addr); c.bind(replace_addr);
@ -1641,7 +1646,6 @@ void spu_recompiler_base::dispatch(spu_thread& spu, void*, u8* rip)
c.bind(branch_target); c.bind(branch_target);
c.embedUInt64(reinterpret_cast<u64>(spu_runtime::tr_all)); c.embedUInt64(reinterpret_cast<u64>(spu_runtime::tr_all));
}); });
// 128 bit load/store is atomic on Armv8.4+
u128 result = *reinterpret_cast<u128*>(jump_instrs); u128 result = *reinterpret_cast<u128*>(jump_instrs);
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_jit_write_protect_np(false); pthread_jit_write_protect_np(false);
@ -1774,7 +1778,6 @@ void spu_recompiler_base::branch(spu_thread& spu, void*, u8* rip)
c.bind(branch_target); c.bind(branch_target);
c.embedUInt64(reinterpret_cast<u64>(func)); c.embedUInt64(reinterpret_cast<u64>(func));
}); });
// 128 bit load/store is atomic on Armv8.4+
u128 result = *reinterpret_cast<u128*>(jmp_instrs); u128 result = *reinterpret_cast<u128*>(jmp_instrs);
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_jit_write_protect_np(false); pthread_jit_write_protect_np(false);