summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-15 06:23:45 +0200
committerLioncash <mathew1800@gmail.com>2018-08-15 07:05:50 +0200
commite0b0f4eece7e9ef5b4223056d622c5ce13836151 (patch)
treeda08d7f7464171dd8ab33759372c0fc62f2611fe /src/core/hle
parentMerge pull request #1067 from lioncash/init (diff)
downloadyuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.tar
yuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.tar.gz
yuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.tar.bz2
yuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.tar.lz
yuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.tar.xz
yuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.tar.zst
yuzu-e0b0f4eece7e9ef5b4223056d622c5ce13836151.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/lm/lm.cpp20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp
index 2e99ddf51..7d054fc43 100644
--- a/src/core/hle/service/lm/lm.cpp
+++ b/src/core/hle/service/lm/lm.cpp
@@ -92,7 +92,11 @@ private:
// Parse out log metadata
u32 line{};
- std::string message, filename, function;
+ std::string module;
+ std::string message;
+ std::string filename;
+ std::string function;
+ std::string thread;
while (addr < end_addr) {
const Field field{static_cast<Field>(Memory::Read8(addr++))};
const size_t length{Memory::Read8(addr++)};
@@ -102,6 +106,8 @@ private:
}
switch (field) {
+ case Field::Skip:
+ break;
case Field::Message:
message = Memory::ReadCString(addr, length);
break;
@@ -114,6 +120,12 @@ private:
case Field::Function:
function = Memory::ReadCString(addr, length);
break;
+ case Field::Module:
+ module = Memory::ReadCString(addr, length);
+ break;
+ case Field::Thread:
+ thread = Memory::ReadCString(addr, length);
+ break;
}
addr += length;
@@ -128,12 +140,18 @@ private:
if (!filename.empty()) {
log_stream << filename << ':';
}
+ if (!module.empty()) {
+ log_stream << module << ':';
+ }
if (!function.empty()) {
log_stream << function << ':';
}
if (line) {
log_stream << std::to_string(line) << ':';
}
+ if (!thread.empty()) {
+ log_stream << thread << ':';
+ }
if (log_stream.str().length() > 0 && log_stream.str().back() == ':') {
log_stream << ' ';
}