octo/yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2603 from WamWooWam/master

Browse Source 
HexVectorToString -> HexToString
This commit is contained in:
Zach Hilman
2019-06-22 13:26:56 -04:00
committed by GitHub
parent a9f3c54871 334e6370f9
commit 221996a194
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/reporter.cpp
View File

@@ -147,7 +147,7 @@ json GetHLEBufferDescriptorData(const std::vector<DescriptorType>& buffer) {
if constexpr (read_value) { if constexpr (read_value) {
std::vector<u8> data(desc.Size()); std::vector<u8> data(desc.Size());
Memory::ReadBlock(desc.Address(), data.data(), desc.Size()); Memory::ReadBlock(desc.Address(), data.data(), desc.Size());
entry["data"] = Common::HexVectorToString(data); entry["data"] = Common::HexToString(data);
} }
buffer_out.push_back(std::move(entry)); buffer_out.push_back(std::move(entry));
@@ -227,7 +227,7 @@ void Reporter::SaveSvcBreakReport(u32 type, bool signal_debugger, u64 info1, u64
}; };
if (resolved_buffer.has_value()) { if (resolved_buffer.has_value()) {
break_out["debug_buffer"] = Common::HexVectorToString(*resolved_buffer); break_out["debug_buffer"] = Common::HexToString(*resolved_buffer);
} }
out["svc_break"] = std::move(break_out); out["svc_break"] = std::move(break_out);
@@ -277,12 +277,12 @@ void Reporter::SaveUnimplementedAppletReport(
auto normal_out = json::array(); auto normal_out = json::array();
for (const auto& data : normal_channel) { for (const auto& data : normal_channel) {
normal_out.push_back(Common::HexVectorToString(data)); normal_out.push_back(Common::HexToString(data));
} }
auto interactive_out = json::array(); auto interactive_out = json::array();
for (const auto& data : interactive_channel) { for (const auto& data : interactive_channel) {
interactive_out.push_back(Common::HexVectorToString(data)); interactive_out.push_back(Common::HexToString(data));
} }
out["applet_normal_data"] = std::move(normal_out); 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
auto data_out = json::array(); auto data_out = json::array();
for (const auto& d : data) { for (const auto& d : data) {
data_out.push_back(Common::HexVectorToString(d)); data_out.push_back(Common::HexToString(d));
} }
out["play_report_process_id"] = fmt::format("{:016X}", process_id); out["play_report_process_id"] = fmt::format("{:016X}", process_id);