summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-06-22 13:26:56 -0400
committerGravatar GitHub2019-06-22 13:26:56 -0400
commit221996a19402dd53affa99f45bc888a248d3412f (patch)
tree939958aad440377cafd59ee4b61b264d44fecd9e /src
parentMerge pull request #2579 from ReinUsesLisp/fix-aoffi-test (diff)
parentUpdate reporter.cpp (diff)
downloadyuzu-221996a19402dd53affa99f45bc888a248d3412f.tar.gz
yuzu-221996a19402dd53affa99f45bc888a248d3412f.tar.xz
yuzu-221996a19402dd53affa99f45bc888a248d3412f.zip
Merge pull request #2603 from WamWooWam/master
HexVectorToString -> HexToString
Diffstat (limited to 'src')
-rw-r--r--src/core/reporter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp
index 8fe621aa0..774022569 100644
--- a/src/core/reporter.cpp
+++ b/src/core/reporter.cpp
@@ -147,7 +147,7 @@ json GetHLEBufferDescriptorData(const std::vector<DescriptorType>& buffer) {
147 if constexpr (read_value) { 147 if constexpr (read_value) {
148 std::vector<u8> data(desc.Size()); 148 std::vector<u8> data(desc.Size());
149 Memory::ReadBlock(desc.Address(), data.data(), desc.Size()); 149 Memory::ReadBlock(desc.Address(), data.data(), desc.Size());
150 entry["data"] = Common::HexVectorToString(data); 150 entry["data"] = Common::HexToString(data);
151 } 151 }
152 152
153 buffer_out.push_back(std::move(entry)); 153 buffer_out.push_back(std::move(entry));
@@ -227,7 +227,7 @@ void Reporter::SaveSvcBreakReport(u32 type, bool signal_debugger, u64 info1, u64
227 }; 227 };
228 228
229 if (resolved_buffer.has_value()) { 229 if (resolved_buffer.has_value()) {
230 break_out["debug_buffer"] = Common::HexVectorToString(*resolved_buffer); 230 break_out["debug_buffer"] = Common::HexToString(*resolved_buffer);
231 } 231 }
232 232
233 out["svc_break"] = std::move(break_out); 233 out["svc_break"] = std::move(break_out);
@@ -277,12 +277,12 @@ void Reporter::SaveUnimplementedAppletReport(
277 277
278 auto normal_out = json::array(); 278 auto normal_out = json::array();
279 for (const auto& data : normal_channel) { 279 for (const auto& data : normal_channel) {
280 normal_out.push_back(Common::HexVectorToString(data)); 280 normal_out.push_back(Common::HexToString(data));
281 } 281 }
282 282
283 auto interactive_out = json::array(); 283 auto interactive_out = json::array();
284 for (const auto& data : interactive_channel) { 284 for (const auto& data : interactive_channel) {
285 interactive_out.push_back(Common::HexVectorToString(data)); 285 interactive_out.push_back(Common::HexToString(data));
286 } 286 }
287 287
288 out["applet_normal_data"] = std::move(normal_out); 288 out["applet_normal_data"] = std::move(normal_out);
@@ -304,7 +304,7 @@ void Reporter::SavePlayReport(u64 title_id, u64 process_id, std::vector<std::vec
304 304
305 auto data_out = json::array(); 305 auto data_out = json::array();
306 for (const auto& d : data) { 306 for (const auto& d : data) {
307 data_out.push_back(Common::HexVectorToString(d)); 307 data_out.push_back(Common::HexToString(d));
308 } 308 }
309 309
310 out["play_report_process_id"] = fmt::format("{:016X}", process_id); 310 out["play_report_process_id"] = fmt::format("{:016X}", process_id);