From 3a09751e9ec8f0ba5ef2b20ddfc949fe1f59a66c Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Fri, 17 Aug 2018 15:21:28 -0500 Subject: [PATCH] Show full detail of log level. --- src/CxbxKrnl/Emu.cpp | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/CxbxKrnl/Emu.cpp b/src/CxbxKrnl/Emu.cpp index e9ffa475f..05a782f35 100644 --- a/src/CxbxKrnl/Emu.cpp +++ b/src/CxbxKrnl/Emu.cpp @@ -66,7 +66,13 @@ bool g_UncapFramerate = false; bool g_UseAllCores = false; bool g_SkipRdtscPatching = false; bool g_ScaleViewport = false; -bool g_DirectHostBackBufferAccess = false; +bool g_DirectHostBackBufferAccess = false; + +const char log_debug[] = "DEBUG: "; +const char log_info[] = "INFO : "; +const char log_warn[] = "WARN : "; +const char log_fatal[] = "FATAL: "; +const char log_unkwn[] = "???? : "; // Delta added to host SystemTime, used in xboxkrnl::KeQuerySystemTime and xboxkrnl::NtSetSystemTime LARGE_INTEGER HostSystemTimeDelta = {}; @@ -111,11 +117,30 @@ void NTAPI EmuLog(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, const char *szWarn LOG_CHECK_ENABLED(cxbxr_module, level) { if (g_bPrintfOn) { - va_list argp; + va_list argp; + const char* level_str; - LOG_THREAD_INIT; + LOG_THREAD_INIT; + + switch (level) { + default: + level_str = log_unkwn; + break; + case LOG_LEVEL::DEBUG: + level_str = log_debug; + break; + case LOG_LEVEL::INFO: + level_str = log_info; + break; + case LOG_LEVEL::WARNING: + level_str = log_warn; + break; + case LOG_LEVEL::FATAL: + level_str = log_fatal; + break; + } - std::cout << _logThreadPrefix << (level == LOG_LEVEL::WARNING ? "WARN: " : "") + std::cout << _logThreadPrefix << level_str << g_EnumModules2String[to_underlying(cxbxr_module)]; va_start(argp, szWarningMessage);