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

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2014-08-22 20:54:53 +04:00
parent 652c5901f8
commit 102f8cf993
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/SysCalls/Modules.cpp
View file

@ -173,3 +173,13 @@ bool Module::CheckID(u32 id, ID*& _id) const
{ {
return Emu.GetIdManager().CheckID(id) && (_id = &Emu.GetIdManager().GetID(id))->m_name == GetName(); return Emu.GetIdManager().CheckID(id) && (_id = &Emu.GetIdManager().GetID(id))->m_name == GetName();
} }
IdManager& Module::GetIdManager() const
{
return Emu.GetIdManager();
}
StaticFuncManager& Module::GetSFuncManager() const
{
return Emu.GetSFuncManager();
}

7
rpcs3/Emu/SysCalls/Modules.h
View file

@ -50,6 +50,9 @@ class Module : public LogBase
void (*m_load_func)(); void (*m_load_func)();
void (*m_unload_func)(); void (*m_unload_func)();
IdManager& GetIdManager() const;
StaticFuncManager& GetSFuncManager() const;
public: public:
std::vector<ModuleFunc*> m_funcs_list; std::vector<ModuleFunc*> m_funcs_list;
@ -106,7 +109,7 @@ public:
template<typename T> template<typename T>
u32 GetNewId(T* data, IDType type = TYPE_OTHER) u32 GetNewId(T* data, IDType type = TYPE_OTHER)
{ {
return Emu.GetIdManager().GetNewID<T>(GetName(), data, type); return GetIdManager().GetNewID<T>(GetName(), data, type);
} }
template<typename T> __forceinline void AddFunc(u32 id, T func); template<typename T> __forceinline void AddFunc(u32 id, T func);
@ -152,5 +155,5 @@ __forceinline void Module::AddFuncSub(const char group[8], const u64 ops[], cons
op.crc = re(op.crc); op.crc = re(op.crc);
sf->ops.push_back(op); sf->ops.push_back(op);
} }
Emu.GetSFuncManager().push_back(sf); GetSFuncManager().push_back(sf);
} }