archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ppu] Fix function trampoline for arm64

Browse source 
- Refactor function manager trampoline to be cleaner
- Add trampoline impl for arm64
- Force all JIT entrypoints on Apple to toggle W^X
This commit is contained in:
sguo35 2022-06-17 19:54:54 -07:00 • committed by Ivan
parent e8b6e95f8e
commit 775caabeeb
2 changed files with 63 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

98
rpcs3/Emu/Cell/PPUFunction.cpp
View file

@ -1889,6 +1889,60 @@ extern std::string ppu_get_variable_name(const std::string& _module, u32 vnid)
return fmt::format("0x%08X", vnid); return fmt::format("0x%08X", vnid);
} }
#if defined(ARCH_X64)
auto gen_ghc_cpp_trampoline(ppu_intrp_func_t fn_target)
{
return [fn_target] (native_asm& c, auto& args)
{
using namespace asmjit;
// Take second ghc arg
c.mov(args[0], x86::rbp);
c.mov(args[2].r32(), x86::dword_ptr(args[0], ::offset32(&ppu_thread::cia)));
c.add(args[2], x86::qword_ptr(reinterpret_cast<u64>(&vm::g_base_addr)));
c.jmp(fn_target);
};
}
#elif defined(ARCH_ARM64)
auto gen_ghc_cpp_trampoline(ppu_intrp_func_t fn_target)
{
return [fn_target] (native_asm& c, auto& args)
{
using namespace asmjit;
// Take second ghc arg
c.mov(args[0], a64::x20);
Label cia_offset = c.newLabel();
c.ldr(a64::x11, arm::Mem(cia_offset));
c.ldr(a64::x26, arm::Mem(args[0], a64::x11));
Label base_addr = c.newLabel();
c.ldr(a64::x22, arm::Mem(base_addr));
c.ldr(a64::x22, arm::Mem(a64::x22));
c.add(args[2], a64::x22, a64::x26);
Label jmp_target = c.newLabel();
c.ldr(a64::x22, arm::Mem(jmp_target));
c.br(a64::x22);
c.bind(base_addr);
c.embedUInt64(reinterpret_cast<u64>(&vm::g_base_addr));
c.bind(cia_offset);
c.embedUInt64(static_cast<u64>(::offset32(&ppu_thread::cia)));
c.bind(jmp_target);
c.embedUInt64(reinterpret_cast<u64>(fn_target));
};
}
#else
#error "Not implemented!"
#endif
std::vector<ppu_intrp_func_t>& ppu_function_manager::access(bool ghc) std::vector<ppu_intrp_func_t>& ppu_function_manager::access(bool ghc)
{ {
static std::vector<ppu_intrp_func_t> list static std::vector<ppu_intrp_func_t> list
@ -1907,33 +1961,11 @@ std::vector<ppu_intrp_func_t>& ppu_function_manager::access(bool ghc)
}, },
}; };
#if defined(ARCH_X64)
static std::vector<ppu_intrp_func_t> list_ghc static std::vector<ppu_intrp_func_t> list_ghc
{ {
build_function_asm<ppu_intrp_func_t>("ppu_unregistered", [](native_asm& c, auto& args) build_function_asm<ppu_intrp_func_t>("ppu_unregistered", gen_ghc_cpp_trampoline(list[0])),
{ build_function_asm<ppu_intrp_func_t>("ppu_return", gen_ghc_cpp_trampoline(list[1])),
using namespace asmjit;
// Take second ghc arg
c.mov(args[0], x86::rbp);
c.mov(args[2].r32(), x86::dword_ptr(args[0], ::offset32(&ppu_thread::cia)));
c.add(args[2], x86::qword_ptr(reinterpret_cast<u64>(&vm::g_base_addr)));
c.jmp(list[0]);
}),
build_function_asm<ppu_intrp_func_t>("ppu_return", [](native_asm& c, auto& args)
{
using namespace asmjit;
// Take second ghc arg
c.mov(args[0], x86::rbp);
c.mov(args[2].r32(), x86::dword_ptr(args[0], ::offset32(&ppu_thread::cia)));
c.add(args[2], x86::qword_ptr(reinterpret_cast<u64>(&vm::g_base_addr)));
c.jmp(list[1]);
}),
}; };
#elif defined(ARCH_ARM64)
static std::vector<ppu_intrp_func_t> list_ghc(list);
#endif
return ghc ? list_ghc : list; return ghc ? list_ghc : list;
} }
@ -1945,23 +1977,7 @@ u32 ppu_function_manager::add_function(ppu_intrp_func_t function)
list.push_back(function); list.push_back(function);
// Generate trampoline list2.push_back(build_function_asm<ppu_intrp_func_t>("", gen_ghc_cpp_trampoline(function)));
#if defined(ARCH_X64)
list2.push_back(build_function_asm<ppu_intrp_func_t>("", [&](native_asm& c, auto& args)
{
using namespace asmjit;
// Take second ghc arg
c.mov(args[0], x86::rbp);
c.mov(args[2].r32(), x86::dword_ptr(args[0], ::offset32(&ppu_thread::cia)));
c.add(args[2], x86::qword_ptr(reinterpret_cast<u64>(&vm::g_base_addr)));
c.jmp(function);
}));
#elif defined(ARCH_ARM64)
list2.push_back(function);
#else
#error "Not implemented"
#endif
return ::size32(list) - 1; return ::size32(list) - 1;
} }

6
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -1330,6 +1330,9 @@ void ppu_thread::cpu_task()
} }
case ppu_cmd::lle_call: case ppu_cmd::lle_call:
{ {
#ifdef __APPLE__
pthread_jit_write_protect_np(true);
#endif
const vm::ptr<u32> opd(arg < 32 ? vm::cast(gpr[arg]) : vm::cast(arg)); const vm::ptr<u32> opd(arg < 32 ? vm::cast(gpr[arg]) : vm::cast(arg));
cmd_pop(), fast_call(opd[0], opd[1]); cmd_pop(), fast_call(opd[0], opd[1]);
break; break;
@ -1341,6 +1344,9 @@ void ppu_thread::cpu_task()
} }
case ppu_cmd::opd_call: case ppu_cmd::opd_call:
{ {
#ifdef __APPLE__
pthread_jit_write_protect_np(true);
#endif
const ppu_func_opd_t opd = cmd_get(1).as<ppu_func_opd_t>(); const ppu_func_opd_t opd = cmd_get(1).as<ppu_func_opd_t>();
cmd_pop(1), fast_call(opd.addr, opd.rtoc); cmd_pop(1), fast_call(opd.addr, opd.rtoc);
break; break;