ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9360 from Minty-Meeo/osreport-split 

Split OSREPORT logging type
This commit is contained in:
Léo Lam 2020-12-26 11:41:18 +01:00 committed by GitHub
parent 6ddf69d094 b430d66cdc
commit d2f9991b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Logging/Log.h
View File

@ -52,6 +52,7 @@ enum LOG_TYPE
NETPLAY, NETPLAY,
OSHLE, OSHLE,
OSREPORT, OSREPORT,
OSREPORT_HLE,
PAD, PAD,
PIXELENGINE, PIXELENGINE,
PROCESSORINTERFACE, PROCESSORINTERFACE,

3
Source/Core/Common/Logging/LogManager.cpp
View File

@ -154,7 +154,8 @@ LogManager::LogManager()
m_log[MEMMAP] = {"MI", "Memory Interface & Memory Map"}; m_log[MEMMAP] = {"MI", "Memory Interface & Memory Map"};
m_log[NETPLAY] = {"NETPLAY", "Netplay"}; m_log[NETPLAY] = {"NETPLAY", "Netplay"};
m_log[OSHLE] = {"HLE", "OSHLE"}; m_log[OSHLE] = {"HLE", "OSHLE"};
m_log[OSREPORT] = {"OSREPORT", "OSReport"}; m_log[OSREPORT] = {"OSREPORT", "OSReport EXI"};
m_log[OSREPORT_HLE] = {"OSREPORT_HLE", "OSReport HLE"};
m_log[PAD] = {"PAD", "Pad"}; m_log[PAD] = {"PAD", "Pad"};
m_log[PIXELENGINE] = {"PE", "Pixel Engine"}; m_log[PIXELENGINE] = {"PE", "Pixel Engine"};
m_log[PROCESSORINTERFACE] = {"PI", "Processor Interface"}; m_log[PROCESSORINTERFACE] = {"PI", "Processor Interface"};

16
Source/Core/Core/HLE/HLE_OS.cpp
View File

@ -38,7 +38,7 @@ void HLE_OSPanic()
StringPopBackIf(&msg, '\n'); StringPopBackIf(&msg, '\n');
PanicAlertFmt("OSPanic: {}: {}", error, msg); PanicAlertFmt("OSPanic: {}: {}", error, msg);
ERROR_LOG_FMT(OSREPORT, "{:08x}->{:08x}| OSPanic: {}: {}", LR, PC, error, msg); ERROR_LOG_FMT(OSREPORT_HLE, "{:08x}->{:08x}| OSPanic: {}: {}", LR, PC, error, msg);
NPC = LR; NPC = LR;
} }
@ -82,7 +82,7 @@ void HLE_GeneralDebugPrint(ParameterType parameter_type)
NPC = LR; NPC = LR;
NOTICE_LOG_FMT(OSREPORT, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message)); NOTICE_LOG_FMT(OSREPORT_HLE, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message));
} }
// Generalized function for printing formatted string using parameter list. // Generalized function for printing formatted string using parameter list.
@ -105,22 +105,22 @@ void HLE_write_console()
{ {
const u32 size = PowerPC::Read_U32(GPR(5)); const u32 size = PowerPC::Read_U32(GPR(5));
if (size > report_message.size()) if (size > report_message.size())
WARN_LOG_FMT(OSREPORT, "__write_console uses an invalid size of {:#010x}", size); WARN_LOG_FMT(OSREPORT_HLE, "__write_console uses an invalid size of {:#010x}", size);
else if (size == 0) else if (size == 0)
WARN_LOG_FMT(OSREPORT, "__write_console uses a size of zero"); WARN_LOG_FMT(OSREPORT_HLE, "__write_console uses a size of zero");
else else
report_message = report_message.substr(0, size); report_message = report_message.substr(0, size);
} }
else else
{ {
ERROR_LOG_FMT(OSREPORT, "__write_console uses an unreachable size pointer"); ERROR_LOG_FMT(OSREPORT_HLE, "__write_console uses an unreachable size pointer");
} }
StringPopBackIf(&report_message, '\n'); StringPopBackIf(&report_message, '\n');
NPC = LR; NPC = LR;
NOTICE_LOG_FMT(OSREPORT, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message)); NOTICE_LOG_FMT(OSREPORT_HLE, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message));
} }
// Log (v)dprintf message if fd is 1 (stdout) or 2 (stderr) // Log (v)dprintf message if fd is 1 (stdout) or 2 (stderr)
@ -133,7 +133,7 @@ void HLE_LogDPrint(ParameterType parameter_type)
std::string report_message = GetStringVA(4, parameter_type); std::string report_message = GetStringVA(4, parameter_type);
StringPopBackIf(&report_message, '\n'); StringPopBackIf(&report_message, '\n');
NOTICE_LOG_FMT(OSREPORT, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message)); NOTICE_LOG_FMT(OSREPORT_HLE, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message));
} }
// Log dprintf message // Log dprintf message
@ -173,7 +173,7 @@ void HLE_LogFPrint(ParameterType parameter_type)
std::string report_message = GetStringVA(4, parameter_type); std::string report_message = GetStringVA(4, parameter_type);
StringPopBackIf(&report_message, '\n'); StringPopBackIf(&report_message, '\n');
NOTICE_LOG_FMT(OSREPORT, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message)); NOTICE_LOG_FMT(OSREPORT_HLE, "{:08x}->{:08x}| {}", LR, PC, SHIFTJISToUTF8(report_message));
} }
// Log fprintf message // Log fprintf message