From 60c6bb98656e45d57eea0209668519d544962095 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 23 Jul 2017 23:25:00 +0300 Subject: [PATCH] Restore hook static functions --- rpcs3/Emu/Cell/Modules/sys_libc.cpp | 2 +- rpcs3/Emu/Cell/PPUModule.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/sys_libc.cpp b/rpcs3/Emu/Cell/Modules/sys_libc.cpp index 5ee373c60f..4e60495ce5 100644 --- a/rpcs3/Emu/Cell/Modules/sys_libc.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_libc.cpp @@ -16,5 +16,5 @@ void sys_libc_memcpy(vm::ptr dst, vm::cptr src, u32 size) 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; }); diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 8d9e2d8650..6a9f93bab1 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -505,7 +505,7 @@ static auto ppu_load_exports(const std::shared_ptr& link, u32 // Static function 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 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) { - if (g_cfg.core.hook_functions) - { - LOG_TODO(LOADER, "'Hook static functions' option deactivated"); - } - // Set for delayed initialization in ppu_initialize() const auto _main = fxm::make();