diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp index 3fb874ee2c..ff7eb1df4f 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp @@ -325,7 +325,7 @@ s32 sceKernelWaitThreadEndCB(u32 threadId, vm::psv::ptr pExitStatus, vm::ps #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibKernel, #name, &name) -psv_log_base sceLibKernel = []() -> psv_log_base +psv_log_base sceLibKernel("sceLibKernel", []() { //REG_FUNC(0x23EAA62, sceKernelPuts); //REG_FUNC(0xB0335388, sceClibToupper); @@ -691,6 +691,4 @@ psv_log_base sceLibKernel = []() -> psv_log_base /* SceDebugLed */ //REG_FUNC(0x78E702D3, sceKernelSetGPO); - - return psv_log_base("sceLibKernel"); -}(); +}); diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp index 79d53bf830..eeb52f50a7 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp @@ -112,7 +112,7 @@ namespace sce_libc_func #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibc, #name, &sce_libc_func::name) -psv_log_base sceLibc = []() -> psv_log_base +psv_log_base sceLibc("SceLibc", []() { REG_FUNC(0xE4531F85, _Assert); //REG_FUNC(0xE71C5CDE, _Stoul); @@ -406,6 +406,4 @@ psv_log_base sceLibc = []() -> psv_log_base //REG_FUNC(0x677CDE35, _Snan); //REG_FUNC(0x7D35108B, _FSnan); //REG_FUNC(0x48AEEF2A, _LSnan); - - return psv_log_base("SceLibc"); -}(); +}); diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp index 30fcde88cb..ae85794c24 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp @@ -12,7 +12,7 @@ namespace sce_libm_func #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibm, #name, &sce_libm_func::name) -psv_log_base sceLibm = []() -> psv_log_base +psv_log_base sceLibm("SceLibm", []() { //REG_FUNC(0xC73FE76D, _Exp); //REG_FUNC(0xFF4EAE04, _FExp); @@ -212,6 +212,4 @@ psv_log_base sceLibm = []() -> psv_log_base //REG_FUNC(0x5BD0F71C, _Dsign); //REG_FUNC(0xC4F7E42C, _FDsign); //REG_FUNC(0x1DF73D2B, _LDsign); - - return psv_log_base("SceLibm"); -}(); +}); diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp index 7813c8b8a5..7846ec1c0d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp @@ -28,7 +28,7 @@ namespace sce_libstdcxx_func #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibstdcxx, #name, &sce_libstdcxx_func::name) -psv_log_base sceLibstdcxx = []() -> psv_log_base +psv_log_base sceLibstdcxx("SceLibstdcxx", []() { //REG_FUNC(0x52B0C625, std::bad_typeid::what() const); //REG_FUNC(0x64D7D074, std::bad_typeid::_Doraise() const); @@ -976,9 +976,7 @@ psv_log_base sceLibstdcxx = []() -> psv_log_base //REG_FUNC(0x7321E731, vtable for __cxxabiv1::__vmi_class_type_info); //REG_FUNC(0x33836375, vtable for __cxxabiv1::__fundamental_type_info); //REG_FUNC(0x94664DEB, vtable for __cxxabiv1::__pointer_to_member_type_info); - - return psv_log_base("SceLibstdcxx"); -}(); +}); /* // original names diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h index c6959a1bd5..8a26743b6d 100644 --- a/rpcs3/Emu/ARMv7/PSVFuncList.h +++ b/rpcs3/Emu/ARMv7/PSVFuncList.h @@ -7,9 +7,10 @@ class psv_log_base : public LogBase std::string m_name; public: - psv_log_base(const std::string& name) + psv_log_base(const std::string& name, void(*init_func)()) : m_name(name) { + init_func(); } virtual const std::string& GetName() const override