mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 22:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for SysCallBase

Browse Source
This commit is contained in:
Nekotekina 2014-07-21 18:49:56 +04:00
parent 640de81571
commit 0865fca90a
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
rpcs3/Emu/SysCalls/SysCalls.h
View File

@ -64,62 +64,65 @@ public:
const std::string& GetName() const { return m_module_name; } const std::string& GetName() const { return m_module_name; }
void Log(const u32 id, std::string fmt, ...) bool IsLogging()
{ {
if(Ini.HLELogging.GetValue()) return Ini.HLELogging.GetValue();
}
template<typename... Targs> void Notice(const u32 id, const char* fmt, Targs... args)
{
LOG_NOTICE(HLE, GetName() + fmt::Format("[%d]: ", id) + fmt::Format(fmt, args...));
}
template<typename... Targs> void Notice(const char* fmt, Targs... args)
{
LOG_NOTICE(HLE, GetName() + ": " + fmt::Format(fmt, args...));
}
template<typename... Targs> __forceinline void Log(const char* fmt, Targs... args)
{
if (IsLogging())
{ {
va_list list; Notice(fmt, args...);
va_start(list, fmt);
LOG_NOTICE(HLE, GetName() + fmt::Format("[%d]: ", id) + fmt::FormatV(fmt, list));
va_end(list);
} }
} }
void Log(std::string fmt, ...) template<typename... Targs> __forceinline void Log(const u32 id, const char* fmt, Targs... args)
{ {
if(Ini.HLELogging.GetValue()) if (IsLogging())
{ {
va_list list; Notice(id, fmt, args...);
va_start(list, fmt);
LOG_NOTICE(HLE, GetName() + ": " + fmt::FormatV(fmt, list));
va_end(list);
} }
} }
void Warning(const u32 id, std::string fmt, ...) template<typename... Targs> void Warning(const u32 id, const char* fmt, Targs... args)
{ {
//#ifdef SYSCALLS_DEBUG LOG_WARNING(HLE, GetName() + fmt::Format("[%d] warning: ", id) + fmt::Format(fmt, args...));
va_list list;
va_start(list, fmt);
LOG_WARNING(HLE, GetName() + fmt::Format("[%d] warning: ", id) + fmt::FormatV(fmt, list));
va_end(list);
//#endif
} }
void Warning(std::string fmt, ...) template<typename... Targs> void Warning(const char* fmt, Targs... args)
{ {
//#ifdef SYSCALLS_DEBUG LOG_WARNING(HLE, GetName() + " warning: " + fmt::Format(fmt, args...));
va_list list;
va_start(list, fmt);
LOG_WARNING(HLE, GetName() + " warning: " + fmt::FormatV(fmt, list));
va_end(list);
//#endif
} }
void Error(const u32 id, std::string fmt, ...) template<typename... Targs> void Error(const u32 id, const char* fmt, Targs... args)
{ {
va_list list; LOG_ERROR(HLE, GetName() + fmt::Format("[%d] error: ", id) + fmt::Format(fmt, args...));
va_start(list, fmt);
LOG_ERROR(HLE, GetName() + fmt::Format("[%d] error: ", id) + fmt::FormatV(fmt, list));
va_end(list);
} }
void Error(std::string fmt, ...) template<typename... Targs> void Error(const char* fmt, Targs... args)
{ {
va_list list; LOG_ERROR(HLE, GetName() + " error: " + fmt::Format(fmt, args...));
va_start(list, fmt); }
LOG_ERROR(HLE, GetName() + " error: " + fmt::FormatV(fmt, list));
va_end(list); template<typename... Targs> void Todo(const u32 id, const char* fmt, Targs... args)
{
LOG_ERROR(HLE, GetName() + fmt::Format("[%d] TODO: ", id) + fmt::Format(fmt, args...));
}
template<typename... Targs> void Todo(const char* fmt, Targs... args)
{
LOG_ERROR(HLE, GetName() + " TODO: " + fmt::Format(fmt, args...));
} }
bool CheckId(u32 id) const bool CheckId(u32 id) const