dahjah/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-06-05 22:24:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Logging: Add compile-time format checks (#1885)

Browse Source
This commit is contained in:
SSimco 2026-04-22 16:51:44 +03:00 committed by GitHub
parent f8fb588b36
commit 6f6c1299e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cafe/OS/libs/padscore/padscore.cpp
View File

@ -170,7 +170,7 @@ void padscoreExport_WPADRead(PPCInterpreter_t* hCPU)
{ {
ppcDefineParamU32(channel, 0); ppcDefineParamU32(channel, 0);
ppcDefineParamPtr(wpadStatus, WPADStatus_t, 1); ppcDefineParamPtr(wpadStatus, WPADStatus_t, 1);
cemuLog_log(LogType::InputAPI, "WPADRead({}, {:x})", channel, fmt::ptr(wpadStatus)); cemuLog_log(LogType::InputAPI, "WPADRead({}, {:x})", channel, memory_getVirtualOffsetFromPointer(wpadStatus));
if (channel < InputManager::kMaxWPADControllers) if (channel < InputManager::kMaxWPADControllers)
{ {
@ -224,7 +224,7 @@ void padscoreExport_WPADGetInfo(PPCInterpreter_t* hCPU)
{ {
ppcDefineParamU32(channel, 0); ppcDefineParamU32(channel, 0);
ppcDefineParamStructPtr(wpadInfo, WPADInfo_t, 1); ppcDefineParamStructPtr(wpadInfo, WPADInfo_t, 1);
cemuLog_log(LogType::InputAPI, "WPADGetInfo({}, 0x{:08x})", channel, fmt::ptr(wpadInfo)); cemuLog_log(LogType::InputAPI, "WPADGetInfo({}, 0x{:08x})", channel, memory_getVirtualOffsetFromPointer(wpadInfo));
if (channel < InputManager::kMaxWPADControllers) if (channel < InputManager::kMaxWPADControllers)
{ {

44
src/Cemu/Logging/CemuLogging.h
View File

@ -78,43 +78,22 @@ bool cemuLog_log(LogType type, std::string_view text);
bool cemuLog_log(LogType type, std::u8string_view text); bool cemuLog_log(LogType type, std::u8string_view text);
void cemuLog_waitForFlush(); // wait until all log lines are written void cemuLog_waitForFlush(); // wait until all log lines are written
template<typename T, typename ... TArgs> template<typename... TArgs>
bool cemuLog_log(LogType type, std::basic_string<T> formatStr, TArgs&&... args) bool cemuLog_log(LogType type, fmt::format_string<TArgs...> formatStr, TArgs&&... args)
{ {
if (!cemuLog_isLoggingEnabled(type)) if (!cemuLog_isLoggingEnabled(type))
return false; return false;
if constexpr (sizeof...(TArgs) == 0)
{
cemuLog_log(type, std::basic_string_view<T>(formatStr.data(), formatStr.size()));
return true;
}
else
{
const auto format_view = fmt::basic_string_view<T>(formatStr);
#if FMT_VERSION >= 110000
const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffered_context<T>>(args...));
#else
const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffer_context<T>>(args...));
#endif
cemuLog_log(type, std::basic_string_view(text.data(), text.size()));
}
return true;
}
template<typename T, typename ... TArgs> cemuLog_log(type, fmt::format(formatStr, std::forward<TArgs>(args)...));
bool cemuLog_log(LogType type, const T* format, TArgs&&... args)
{ return true;
if (!cemuLog_isLoggingEnabled(type))
return false;
auto format_str = std::basic_string<T>(format);
return cemuLog_log(type, format_str, std::forward<TArgs>(args)...);
} }
#define cemuLog_logOnce(...) { static bool _not_first_call = false; if (!_not_first_call) { _not_first_call = true; cemuLog_log(__VA_ARGS__); } } #define cemuLog_logOnce(...) { static bool _not_first_call = false; if (!_not_first_call) { _not_first_call = true; cemuLog_log(__VA_ARGS__); } }
// same as cemuLog_log, but only outputs in debug mode // same as cemuLog_log, but only outputs in debug mode
template<typename TFmt, typename ... TArgs> template<typename ... TArgs>
bool cemuLog_logDebug(LogType type, TFmt format, TArgs&&... args) bool cemuLog_logDebug(LogType type, fmt::format_string<TArgs...> format, TArgs&&... args)
{ {
#ifdef CEMU_DEBUG_ASSERT #ifdef CEMU_DEBUG_ASSERT
return cemuLog_log(type, format, std::forward<TArgs>(args)...); return cemuLog_log(type, format, std::forward<TArgs>(args)...);
@ -123,6 +102,15 @@ bool cemuLog_logDebug(LogType type, TFmt format, TArgs&&... args)
#endif #endif
} }
inline bool cemuLog_logDebug(LogType type, std::string_view message)
{
#ifdef CEMU_DEBUG_ASSERT
return cemuLog_log(type, message);
#else
return false;
#endif
}
#define cemuLog_logDebugOnce(...) { static bool _not_first_call = false; if (!_not_first_call) { _not_first_call = true; cemuLog_logDebug(__VA_ARGS__); } } #define cemuLog_logDebugOnce(...) { static bool _not_first_call = false; if (!_not_first_call) { _not_first_call = true; cemuLog_logDebug(__VA_ARGS__); } }
// utility function for logging binary data as a hex dump // utility function for logging binary data as a hex dump