diff options
| author | nakeee <nakeee@gmail.com> | 2009-06-17 21:44:03 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-06-17 21:44:03 +0000 |
| commit | 697ce7b1ab2ffc5f1bf18bf9bfc37462fcb38183 (patch) | |
| tree | 3e97c6b6c348b24749575bf7888d692814f5a12c /Source/Core/DSPCore | |
| parent | ff83f9eb714268d3b6437005a46d598bbd95c9bd (diff) | |
createtest fixes and compile fixes for linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3482 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore')
| -rw-r--r-- | Source/Core/DSPCore/Src/DSPCodeUtil.cpp | 11 | ||||
| -rw-r--r-- | Source/Core/DSPCore/Src/DSPCodeUtil.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/DSPCore/Src/DSPCodeUtil.cpp b/Source/Core/DSPCore/Src/DSPCodeUtil.cpp index fda14e29f8..e41866e414 100644 --- a/Source/Core/DSPCore/Src/DSPCodeUtil.cpp +++ b/Source/Core/DSPCore/Src/DSPCodeUtil.cpp @@ -68,7 +68,7 @@ bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2) {
if (code1.size() != code2.size())
printf("Size difference! 1=%i 2=%i\n", (int)code1.size(), (int)code2.size());
- int count_equal = 0;
+ u32 count_equal = 0;
const int min_size = (int)std::min(code1.size(), code2.size());
AssemblerSettings settings;
@@ -135,7 +135,7 @@ void CodeToHeader(const std::vector<u16> &code, std::string _filename, header.append("#endif\n\n");
header.append("\t{\n\t\t");
- for (int j = 0; j < code.size(); j++)
+ for (u32 j = 0; j < code.size(); j++)
{
if (j && ((j & 15) == 0))
header.append("\n\t\t");
@@ -147,7 +147,7 @@ void CodeToHeader(const std::vector<u16> &code, std::string _filename, header.append("};\n");
}
-void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> filenames,
+void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string>* filenames,
int numCodes, const char *name, std::string &header)
{
char buffer[1024];
@@ -164,7 +164,8 @@ void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> for (int i = 0; i < numCodes; i++)
{
std::string filename;
- SplitPath(filenames.at(i), NULL, &filename, NULL);
+ SplitPath(filenames->at(i), NULL, &filename, NULL);
+ // printf("files %s\n", (filenames->at(i).c_str()));
sprintf(buffer, "%s\t\"%s\",\n", buffer, filename.c_str());
}
sprintf(buffer, "%s};\n\n", buffer);
@@ -187,7 +188,7 @@ void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> code_copy.push_back(0);
header.append("\t{\n\t\t");
- for (int j = 0; j < codes[i].size(); j++)
+ for (u32 j = 0; j < codes[i].size(); j++)
{
if (j && ((j & 15) == 0))
header.append("\n\t\t");
diff --git a/Source/Core/DSPCore/Src/DSPCodeUtil.h b/Source/Core/DSPCore/Src/DSPCodeUtil.h index 9652a93b28..3d204e359e 100644 --- a/Source/Core/DSPCore/Src/DSPCodeUtil.h +++ b/Source/Core/DSPCore/Src/DSPCodeUtil.h @@ -29,7 +29,7 @@ bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2); void GenRandomCode(int size, std::vector<u16> &code);
void CodeToHeader(const std::vector<u16> &code, std::string _filename,
const char *name, std::string &header);
-void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> filenames,
+void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> *filenames,
int numCodes, const char *name, std::string &header);
// Big-endian, for writing straight to file using File::WriteStringToFile.
|