Merge https://github.com/Vector35/binaryninja-api into dev

Author: v1X3Q0

basicblock.cpp

@@ -113,6 +113,17 @@ void DisassemblySettings::SetAddressBaseOffset(uint64_t addressBaseOffset)
 	BNSetDisassemblyAddressBaseOffset(m_object, addressBaseOffset);
 }
 
+BNDisassemblyCallParameterHints DisassemblySettings::GetCallParameterHints() const
+{
+	return BNGetDisassemblyCallParameterHints(m_object);
+}
+
+
+void DisassemblySettings::SetCallParameterHints(BNDisassemblyCallParameterHints hints)
+{
+	BNSetDisassemblyCallParameterHints(m_object, hints);
+}
+
 
 DisassemblyTextLine::DisassemblyTextLine()
 {

binaryninjaapi.h

@@ -9824,6 +9824,8 @@ namespace BinaryNinja {
 		void SetAddressMode(BNDisassemblyAddressMode mode);
 		uint64_t GetAddressBaseOffset() const;
 		void SetAddressBaseOffset(uint64_t addressBaseOffset);
+		BNDisassemblyCallParameterHints GetCallParameterHints() const;
+		void SetCallParameterHints(BNDisassemblyCallParameterHints hints);
 	};
 
 	/*!

binaryninjacore.h

@@ -697,7 +697,6 @@ extern "C"
 		ExpandLongOpcode = 2,
 		ShowVariablesAtTopOfGraph = 3,
 		ShowVariableTypesWhenAssigned = 4,
-		ShowCallParameterNames = 6,
 		ShowRegisterHighlight = 7,
 		ShowFunctionAddress = 8,
 		ShowFunctionHeader = 9,
@@ -731,6 +730,13 @@ extern "C"
 		DisassemblyAddressModeFlagsMask = 0xFFFF0000,
 	} BNDisassemblyAddressMode;
 
+	typedef enum BNDisassemblyCallParameterHints
+	{
+		NeverShowMatchingParameterHints,
+		AlwaysShowParameterHints,
+		NeverShowParameterHints,
+	} BNDisassemblyCallParameterHints;
+
 	typedef enum BNTypeClass
 	{
 		VoidTypeClass = 0,
@@ -5134,6 +5140,8 @@ extern "C"
 	BINARYNINJACOREAPI void BNSetDisassemblyAddressMode(BNDisassemblySettings* settings, BNDisassemblyAddressMode mode);
 	BINARYNINJACOREAPI uint64_t BNGetDisassemblyAddressBaseOffset(BNDisassemblySettings* settings);
 	BINARYNINJACOREAPI void BNSetDisassemblyAddressBaseOffset(BNDisassemblySettings* settings, uint64_t addressBaseOffset);
+	BINARYNINJACOREAPI BNDisassemblyCallParameterHints BNGetDisassemblyCallParameterHints(BNDisassemblySettings* settings);
+	BINARYNINJACOREAPI void BNSetDisassemblyCallParameterHints(BNDisassemblySettings* settings, BNDisassemblyCallParameterHints hints);
 
 	// Flow graphs
 	BINARYNINJACOREAPI BNFlowGraph* BNCreateFlowGraph(void);

python/binaryview.py

@@ -8780,7 +8780,6 @@ def find_all_text(
 			settings.set_option(DisassemblyOption.ShowAddress, False)
 			settings.set_option(DisassemblyOption.ShowOpcode, False)
 			settings.set_option(DisassemblyOption.ShowVariableTypesWhenAssigned, True)
-			settings.set_option(DisassemblyOption.ShowCallParameterNames, True)
 			settings.set_option(DisassemblyOption.WaitForIL, True)
 		if not isinstance(settings, _function.DisassemblySettings):
 			raise TypeError("settings parameter is not DisassemblySettings type")
@@ -8870,7 +8869,6 @@ def find_all_constant(
 			settings.set_option(DisassemblyOption.ShowAddress, False)
 			settings.set_option(DisassemblyOption.ShowOpcode, False)
 			settings.set_option(DisassemblyOption.ShowVariableTypesWhenAssigned, True)
-			settings.set_option(DisassemblyOption.ShowCallParameterNames, True)
 			settings.set_option(DisassemblyOption.WaitForIL, True)
 		if not isinstance(settings, _function.DisassemblySettings):
 			raise TypeError("settings parameter is not DisassemblySettings type")

rust/src/architecture.rs

@@ -715,6 +715,21 @@ impl Register for CoreRegister {
     }
 }
 
+impl CoreArrayProvider for CoreRegister {
+    type Raw = u32;
+    type Context = CoreArchitecture;
+    type Wrapped<'a> = Self;
+}
+
+unsafe impl CoreArrayProviderInner for CoreRegister {
+    unsafe fn free(raw: *mut Self::Raw, _count: usize, _context: &Self::Context) {
+        BNFreeRegisterList(raw)
+    }
+    unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, context: &'a Self::Context) -> Self::Wrapped<'a> {
+        Self(context.0, *raw)
+    }
+}
+
 pub struct CoreRegisterStackInfo(*mut BNArchitecture, BNRegisterStackInfo);
 
 impl RegisterStackInfo for CoreRegisterStackInfo {
@@ -2419,7 +2434,10 @@ where
         };
 
         let inputs = intrinsic.inputs();
-        let mut res: Box<[_]> = inputs.into_iter().map(|input| unsafe { Ref::into_raw(input) }.0).collect();
+        let mut res: Box<[_]> = inputs
+            .into_iter()
+            .map(|input| unsafe { Ref::into_raw(input) }.0)
+            .collect();
 
         unsafe {
             *count = res.len();

rust/src/disassembly.rs

@@ -265,6 +265,35 @@ impl Drop for InstructionTextToken {
     }
 }
 
+impl CoreArrayProvider for InstructionTextToken {
+    type Raw = BNInstructionTextToken;
+    type Context = ();
+    type Wrapped<'a> = Self;
+}
+unsafe impl CoreArrayProviderInner for InstructionTextToken {
+    unsafe fn free(raw: *mut Self::Raw, count: usize, _context: &Self::Context) {
+        BNFreeInstructionText(raw, count)
+    }
+    unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, _context: &'a Self::Context) -> Self::Wrapped<'a> {
+        Self(*raw)
+    }
+}
+
+impl CoreArrayProvider for Array<InstructionTextToken> {
+    type Raw = BNInstructionTextLine;
+    type Context = ();
+    type Wrapped<'a> = Self;
+}
+unsafe impl CoreArrayProviderInner for Array<InstructionTextToken> {
+    unsafe fn free(raw: *mut Self::Raw, count: usize, _context: &Self::Context) {
+        BNFreeInstructionTextLines(raw, count)
+    }
+    unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, _context: &'a Self::Context) -> Self::Wrapped<'a> {
+        Self::new(raw.tokens, raw.count, ())
+    }
+}
+
+#[repr(transparent)]
 pub struct DisassemblyTextLine(pub(crate) BNDisassemblyTextLine);
 
 impl DisassemblyTextLine {
@@ -422,6 +451,21 @@ impl Drop for DisassemblyTextLine {
     }
 }
 
+impl CoreArrayProvider for DisassemblyTextLine {
+    type Raw = BNDisassemblyTextLine;
+    type Context = ();
+    type Wrapped<'a> = &'a Self;
+}
+
+unsafe impl CoreArrayProviderInner for DisassemblyTextLine {
+    unsafe fn free(raw: *mut Self::Raw, count: usize, _context: &Self::Context) {
+        BNFreeDisassemblyTextLines(raw, count)
+    }
+    unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, _context: &'a Self::Context) -> Self::Wrapped<'a> {
+        core::mem::transmute(raw)
+    }
+}
+
 pub type DisassemblyOption = BNDisassemblyOption;
 
 #[derive(PartialEq, Eq, Hash)]