Remove a NO_ARMIPS option

Author: hrydgard

CMakeLists.txt

@@ -193,7 +193,6 @@ option(USE_LIBNX "Set to ON to build for Switch(libnx)" OFF)
 option(USE_FFMPEG "Build with FFMPEG support" ON)
 option(USE_DISCORD "Build with Discord support" ON)
 option(USE_MINIUPNPC "Build with miniUPnPc support" ON)
-option(USE_ARMIPS "Build with armips support in API/debuggerdebugger" ON)
 option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY})
 option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
 option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP})
@@ -2475,11 +2474,7 @@ if(ANDROID)
 	endif()
 endif()
 
-if(USE_ARMIPS)
-	set(CoreExtraLibs ${CoreExtraLibs} armips)
-else()
-	add_compile_definitions(NO_ARMIPS=1)
-endif()
+set(CoreExtraLibs ${CoreExtraLibs} armips)
 
 # needed for VK_USE_PLATFORM_XCB_KHR only
 #if(VULKAN AND NOT WIN32)

Core/Debugger/SymbolMap.cpp

@@ -31,9 +31,7 @@
 
 #include <algorithm>
 #include <memory>
-#ifndef NO_ARMIPS
 #include <string_view>
-#endif
 #include <unordered_map>
 
 #include "zlib.h"
@@ -46,20 +44,7 @@
 #include "Core/MemMap.h"
 #include "Core/Config.h"
 #include "Core/Debugger/SymbolMap.h"
-
-#ifndef NO_ARMIPS
 #include "ext/armips/Core/Assembler.h"
-#else
-struct Identifier {
-	explicit Identifier() {}
-	explicit Identifier(const std::string &s) {}
-};
-
-struct LabelDefinition {
-	Identifier name;
-	int64_t value;
-};
-#endif
 
 SymbolMap *g_symbolMap;
 

Core/MIPS/MIPSAsm.cpp

@@ -1,17 +1,12 @@
 #include <cstdarg>
 #include <cstring>
 #include <memory>
-#ifndef NO_ARMIPS
 #include <string_view>
-#endif
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#ifndef NO_ARMIPS
 #include "ext/armips/Core/Assembler.h"
 #include "ext/armips/Core/FileManager.h"
-#endif
-
 #include "Core/Debugger/SymbolMap.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/MIPS/MIPSAsm.h"
@@ -25,7 +20,6 @@ std::string GetAssembleError()
 	return errorText;
 }
 
-#ifndef NO_ARMIPS
 class PspAssemblerFile: public AssemblerFile
 {
 public:
@@ -96,11 +90,5 @@ bool MipsAssembleOpcode(const char *line, DebugInterface *cpu, u32 address) {
 
 	return true;
 }
-#else
-bool MipsAssembleOpcode(const char *line, DebugInterface *cpu, u32 address) {
-	errorText = "Built without armips, cannot assemble";
-	return false;
-}
-#endif
 
 }  // namespace