piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

DSPTool: Factor out assembly file retrieval

Browse Source 
Keeps the retrieval behavior isolated and lessens the amount of
variables within PerformAssembly's scope.
This commit is contained in:
Lioncash 2018-06-22 16:32:53 -04:00
parent 77f6e50493
commit f62dffa9f0
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Source/DSPTool/DSPTool.cpp
View File

@ -2,7 +2,11 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/Common.h" #include <string>
#include <utility>
#include <vector>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/DSP/DSPCodeUtil.h" #include "Core/DSP/DSPCodeUtil.h"
@ -235,6 +239,23 @@ static bool PerformDisassembly(const std::string& input_name, const std::string&
return true; return true;
} }
static std::vector<std::string> GetAssemblerFiles(const std::string& source)
{
std::vector<std::string> files;
std::size_t last_pos = 0;
std::size_t pos = 0;
while ((pos = source.find('\n', last_pos)) != std::string::npos)
{
std::string temp = source.substr(last_pos, pos - last_pos);
if (!temp.empty())
files.push_back(std::move(temp));
last_pos = pos + 1;
}
return files;
}
static bool PerformAssembly(const std::string& input_name, const std::string& output_name, static bool PerformAssembly(const std::string& input_name, const std::string& output_name,
const std::string& output_header_name, bool multiple, bool force, const std::string& output_header_name, bool multiple, bool force,
bool output_size) bool output_size)
@ -250,34 +271,23 @@ static bool PerformAssembly(const std::string& input_name, const std::string& ou
{ {
if (multiple) if (multiple)
{ {
source.append("\n");
// When specifying a list of files we must compile a header // When specifying a list of files we must compile a header
// (we can't assemble multiple files to one binary) // (we can't assemble multiple files to one binary)
// since we checked it before, we assume output_header_name isn't empty // since we checked it before, we assume output_header_name isn't empty
int lines; std::string header;
std::vector<u16>* codes; std::string currentSource;
std::vector<std::string> files; const std::vector<std::string> files = GetAssemblerFiles(source);
std::string header, currentSource;
size_t lastPos = 0, pos = 0;
source.append("\n");
while ((pos = source.find('\n', lastPos)) != std::string::npos)
{
std::string temp = source.substr(lastPos, pos - lastPos);
if (!temp.empty())
files.push_back(temp);
lastPos = pos + 1;
}
lines = (int)files.size();
int lines = static_cast<int>(files.size());
if (lines == 0) if (lines == 0)
{ {
printf("ERROR: Must specify at least one file\n"); printf("ERROR: Must specify at least one file\n");
return false; return false;
} }
codes = new std::vector<u16>[lines]; std::vector<u16>* codes = new std::vector<u16>[lines];
for (int i = 0; i < lines; i++) for (int i = 0; i < lines; i++)
{ {