Merge pull request #11232 from unknownbrackets/armips

Debugger: Update to latest armips
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2018-07-01 01:31:54 +02:00
commit 41e8854476
3 files changed
+4 -3

No files matched your search

+1
View File
@@ -29,6 +29,7 @@
#endif
#include <algorithm>
#include <memory>
#include "util/text/utf8.h"
#include "zlib.h"
+2 -2
View File
@@ -3,6 +3,7 @@
#endif
#include <cstdarg>
#include <cstring>
#include <memory>
#include <vector>
#include "Common/CommonTypes.h"
@@ -66,7 +67,6 @@ private:
bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
{
PspAssemblerFile file;
StringList errors;
wchar_t str[64];
@@ -76,7 +76,7 @@ bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
args.mode = ArmipsMode::MEMORY;
args.content = str + ConvertUTF8ToWString(line);
args.silent = true;
args.memoryFile = &file;
args.memoryFile.reset(new PspAssemblerFile());
args.errorsResult = &errors;
if (g_symbolMap) {