Simplify Guard API and reduce its use in CoreArrayProvider

.gitignore

@@ -82,9 +82,9 @@ plugins/
 rust/**/*.swp
 rust/**/*.rs.bk
 rust/target/
-rust/binaryninjacore-sys/target/
-rust/examples/*/target/
-rust/examples/dwarf/*/target/
+rust/**/*/target/
+rust/binaryninjacore-sys/Cargo.lock
+rust/Cargo.lock
 
 # Debugger docs
 docs/img/debugger

.gitmodules

@@ -16,6 +16,3 @@
 [submodule "arch/x86/mbuild"]
 	path = arch/x86/mbuild
 	url = https://github.com/intelxed/mbuild.git
-[submodule "rust/examples/pdb-ng/pdb-0.8.0-patched"]
-	path = rust/examples/pdb-ng/pdb-0.8.0-patched
-	url = https://github.com/Vector35/pdb-rs.git

architecture.cpp

@@ -462,7 +462,7 @@ BNFlagConditionForSemanticClass* Architecture::GetFlagConditionsForSemanticFlagG
 }
 
 
-void Architecture::FreeFlagConditionsForSemanticFlagGroupCallback(void*, BNFlagConditionForSemanticClass* conditions)
+void Architecture::FreeFlagConditionsForSemanticFlagGroupCallback(void*, BNFlagConditionForSemanticClass* conditions, size_t)
 {
 	delete[] conditions;
 }
@@ -515,7 +515,7 @@ size_t Architecture::GetSemanticFlagGroupLowLevelILCallback(void* ctxt, uint32_t
 }
 
 
-void Architecture::FreeRegisterListCallback(void*, uint32_t* regs)
+void Architecture::FreeRegisterListCallback(void*, uint32_t* regs, size_t)
 {
 	delete[] regs;
 }

binaryninjaapi.h

@@ -7743,7 +7743,7 @@ namespace BinaryNinja {
 		static BNFlagConditionForSemanticClass* GetFlagConditionsForSemanticFlagGroupCallback(
 		    void* ctxt, uint32_t semGroup, size_t* count);
 		static void FreeFlagConditionsForSemanticFlagGroupCallback(
-		    void* ctxt, BNFlagConditionForSemanticClass* conditions);
+		    void* ctxt, BNFlagConditionForSemanticClass* conditions, size_t count);
 		static uint32_t* GetFlagsWrittenByFlagWriteTypeCallback(void* ctxt, uint32_t writeType, size_t* count);
 		static uint32_t GetSemanticClassForFlagWriteTypeCallback(void* ctxt, uint32_t writeType);
 		static size_t GetFlagWriteLowLevelILCallback(void* ctxt, BNLowLevelILOperation op, size_t size,
@@ -7752,7 +7752,7 @@ namespace BinaryNinja {
 		static size_t GetFlagConditionLowLevelILCallback(
 		    void* ctxt, BNLowLevelILFlagCondition cond, uint32_t semClass, BNLowLevelILFunction* il);
 		static size_t GetSemanticFlagGroupLowLevelILCallback(void* ctxt, uint32_t semGroup, BNLowLevelILFunction* il);
-		static void FreeRegisterListCallback(void* ctxt, uint32_t* regs);
+		static void FreeRegisterListCallback(void* ctxt, uint32_t* regs, size_t len);
 		static void GetRegisterInfoCallback(void* ctxt, uint32_t reg, BNRegisterInfo* result);
 		static uint32_t GetStackPointerRegisterCallback(void* ctxt);
 		static uint32_t GetLinkRegisterCallback(void* ctxt);
@@ -14505,7 +14505,7 @@ namespace BinaryNinja {
 		static uint32_t* GetCalleeSavedRegistersCallback(void* ctxt, size_t* count);
 		static uint32_t* GetIntegerArgumentRegistersCallback(void* ctxt, size_t* count);
 		static uint32_t* GetFloatArgumentRegistersCallback(void* ctxt, size_t* count);
-		static void FreeRegisterListCallback(void* ctxt, uint32_t* regs);
+		static void FreeRegisterListCallback(void* ctxt, uint32_t* regs, size_t len);
 
 		static bool AreArgumentRegistersSharedIndexCallback(void* ctxt);
 		static bool AreArgumentRegistersUsedForVarArgsCallback(void* ctxt);

binaryninjacore.h

@@ -37,14 +37,14 @@
 // Current ABI version for linking to the core. This is incremented any time
 // there are changes to the API that affect linking, including new functions,
 // new types, or modifications to existing functions or types.
-#define BN_CURRENT_CORE_ABI_VERSION 71
+#define BN_CURRENT_CORE_ABI_VERSION 72
 
 // Minimum ABI version that is supported for loading of plugins. Plugins that
 // are linked to an ABI version less than this will not be able to load and
 // will require rebuilding. The minimum version is increased when there are
 // incompatible changes that break binary compatibility, such as changes to
 // existing types or functions.
-#define BN_MINIMUM_CORE_ABI_VERSION 71
+#define BN_MINIMUM_CORE_ABI_VERSION 72
 
 #ifdef __GNUC__
 	#ifdef BINARYNINJACORE_LIBRARY
@@ -1831,15 +1831,15 @@ extern "C"
 		uint32_t* (*getFlagsRequiredForSemanticFlagGroup)(void* ctxt, uint32_t semGroup, size_t* count);
 		BNFlagConditionForSemanticClass* (*getFlagConditionsForSemanticFlagGroup)(
 		    void* ctxt, uint32_t semGroup, size_t* count);
-		void (*freeFlagConditionsForSemanticFlagGroup)(void* ctxt, BNFlagConditionForSemanticClass* conditions);
+		void (*freeFlagConditionsForSemanticFlagGroup)(void* ctxt, BNFlagConditionForSemanticClass* conditions, size_t count);
 		uint32_t* (*getFlagsWrittenByFlagWriteType)(void* ctxt, uint32_t writeType, size_t* count);
 		uint32_t (*getSemanticClassForFlagWriteType)(void* ctxt, uint32_t writeType);
 		size_t (*getFlagWriteLowLevelIL)(void* ctxt, BNLowLevelILOperation op, size_t size, uint32_t flagWriteType,
 		    uint32_t flag, BNRegisterOrConstant* operands, size_t operandCount, BNLowLevelILFunction* il);
 		size_t (*getFlagConditionLowLevelIL)(
 		    void* ctxt, BNLowLevelILFlagCondition cond, uint32_t semClass, BNLowLevelILFunction* il);
 		size_t (*getSemanticFlagGroupLowLevelIL)(void* ctxt, uint32_t semGroup, BNLowLevelILFunction* il);
-		void (*freeRegisterList)(void* ctxt, uint32_t* regs);
+		void (*freeRegisterList)(void* ctxt, uint32_t* regs, size_t count);
 		void (*getRegisterInfo)(void* ctxt, uint32_t reg, BNRegisterInfo* result);
 		uint32_t (*getStackPointerRegister)(void* ctxt);
 		uint32_t (*getLinkRegister)(void* ctxt);
@@ -2518,7 +2518,7 @@ extern "C"
 		uint32_t* (*getCalleeSavedRegisters)(void* ctxt, size_t* count);
 		uint32_t* (*getIntegerArgumentRegisters)(void* ctxt, size_t* count);
 		uint32_t* (*getFloatArgumentRegisters)(void* ctxt, size_t* count);
-		void (*freeRegisterList)(void* ctxt, uint32_t* regs);
+		void (*freeRegisterList)(void* ctxt, uint32_t* regs, size_t len);
 
 		bool (*areArgumentRegistersSharedIndex)(void* ctxt);
 		bool (*isStackReservedForArgumentRegisters)(void* ctxt);

callingconvention.cpp

@@ -119,7 +119,7 @@ uint32_t* CallingConvention::GetFloatArgumentRegistersCallback(void* ctxt, size_
 }
 
 
-void CallingConvention::FreeRegisterListCallback(void*, uint32_t* regs)
+void CallingConvention::FreeRegisterListCallback(void*, uint32_t* regs, size_t)
 {
 	delete[] regs;
 }

cmake/FindRust.cmake

@@ -0,0 +1,28 @@
+# Try to find compatible Rust toolchain
+# Once done this will define
+#  RUST_FOUND - If a compatible toolchain was found
+#  RUST_CARGO_DIR - The path to the cargo executable
+#  RUST_CARGO - The path to the cargo executable
+#  RUST_VERSION - The toolchain version
+
+set(PATH_HINTS "$ENV{USERPROFILE}" "${HOME}")
+if(NOT RUST_CARGO_DIR)
+    set(RUST_CARGO_DIR "${USER_HOME}/.cargo")
+elseif()
+    message(STATUS "Using supplied rust cargo directory: ${RUST_CARGO_DIR}")
+endif()
+find_program(RUST_CARGO cargo HINTS ${RUST_CARGO_DIR} PATH_SUFFIXES "bin")
+
+set(RUST_FOUND FALSE CACHE INTERNAL "")
+
+if(RUST_CARGO)
+    set(RUST_FOUND TRUE CACHE INTERNAL "")
+    execute_process(COMMAND ${RUST_CARGO} --version OUTPUT_VARIABLE RUST_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(REGEX REPLACE "cargo ([^ ]+) .*" "\\1" RUST_VERSION "${RUST_VERSION}")
+endif()
+
+if(NOT RUST_FOUND)
+    message(FATAL_ERROR "Could NOT find Rust toolchain. Please configure with -RUST_CARGO_DIR=<path to cargo directory> or set the RUST_CARGO_DIR environment variable.")
+endif()
+
+message(STATUS "Found Rust: ${RUST_CARGO_DIR} (${RUST_VERSION})")

python/architecture.py

@@ -914,7 +914,7 @@ def _get_flag_conditions_for_semantic_flag_group(self, ctxt, sem_group, count):
 			count[0] = 0
 			return None
 
-	def _free_flag_conditions_for_semantic_flag_group(self, ctxt, conditions):
+	def _free_flag_conditions_for_semantic_flag_group(self, ctxt, conditions, count):
 		try:
 			buf = ctypes.cast(conditions, ctypes.c_void_p)
 			if buf.value not in self._pending_condition_lists:
@@ -999,7 +999,7 @@ def _get_semantic_flag_group_low_level_il(self, ctxt, sem_group, il):
 			log_error(traceback.format_exc())
 			return 0
 
-	def _free_register_list(self, ctxt, regs):
+	def _free_register_list(self, ctxt, regs, count):
 		try:
 			buf = ctypes.cast(regs, ctypes.c_void_p)
 			if buf.value not in self._pending_reg_lists:

python/callingconvention.py

@@ -281,7 +281,7 @@ def _get_float_arg_regs(self, ctxt, count):
 			count[0] = 0
 			return None
 
-	def _free_register_list(self, ctxt, regs):
+	def _free_register_list(self, ctxt, regs, count):
 		try:
 			buf = ctypes.cast(regs, ctypes.c_void_p)
 			if buf.value not in self._pending_reg_lists: