Avoid unnecessarily initializing disassembler

wheremyfoodat · Apr 28, 2024 · f77c972 · f77c972
1 parent 5161ef8
commit f77c972
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/include/capstone.hpp b/include/capstone.hpp
@@ -14,6 +14,7 @@ namespace Common {
 		bool initialized = false;
 
 	  public:
+		bool isInitialized() { return initialized; }
 		void init(cs_arch arch, cs_mode mode) { initialized = (cs_open(arch, mode, &handle) == CS_ERR_OK); }
 
 		CapstoneDisassembler() {}

diff --git a/src/lua.cpp b/src/lua.cpp
@@ -209,7 +209,11 @@ static int getButtonThunk(lua_State* L) {
 }
 
 static int disassembleARMThunk(lua_State* L) {
-	static Common::CapstoneDisassembler disassembler(CS_ARCH_ARM, CS_MODE_ARM);
+	static Common::CapstoneDisassembler disassembler;
+	// We want the disassembler to only be fully initialized when this function is first used
+	if (!disassembler.isInitialized()) {
+		disassembler.init(CS_ARCH_ARM, CS_MODE_ARM);
+	}
 
 	const u32 pc = u32(lua_tonumber(L, 1));
 	const u32 instruction = u32(lua_tonumber(L, 2));