diff --git a/rpcs3/Emu/SysCalls/Modules.h b/rpcs3/Emu/SysCalls/Modules.h index 053973045c..409b6a120d 100644 --- a/rpcs3/Emu/SysCalls/Modules.h +++ b/rpcs3/Emu/SysCalls/Modules.h @@ -163,8 +163,8 @@ __forceinline u32 Module::AddFuncSub(const char group[8], const u64 ops[], const #define REG_SUB(module, group, name, ...) \ static const u64 name ## _table[] = {__VA_ARGS__ , 0}; \ - if (name ## _table[0]) module.AddFuncSub(group, name ## _table, #name, name) + if (name ## _table[0]) module.AddFuncSub<&name>(group, name ## _table, #name, name) -#define REG_FUNC(module, name) module.AddFunc(#name, name) +#define REG_FUNC(module, name) module.AddFunc<&name>(#name, name) #define UNIMPLEMENTED_FUNC(module) module.Error("%s", __FUNCTION__) diff --git a/rpcs3/Emu/SysCalls/SC_FUNC.h b/rpcs3/Emu/SysCalls/SC_FUNC.h index 27c993481c..4ebb750dfe 100644 --- a/rpcs3/Emu/SysCalls/SC_FUNC.h +++ b/rpcs3/Emu/SysCalls/SC_FUNC.h @@ -212,4 +212,4 @@ namespace ppu_func_detail } } -#define bind_func(func) (ppu_func_detail::_bind_func(func)) +#define bind_func(func) (ppu_func_detail::_bind_func<&func>(func))