summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-18 10:57:41 -0500
committerGravatar GitHub2018-01-18 10:57:41 -0500
commitb5bc94bce0c8d8169a14ffdc9f51b02f90d76a4e (patch)
tree60601cce55501968a9d6184b6c3272b4304e5238
parentMerge pull request #84 from lioncash/cmake (diff)
parentlm: Minor logging fix to skip a byte. (diff)
downloadyuzu-b5bc94bce0c8d8169a14ffdc9f51b02f90d76a4e.tar.gz
yuzu-b5bc94bce0c8d8169a14ffdc9f51b02f90d76a4e.tar.xz
yuzu-b5bc94bce0c8d8169a14ffdc9f51b02f90d76a4e.zip
Merge pull request #95 from bunnei/lm-skip-byte
lm: Minor logging fix to skip a byte.
-rw-r--r--src/core/hle/service/lm/lm.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp
index 2d0d2fb65..13c9ee3d3 100644
--- a/src/core/hle/service/lm/lm.cpp
+++ b/src/core/hle/service/lm/lm.cpp
@@ -47,6 +47,7 @@ private:
47 47
48 /// Log field type 48 /// Log field type
49 enum class Field : u8 { 49 enum class Field : u8 {
50 Skip = 1,
50 Message = 2, 51 Message = 2,
51 Line = 3, 52 Line = 3,
52 Filename = 4, 53 Filename = 4,
@@ -85,6 +86,11 @@ private:
85 while (addr < end_addr) { 86 while (addr < end_addr) {
86 const Field field{static_cast<Field>(Memory::Read8(addr++))}; 87 const Field field{static_cast<Field>(Memory::Read8(addr++))};
87 size_t length{Memory::Read8(addr++)}; 88 size_t length{Memory::Read8(addr++)};
89
90 if (static_cast<Field>(Memory::Read8(addr)) == Field::Skip) {
91 ++addr;
92 }
93
88 switch (field) { 94 switch (field) {
89 case Field::Message: 95 case Field::Message:
90 message = Memory::ReadCString(addr, length); 96 message = Memory::ReadCString(addr, length);
@@ -99,6 +105,7 @@ private:
99 function = Memory::ReadCString(addr, length); 105 function = Memory::ReadCString(addr, length);
100 break; 106 break;
101 } 107 }
108
102 addr += length; 109 addr += length;
103 } 110 }
104 111