mirror of https://github.com/RPCS3/rpcs3.git
Restore hook static functions
This commit is contained in:
parent
67b71c0f89
commit
60c6bb9865
|
@ -16,5 +16,5 @@ void sys_libc_memcpy(vm::ptr<void> dst, vm::cptr<void> src, u32 size)
|
||||||
|
|
||||||
DECLARE(ppu_module_manager::sys_libc)("sys_libc", []()
|
DECLARE(ppu_module_manager::sys_libc)("sys_libc", []()
|
||||||
{
|
{
|
||||||
REG_FNID(sys_libc, "memcpy", sys_libc_memcpy);
|
REG_FNID(sys_libc, "memcpy", sys_libc_memcpy).flags = MFF_FORCED_HLE;
|
||||||
});
|
});
|
||||||
|
|
|
@ -505,7 +505,7 @@ static auto ppu_load_exports(const std::shared_ptr<ppu_linkage_info>& link, u32
|
||||||
// Static function
|
// Static function
|
||||||
const auto _sf = _sm && _sm->functions.count(fnid) ? &_sm->functions.at(fnid) : nullptr;
|
const auto _sf = _sm && _sm->functions.count(fnid) ? &_sm->functions.at(fnid) : nullptr;
|
||||||
|
|
||||||
if (_sf && (_sf->flags & MFF_FORCED_HLE))
|
if (_sf && (_sf->flags & MFF_FORCED_HLE) && g_cfg.core.hook_functions)
|
||||||
{
|
{
|
||||||
// Inject a branch to the HLE implementation
|
// Inject a branch to the HLE implementation
|
||||||
const u32 _entry = vm::read32(faddr);
|
const u32 _entry = vm::read32(faddr);
|
||||||
|
@ -933,11 +933,6 @@ void ppu_unload_prx(const lv2_prx& prx)
|
||||||
|
|
||||||
void ppu_load_exec(const ppu_exec_object& elf)
|
void ppu_load_exec(const ppu_exec_object& elf)
|
||||||
{
|
{
|
||||||
if (g_cfg.core.hook_functions)
|
|
||||||
{
|
|
||||||
LOG_TODO(LOADER, "'Hook static functions' option deactivated");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set for delayed initialization in ppu_initialize()
|
// Set for delayed initialization in ppu_initialize()
|
||||||
const auto _main = fxm::make<ppu_module>();
|
const auto _main = fxm::make<ppu_module>();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue