From 8ae157e27fdf30165f657db238a89d08363305bc Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Fri, 29 Jun 2018 22:19:23 -0700
Subject: [PATCH] Debugger: Update to latest armips.

---
 Core/Debugger/SymbolMap.cpp | 1 +
 Core/MIPS/MIPSAsm.cpp       | 4 ++--
 ext/armips                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp
index b369c014ce..5786898624 100644
--- a/Core/Debugger/SymbolMap.cpp
+++ b/Core/Debugger/SymbolMap.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #include <algorithm>
+#include <memory>
 
 #include "util/text/utf8.h"
 #include "zlib.h"
diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp
index 6265db2390..08965b4fc2 100644
--- a/Core/MIPS/MIPSAsm.cpp
+++ b/Core/MIPS/MIPSAsm.cpp
@@ -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) {
diff --git a/ext/armips b/ext/armips
index 3a55cf3600..9efe336728 160000
--- a/ext/armips
+++ b/ext/armips
@@ -1 +1 @@
-Subproject commit 3a55cf3600d6f328ae0897699ac06818af2905a4
+Subproject commit 9efe3367284d2d1eeb14fc302a2c12c36e3e255e