Merge branch 'dev' into test_stack_adjust

1 files changed, 14 insertions, 3 deletions

diff --git a/binaryninjacore.h b/binaryninjacore.h
index e029f208..21b04bfa 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -504,7 +504,8 @@ extern "C"
 		FunctionTypeClass = 8,
 		VarArgsTypeClass = 9,
 		ValueTypeClass = 10,
-		NamedTypeReferenceClass = 11
+		NamedTypeReferenceClass = 11,
+		WideCharTypeClass = 12
 	};
 
 	enum BNNamedTypeReferenceClass
@@ -656,7 +657,8 @@ extern "C"
 	{
 		AsciiString = 0,
 		Utf16String = 1,
-		Utf32String = 2
+		Utf32String = 2,
+		Utf8String = 3
 	};
 
 	enum BNIntegerDisplayType
@@ -1542,6 +1544,7 @@ extern "C"
 		uint64_t maxFunctionAnalysisTime;
 		size_t maxFunctionUpdateCount;
 		size_t maxFunctionSubmitCount;
+		bool suppressNewAutoFunctionAnalysis;
 	};
 
 	struct BNDownloadInstanceOutputCallbacks
@@ -1843,7 +1846,8 @@ extern "C"
 		NoSkipReason,
 		AlwaysSkipReason,
 		ExceedFunctionSizeSkipReason,
-		ExceedFunctionAnalysisTimeSkipReason
+		ExceedFunctionAnalysisTimeSkipReason,
+		NewAutoFunctionAnalysisSuppressedReason
 	};
 
 	BINARYNINJACOREAPI char* BNAllocString(const char* contents);
@@ -1969,6 +1973,9 @@ extern "C"
 	BINARYNINJACOREAPI bool BNSaveAutoSnapshotWithProgress(BNBinaryView* data, void* ctxt,
 		void (*progress)(void* ctxt, size_t progress, size_t total));
 
+	BINARYNINJACOREAPI char* BNGetOriginalFilename(BNFileMetadata* file);
+	BINARYNINJACOREAPI void BNSetOriginalFilename(BNFileMetadata* file, const char* name);
+
 	BINARYNINJACOREAPI char* BNGetFilename(BNFileMetadata* file);
 	BINARYNINJACOREAPI void BNSetFilename(BNFileMetadata* file, const char* name);
 
@@ -2544,6 +2551,8 @@ extern "C"
 	BINARYNINJACOREAPI void BNSetParametersForAnalysis(BNBinaryView* view, BNAnalysisParameters params);
 	BINARYNINJACOREAPI uint64_t BNGetMaxFunctionSizeForAnalysis(BNBinaryView* view);
 	BINARYNINJACOREAPI void BNSetMaxFunctionSizeForAnalysis(BNBinaryView* view, uint64_t size);
+	BINARYNINJACOREAPI bool BNGetNewAutoFunctionAnalysisSuppressed(BNBinaryView* view);
+	BINARYNINJACOREAPI void BNSetNewAutoFunctionAnalysisSuppressed(BNBinaryView* view, bool suppress);
 
 	BINARYNINJACOREAPI BNAnalysisCompletionEvent* BNAddAnalysisCompletionEvent(BNBinaryView* view, void* ctxt,
 		void (*callback)(void* ctxt));
@@ -2803,6 +2812,7 @@ extern "C"
 	BINARYNINJACOREAPI uint32_t BNGetLowLevelILTemporaryFlagCount(BNLowLevelILFunction* func);
 
 	BINARYNINJACOREAPI BNBasicBlock** BNGetLowLevelILBasicBlockList(BNLowLevelILFunction* func, size_t* count);
+	BINARYNINJACOREAPI BNBasicBlock* BNGetLowLevelILBasicBlockForInstruction(BNLowLevelILFunction* func, size_t i);
 
 	BINARYNINJACOREAPI BNLowLevelILFunction* BNGetLowLevelILSSAForm(BNLowLevelILFunction* func);
 	BINARYNINJACOREAPI BNLowLevelILFunction* BNGetLowLevelILNonSSAForm(BNLowLevelILFunction* func);
@@ -2924,6 +2934,7 @@ extern "C"
 		BNArchitecture* arch, size_t i, BNInstructionTextToken** tokens, size_t* count);
 
 	BINARYNINJACOREAPI BNBasicBlock** BNGetMediumLevelILBasicBlockList(BNMediumLevelILFunction* func, size_t* count);
+	BINARYNINJACOREAPI BNBasicBlock* BNGetMediumLevelILBasicBlockForInstruction(BNMediumLevelILFunction* func, size_t i);
 
 	BINARYNINJACOREAPI BNMediumLevelILFunction* BNGetMediumLevelILSSAForm(BNMediumLevelILFunction* func);
 	BINARYNINJACOREAPI BNMediumLevelILFunction* BNGetMediumLevelILNonSSAForm(BNMediumLevelILFunction* func);