summaryrefslogtreecommitdiff
path: root/Source/DSPTool/DSPTool.cpp
diff options
context:
space:
mode:
authorLéo Lam <leolino.lam@gmail.com>2018-03-26 12:46:16 +0200
committerGitHub <noreply@github.com>2018-03-26 12:46:16 +0200
commiteb489c0a5ecc077f6c59d3bf10bd112981e95445 (patch)
tree1c2ae0545826b57799b41ff6da56c52a13f1e885 /Source/DSPTool/DSPTool.cpp
parent3272fda3ee277fe625c7d470b687dd947df63fd6 (diff)
parent0f256276144f456ecc492363a44f444e3a6eeac4 (diff)
Merge pull request #6529 from lioncash/utils
DSPCodeUtil: Don't return data via an out parameter
Diffstat (limited to 'Source/DSPTool/DSPTool.cpp')
-rw-r--r--Source/DSPTool/DSPTool.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/DSPTool/DSPTool.cpp b/Source/DSPTool/DSPTool.cpp
index 505750cd7a..93bd019623 100644
--- a/Source/DSPTool/DSPTool.cpp
+++ b/Source/DSPTool/DSPTool.cpp
@@ -212,24 +212,25 @@ int main(int argc, const char* argv[])
{
// Two binary inputs, let's diff.
std::string binary_code;
- std::vector<u16> code1, code2;
+
File::ReadFileToString(input_name, binary_code);
- DSP::BinaryStringBEToCode(binary_code, code1);
+ const std::vector<u16> code1 = DSP::BinaryStringBEToCode(binary_code);
+
File::ReadFileToString(output_name, binary_code);
- DSP::BinaryStringBEToCode(binary_code, code2);
+ const std::vector<u16> code2 = DSP::BinaryStringBEToCode(binary_code);
+
DSP::Compare(code1, code2);
return 0;
}
if (print_results)
{
- std::string dumpfile, results;
- std::vector<u16> reg_vector;
+ std::string dumpfile;
File::ReadFileToString(input_name, dumpfile);
- DSP::BinaryStringBEToCode(dumpfile, reg_vector);
+ const std::vector<u16> reg_vector = DSP::BinaryStringBEToCode(dumpfile);
- results.append("Start:\n");
+ std::string results("Start:\n");
for (int initial_reg = 0; initial_reg < 32; initial_reg++)
{
results.append(StringFromFormat("%02x %04x ", initial_reg, reg_vector.at(initial_reg)));
@@ -314,9 +315,8 @@ int main(int argc, const char* argv[])
return 1;
}
std::string binary_code;
- std::vector<u16> code;
File::ReadFileToString(input_name, binary_code);
- DSP::BinaryStringBEToCode(binary_code, code);
+ const std::vector<u16> code = DSP::BinaryStringBEToCode(binary_code);
std::string text;
DSP::Disassemble(code, true, text);
if (!output_name.empty())
@@ -408,8 +408,7 @@ int main(int argc, const char* argv[])
if (!output_name.empty())
{
- std::string binary_code;
- DSP::CodeToBinaryStringBE(code, binary_code);
+ const std::string binary_code = DSP::CodeToBinaryStringBE(code);
File::WriteStringToFile(binary_code, output_name);
}
if (!output_header_name.empty())