From 01aec7ed694b537192093d37a7933f710bc0d70b Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Wed, 18 Oct 2017 17:03:37 -0400
Subject: UI Updates for Product and Update Status.

---
 python/__init__.py | 7 +++++++
 python/update.py   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/__init__.py b/python/__init__.py
index f4a8fac8..729e4f8a 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -21,6 +21,7 @@
 
 import atexit
 import sys
+from time import gmtime
 
 # Binary Ninja components
 import _binaryninjacore as core
@@ -147,6 +148,12 @@ core_version = core.BNGetVersionString()
 core_build_id = core.BNGetBuildId()
 '''Build ID'''
 
+core_serial = core.BNGetSerialNumber()
+'''Serial Number'''
+
+core_expires = gmtime(core.BNGetLicenseExpirationTime())
+'''License Expiration'''
+
 core_product = core.BNGetProduct()
 '''Product string from the license file'''
 
diff --git a/python/update.py b/python/update.py
index be6962d7..1eb8ea61 100644
--- a/python/update.py
+++ b/python/update.py
@@ -154,7 +154,7 @@ class UpdateChannel(object):
 	def updates_available(self):
 		"""Whether updates are available (read-only)"""
 		errors = ctypes.c_char_p()
-		result = core.BNAreUpdatesAvailable(self.name, errors)
+		result = core.BNAreUpdatesAvailable(self.name, None, None, errors)
 		if errors:
 			error_str = errors.value
 			core.BNFreeString(ctypes.cast(errors, ctypes.POINTER(ctypes.c_byte)))
-- 
cgit v1.3.1


From 75242aecc30c565ee56d3e74ec2e2dd502a6f073 Mon Sep 17 00:00:00 2001
From: Josh Watson <josh@joshwatson.com>
Date: Sun, 29 Oct 2017 12:51:23 -0400
Subject: Fixed possible IndexError in Function.get_*_at methods (#775)

`Function.get_low_level_il_at` and `Function.get_lifted_il_at` methods could raise an IndexError because proper checking was not performed on the index returned by the core method that retrieves the IL instruction index of the requested instruction. The methods now check this value to see if it is equal to the length of the IL function, and if so, returns `None` instead. The onus of checking for `None` will be on the user, but at least they shouldn't have to wrap this in a try/except block anymore.
---
 python/function.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'python')

diff --git a/python/function.py b/python/function.py
index 5daa7b2a..9aafdf52 100644
--- a/python/function.py
+++ b/python/function.py
@@ -727,7 +727,13 @@ class Function(object):
 		"""
 		if arch is None:
 			arch = self.arch
-		return self.low_level_il[core.BNGetLowLevelILForInstruction(self.handle, arch.handle, addr)]
+
+		idx = core.BNGetLowLevelILForInstruction(self.handle, arch.handle, addr)
+
+		if idx == len(self.low_level_il):
+			return None
+
+		return self.low_level_il[idx]
 
 	def get_low_level_il_exits_at(self, addr, arch=None):
 		if arch is None:
@@ -878,7 +884,13 @@ class Function(object):
 	def get_lifted_il_at(self, addr, arch=None):
 		if arch is None:
 			arch = self.arch
-		return self.lifted_il[core.BNGetLiftedILForInstruction(self.handle, arch.handle, addr)]
+
+		idx = core.BNGetLiftedILForInstruction(self.handle, arch.handle, addr)
+
+		if idx == len(self.lifted_il):
+			return None
+
+		return self.lifted_il[idx]
 
 	def get_lifted_il_flag_uses_for_definition(self, i, flag):
 		flag = self.arch.get_flag_index(flag)
-- 
cgit v1.3.1


From 0ca722550555a1a0fc82766686bade6d669af3dc Mon Sep 17 00:00:00 2001
From: Cory Duplantis <cld251@gmail.com>
Date: Sun, 29 Oct 2017 13:23:33 -0500
Subject: Add convenience API's for accessing blocks and instructions in
 Function (#792)

* Update export-svg.py path splitting

Changed the path splitting part to the way python's documentation recommends it.

I got some errors trying to use that function on windows, because it didn't split correctly.
I stumbled upon this in the python documentation:
https://docs.python.org/2/library/os.html#os.sep
I changed the relevant line using their recommendation.

* Rename data to session_data, as this API is per-session and not stored in the db

* get_basic_blocks_starting_at incorrectly in the docs

* Update troubleshooting.md

* Zoom

* get_instruction_low_level_il tweak

made api docs less ambiguous

* documenting Type.int and Type.function

* Update __init__.py

* Add convenience API's for accessing blocks and instructions in Function
---
 python/function.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'python')

diff --git a/python/function.py b/python/function.py
index 9aafdf52..cbbdf9bd 100644
--- a/python/function.py
+++ b/python/function.py
@@ -666,6 +666,41 @@ class Function(object):
 		"""Sets a comment for the current function"""
 		return core.BNSetFunctionComment(self.handle, comment)
 
+	@property
+	def llil_basic_blocks(self):
+		"""A generator of all LowLevelILBasicBlock objects in the current function"""
+		for block in self.low_level_il:
+			yield block
+
+	@property
+	def mlil_basic_blocks(self):
+		"""A generator of all MediumLevelILBasicBlock objects in the current function"""
+		for block in self.medium_level_il:
+			yield block
+
+	@property
+	def instructions(self):
+		"""A generator of instruction tokens and their start addresses for the current function"""
+		for block in self.basic_blocks:
+			start = block.start
+			for i in block:
+				yield (i[0], start)
+				start += i[1]
+
+	@property
+	def llil_instructions(self):
+		"""A generator of llil instructions of the current function"""
+		for block in self.llil_basic_blocks:
+			for i in block:
+				yield i
+
+	@property
+	def mlil_instructions(self):
+		"""A generator of mlil instructions of the current function"""
+		for block in self.mlil_basic_blocks:
+			for i in block:
+				yield i
+
 	def __iter__(self):
 		count = ctypes.c_ulonglong()
 		blocks = core.BNGetFunctionBasicBlockList(self.handle, count)
-- 
cgit v1.3.1


From c396d2cfb3682cb4c152b9dba6f866f6783e4a80 Mon Sep 17 00:00:00 2001
From: Jordan Wiens <jordan@psifertex.com>
Date: Mon, 30 Oct 2017 17:46:49 -0400
Subject: __hash__ for three types of basic blocks

---
 python/basicblock.py    | 3 +++
 python/lowlevelil.py    | 3 +++
 python/mediumlevelil.py | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'python')

diff --git a/python/basicblock.py b/python/basicblock.py
index 26db925d..66d96882 100644
--- a/python/basicblock.py
+++ b/python/basicblock.py
@@ -68,6 +68,9 @@ class BasicBlock(object):
 		"""Internal method used to instantiante child instances"""
 		return BasicBlock(view, handle)
 
+	def __hash__(self):
+		return hash((self.start, self.end, self.arch.name))
+
 	@property
 	def function(self):
 		"""Basic block function (read-only)"""
diff --git a/python/lowlevelil.py b/python/lowlevelil.py
index 75a3f1ad..dfc5af5f 100644
--- a/python/lowlevelil.py
+++ b/python/lowlevelil.py
@@ -1733,6 +1733,9 @@ class LowLevelILBasicBlock(basicblock.BasicBlock):
 		"""Internal method by super to instantiante child instances"""
 		return LowLevelILBasicBlock(view, handle, self.il_function)
 
+	def __hash__(self):
+		return hash((self.start, self.end, self.il_function))
+
 def LLIL_TEMP(n):
 	return n | 0x80000000
 
diff --git a/python/mediumlevelil.py b/python/mediumlevelil.py
index 07759a47..9167212a 100644
--- a/python/mediumlevelil.py
+++ b/python/mediumlevelil.py
@@ -893,3 +893,6 @@ class MediumLevelILBasicBlock(basicblock.BasicBlock):
 	def _create_instance(self, view, handle):
 		"""Internal method by super to instantiante child instances"""
 		return MediumLevelILBasicBlock(view, handle, self.il_function)
+
+	def __hash__(self):
+		return hash((self.start, self.end, self.il_function))
-- 
cgit v1.3.1


From a774e47ee36a5d4418c9aec13e5612f158a825d3 Mon Sep 17 00:00:00 2001
From: Jordan Wiens <jordan@psifertex.com>
Date: Mon, 30 Oct 2017 21:21:48 -0400
Subject: add current_llil and current_mlil scripting console aliases

---
 docs/getting-started.md     | 2 ++
 python/scriptingprovider.py | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'python')

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 692c1e67..39809747 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -210,6 +210,8 @@ By default the interactive python prompt has a number of convenient helper funct
 - `bv` / `current_view` / : the current [BinaryView](https://api.binary.ninja/binaryninja.BinaryView.html)
 - `current_function`: the current [Function](https://api.binary.ninja/binaryninja.Function.html)
 - `current_basic_block`: the current [BasicBlock](https://api.binary.ninja/binaryninja.BasicBlock.html)
+- `current_llil`: the current [LowLevelILBasicBlock](https://api.binary.ninja/binaryninja.lowlevelil.LowLevelILBasicBlock.html)
+- `current_mlil`: the current [MediumLevelILBasicBlock](https://api.binary.ninja/binaryninja.mediumlevelil.MediumLevelILBasicBlock.html)
 - `current_selection`: a tuple of the start and end addresses of the current selection
 - `write_at_cursor(data)`: function that writes data to the start of the current selection
 - `get_selected_data()`: function that returns the data in the current selection
diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index ed9688b9..211d2fb7 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -540,6 +540,8 @@ class PythonScriptingInstance(ScriptingInstance):
 						self.locals["current_address"] = self.active_addr
 						self.locals["here"] = self.active_addr
 						self.locals["current_selection"] = (self.active_selection_begin, self.active_selection_end)
+						self.locals["current_llil"] = self.active_func.low_level_il
+						self.locals["current_mlil"] = self.active_func.medium_level_il
 
 						self.interpreter.runsource(code)
 
-- 
cgit v1.3.1


From de70f093cc429a125dde201cfe245b616c10ebce Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Mon, 30 Oct 2017 22:03:01 -0400
Subject: Provide a slightly different implementation for @joshwatson's
 AnalysisCompletionEvent PR and documentation update

---
 python/binaryview.py  | 13 ++++++++++++-
 python/interaction.py |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'python')

diff --git a/python/binaryview.py b/python/binaryview.py
index 9304d412..e6cb5b04 100644
--- a/python/binaryview.py
+++ b/python/binaryview.py
@@ -103,6 +103,17 @@ class StringReference(object):
 
 
 class AnalysisCompletionEvent(object):
+	"""
+	The ``AnalysisCompletionEvent`` object provides an asynchronous mechanism for receiving
+	callbacks when analysis is complete.
+
+	:Example:
+		>>> def on_complete(self):
+		...     print "Analysis Complete", self.view
+		...
+		>>> evt = AnalysisCompletionEvent(bv, on_complete)
+		>>>
+	"""
 	def __init__(self, view, callback):
 		self.view = view
 		self.callback = callback
@@ -114,7 +125,7 @@ class AnalysisCompletionEvent(object):
 
 	def _notify(self, ctxt):
 		try:
-			self.callback()
+			self.callback(self)
 		except:
 			log.log_error(traceback.format_exc())
 
diff --git a/python/interaction.py b/python/interaction.py
index 979549f5..96cac42d 100644
--- a/python/interaction.py
+++ b/python/interaction.py
@@ -520,7 +520,7 @@ def show_html_report(title, contents, plaintext=""):
 	:param str contents: HTML contents to display
 	:param str plaintext: Plain text version to display (used on the command line)
 	:rtype: None
-	:Example"
+	:Example:
 		>>> show_html_report("title", "<h1>Contents</h1>", "Plain text contents")
 		Plain text contents
 	"""
-- 
cgit v1.3.1


From 9a70f039ffd68190a3a6efc53a4fab3cf20b7963 Mon Sep 17 00:00:00 2001
From: Jordan Wiens <jordan@psifertex.com>
Date: Wed, 1 Nov 2017 00:42:32 -0400
Subject: fix new scripting provider aliases when no current context exists

---
 python/scriptingprovider.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'python')

diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index 211d2fb7..f9758cc9 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -540,8 +540,12 @@ class PythonScriptingInstance(ScriptingInstance):
 						self.locals["current_address"] = self.active_addr
 						self.locals["here"] = self.active_addr
 						self.locals["current_selection"] = (self.active_selection_begin, self.active_selection_end)
-						self.locals["current_llil"] = self.active_func.low_level_il
-						self.locals["current_mlil"] = self.active_func.medium_level_il
+						if self.active_func == None:
+							self.locals["current_llil"] = None
+							self.locals["current_mlil"] = None
+						else:
+							self.locals["current_llil"] = self.active_func.low_level_il
+							self.locals["current_mlil"] = self.active_func.medium_level_il
 
 						self.interpreter.runsource(code)
 
-- 
cgit v1.3.1


From 54a23d9e1ae34936427461b2807e3d5980e17486 Mon Sep 17 00:00:00 2001
From: David Barksdale <amatus@amat.us>
Date: Thu, 2 Nov 2017 11:30:12 -0500
Subject: Make SSAVariables unique between functions (#855)

This helps a ton with inter-function analysis.
---
 python/mediumlevelil.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'python')

diff --git a/python/mediumlevelil.py b/python/mediumlevelil.py
index 9167212a..333a6c4d 100644
--- a/python/mediumlevelil.py
+++ b/python/mediumlevelil.py
@@ -39,12 +39,12 @@ class SSAVariable(object):
 
 	def __eq__(self, other):
 		return (
-			(self.var.identifier, self.version) ==
-			(other.var.identifier, other.version)
+			(self.var.identifier, self.var.function, self.version) ==
+			(other.var.identifier, other.var.function, other.version)
 		)
 
 	def __hash__(self):
-		return hash((self.var.identifier, self.version))
+		return hash((self.var.identifier, self.var.function, self.version))
 
 
 class MediumLevelILLabel(object):
-- 
cgit v1.3.1


From 704ceff1223485e9dc12947a36b0d56a3ff9d3ae Mon Sep 17 00:00:00 2001
From: David Barksdale <amatus@amat.us>
Date: Thu, 2 Nov 2017 11:38:11 -0500
Subject: Move the function discrimination from SSAVariable to Variable (#856)

---
 python/function.py      | 4 ++--
 python/mediumlevelil.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'python')

diff --git a/python/function.py b/python/function.py
index cbbdf9bd..f8aaae44 100644
--- a/python/function.py
+++ b/python/function.py
@@ -241,10 +241,10 @@ class Variable(object):
 		return self.name
 
 	def __eq__(self, other):
-		return self.identifier == other.identifier
+		return (self.identifier, self.function) == (other.identifier, other.function)
 
 	def __hash__(self):
-		return hash(self.identifier)
+		return hash((self.identifier, self.function))
 
 
 class ConstantReference(object):
diff --git a/python/mediumlevelil.py b/python/mediumlevelil.py
index 333a6c4d..6f5515bb 100644
--- a/python/mediumlevelil.py
+++ b/python/mediumlevelil.py
@@ -39,12 +39,12 @@ class SSAVariable(object):
 
 	def __eq__(self, other):
 		return (
-			(self.var.identifier, self.var.function, self.version) ==
-			(other.var.identifier, other.var.function, other.version)
+			(self.var, self.version) ==
+			(other.var, other.version)
 		)
 
 	def __hash__(self):
-		return hash((self.var.identifier, self.var.function, self.version))
+		return hash((self.var, self.version))
 
 
 class MediumLevelILLabel(object):
-- 
cgit v1.3.1


From c4d8b6f18c094d98df4448bdaf14faa86b33cc86 Mon Sep 17 00:00:00 2001
From: Matt Revelle <mrevelle@gmail.com>
Date: Wed, 8 Nov 2017 11:18:03 -0500
Subject: Cache arch and platform property values (#862)

* Added __hash__ impl for BasicBlock instances.

* Removed too specific __hash__ impl.

* Cache arch and platform property values.
---
 python/function.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'python')

diff --git a/python/function.py b/python/function.py
index f8aaae44..bec3c2ad 100644
--- a/python/function.py
+++ b/python/function.py
@@ -307,6 +307,8 @@ class Function(object):
 		self._view = view
 		self.handle = core.handle_of_type(handle, core.BNFunction)
 		self._advanced_analysis_requests = 0
+		self._arch = None
+		self._platform = None
 
 	def __del__(self):
 		if self._advanced_analysis_requests > 0:
@@ -358,18 +360,26 @@ class Function(object):
 	@property
 	def arch(self):
 		"""Function architecture (read-only)"""
-		arch = core.BNGetFunctionArchitecture(self.handle)
-		if arch is None:
-			return None
-		return architecture.Architecture(arch)
+		if self._arch:
+			return self._arch
+		else:
+			arch = core.BNGetFunctionArchitecture(self.handle)
+			if arch is None:
+				return None
+			self._arch = architecture.Architecture(arch)
+			return self._arch
 
 	@property
 	def platform(self):
 		"""Function platform (read-only)"""
-		plat = core.BNGetFunctionPlatform(self.handle)
-		if plat is None:
-			return None
-		return platform.Platform(None, handle = plat)
+		if self._platform:
+			return self._platform
+		else: 
+			plat = core.BNGetFunctionPlatform(self.handle)
+			if plat is None:
+				return None
+			self._platform = plat
+			return platform.Platform(None, handle = plat)
 
 	@property
 	def start(self):
-- 
cgit v1.3.1


From 382b1353649472bc2088598b3b8b60c096c1e201 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Fri, 10 Nov 2017 17:42:28 -0500
Subject: Add 'relocatable' property to BinaryView class

---
 binaryninjaapi.h     |  3 +++
 binaryninjacore.h    |  2 ++
 binaryview.cpp       | 19 +++++++++++++++++++
 python/binaryview.py | 26 ++++++++++++++++++++++++++
 4 files changed, 50 insertions(+)

(limited to 'python')

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index a6276b00..5f3aace7 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1088,6 +1088,7 @@ namespace BinaryNinja
 		virtual uint64_t PerformGetEntryPoint() const { return 0; }
 		virtual bool PerformIsExecutable() const { return false; }
 		virtual BNEndianness PerformGetDefaultEndianness() const;
+		virtual bool PerformIsRelocatable() const;
 		virtual size_t PerformGetAddressSize() const;
 
 		virtual bool PerformSave(FileAccessor* file);
@@ -1115,6 +1116,7 @@ namespace BinaryNinja
 		static uint64_t GetEntryPointCallback(void* ctxt);
 		static bool IsExecutableCallback(void* ctxt);
 		static BNEndianness GetDefaultEndiannessCallback(void* ctxt);
+		static bool IsRelocatableCallback(void* ctxt);
 		static size_t GetAddressSizeCallback(void* ctxt);
 		static bool SaveCallback(void* ctxt, BNFileAccessor* file);
 
@@ -1181,6 +1183,7 @@ namespace BinaryNinja
 		void SetDefaultPlatform(Platform* platform);
 
 		BNEndianness GetDefaultEndianness() const;
+		bool IsRelocatable() const;
 		size_t GetAddressSize() const;
 
 		bool IsExecutable() const;
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 870c2de3..45e6310c 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -935,6 +935,7 @@ extern "C"
 		uint64_t (*getEntryPoint)(void* ctxt);
 		bool (*isExecutable)(void* ctxt);
 		BNEndianness (*getDefaultEndianness)(void* ctxt);
+		bool (*isRelocatable)(void* ctxt);
 		size_t (*getAddressSize)(void* ctxt);
 		bool (*save)(void* ctxt, BNFileAccessor* accessor);
 	};
@@ -1777,6 +1778,7 @@ extern "C"
 	BINARYNINJACOREAPI BNPlatform* BNGetDefaultPlatform(BNBinaryView* view);
 	BINARYNINJACOREAPI void BNSetDefaultPlatform(BNBinaryView* view, BNPlatform* platform);
 	BINARYNINJACOREAPI BNEndianness BNGetDefaultEndianness(BNBinaryView* view);
+	BINARYNINJACOREAPI bool BNIsRelocatable(BNBinaryView* view);
 	BINARYNINJACOREAPI size_t BNGetViewAddressSize(BNBinaryView* view);
 
 	BINARYNINJACOREAPI bool BNIsViewModified(BNBinaryView* view);
diff --git a/binaryview.cpp b/binaryview.cpp
index 213be79a..0a082458 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -288,6 +288,7 @@ BinaryView::BinaryView(const std::string& typeName, FileMetadata* file, BinaryVi
 	view.getEntryPoint = GetEntryPointCallback;
 	view.isExecutable = IsExecutableCallback;
 	view.getDefaultEndianness = GetDefaultEndiannessCallback;
+	view.isRelocatable = IsRelocatableCallback;
 	view.getAddressSize = GetAddressSizeCallback;
 	view.save = SaveCallback;
 
@@ -431,6 +432,13 @@ BNEndianness BinaryView::GetDefaultEndiannessCallback(void* ctxt)
 }
 
 
+bool BinaryView::IsRelocatableCallback(void* ctxt)
+{
+	BinaryView* view = (BinaryView*)ctxt;
+	return view->PerformIsRelocatable();
+}
+
+
 size_t BinaryView::GetAddressSizeCallback(void* ctxt)
 {
 	BinaryView* view = (BinaryView*)ctxt;
@@ -494,6 +502,11 @@ BNEndianness BinaryView::PerformGetDefaultEndianness() const
 }
 
 
+bool BinaryView::PerformIsRelocatable() const
+{
+	return false;
+}
+
 size_t BinaryView::PerformGetAddressSize() const
 {
 	Ref<Architecture> arch = GetDefaultArchitecture();
@@ -836,6 +849,12 @@ BNEndianness BinaryView::GetDefaultEndianness() const
 }
 
 
+bool BinaryView::IsRelocatable() const
+{
+	return BNIsRelocatable(m_object);
+}
+
+
 size_t BinaryView::GetAddressSize() const
 {
 	return BNGetViewAddressSize(m_object);
diff --git a/python/binaryview.py b/python/binaryview.py
index e6cb5b04..9f149ba8 100644
--- a/python/binaryview.py
+++ b/python/binaryview.py
@@ -583,6 +583,7 @@ class BinaryView(object):
 			self._cb.getEntryPoint = self._cb.getEntryPoint.__class__(self._get_entry_point)
 			self._cb.isExecutable = self._cb.isExecutable.__class__(self._is_executable)
 			self._cb.getDefaultEndianness = self._cb.getDefaultEndianness.__class__(self._get_default_endianness)
+			self._cb.isRelocatable = self._cb.isRelocatable.__class__(self._is_relocatable)
 			self._cb.getAddressSize = self._cb.getAddressSize.__class__(self._get_address_size)
 			self._cb.save = self._cb.save.__class__(self._save)
 			self.file = file_metadata
@@ -838,6 +839,11 @@ class BinaryView(object):
 		"""Endianness of the binary (read-only)"""
 		return Endianness(core.BNGetDefaultEndianness(self.handle))
 
+	@property
+	def relocatable(self):
+		"""Boolean - is the binary relocatable (read-only)"""
+		return core.BNIsRelocatable(self.handle)
+
 	@property
 	def address_size(self):
 		"""Address size of the binary (read-only)"""
@@ -1202,6 +1208,13 @@ class BinaryView(object):
 			log.log_error(traceback.format_exc())
 			return Endianness.LittleEndian
 
+	def _is_relocatable(self, ctxt):
+		try:
+			return self.perform_is_relocatable()
+		except:
+			log.log_error(traceback.format_exc())
+			return False
+
 	def _get_address_size(self, ctxt):
 		try:
 			return self.perform_get_address_size()
@@ -1494,6 +1507,19 @@ class BinaryView(object):
 		"""
 		return Endianness.LittleEndian
 
+	def perform_is_relocatable(self):
+		"""
+		``perform_is_relocatable`` implements a check which returns true if the BinaryView is relocatable. Defaults to
+		True.
+
+		.. note:: This method **may** be implemented for custom BinaryViews that are relocatable.
+		.. warning:: This method **must not** be called directly.
+
+		:return: True if the BinaryView is relocatable, False otherwise
+		:rtype: boolean
+		"""
+		return True
+
 	def create_database(self, filename, progress_func=None):
 		"""
 		``create_database`` writes the current database (.bndb) file out to the specified file.
-- 
cgit v1.3.1


From 0cff612e91e59a343fad898daa6fa51ab525a789 Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Mon, 13 Nov 2017 17:09:13 -0500
Subject: Add GetInstructionAlignment Callback to Architecture.

---
 architecture.cpp                             | 20 ++++++++++++++++++++
 binaryninjaapi.h                             |  3 +++
 binaryninjacore.h                            |  2 ++
 examples/x86_extension/src/x86_extension.cpp |  5 +++++
 python/architecture.py                       | 13 ++++++++++++-
 python/examples/nes.py                       |  1 +
 6 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'python')

diff --git a/architecture.cpp b/architecture.cpp
index eb588394..17d02909 100644
--- a/architecture.cpp
+++ b/architecture.cpp
@@ -111,6 +111,13 @@ size_t Architecture::GetDefaultIntegerSizeCallback(void* ctxt)
 }
 
 
+size_t Architecture::GetInstructionAlignmentCallback(void* ctxt)
+{
+	Architecture* arch = (Architecture*)ctxt;
+	return arch->GetInstructionAlignment();
+}
+
+
 size_t Architecture::GetMaxInstructionLengthCallback(void* ctxt)
 {
 	Architecture* arch = (Architecture*)ctxt;
@@ -443,6 +450,7 @@ void Architecture::Register(Architecture* arch)
 	callbacks.getEndianness = GetEndiannessCallback;
 	callbacks.getAddressSize = GetAddressSizeCallback;
 	callbacks.getDefaultIntegerSize = GetDefaultIntegerSizeCallback;
+	callbacks.getInstructionAlignment = GetInstructionAlignmentCallback;
 	callbacks.getMaxInstructionLength = GetMaxInstructionLengthCallback;
 	callbacks.getOpcodeDisplayLength = GetOpcodeDisplayLengthCallback;
 	callbacks.getAssociatedArchitectureByAddress = GetAssociatedArchitectureByAddressCallback;
@@ -523,6 +531,12 @@ size_t Architecture::GetDefaultIntegerSize() const
 }
 
 
+size_t Architecture::GetInstructionAlignment() const
+{
+	return 1;
+}
+
+
 size_t Architecture::GetMaxInstructionLength() const
 {
 	return BN_DEFAULT_NSTRUCTION_LENGTH;
@@ -905,6 +919,12 @@ size_t CoreArchitecture::GetDefaultIntegerSize() const
 }
 
 
+size_t CoreArchitecture::GetInstructionAlignment() const
+{
+	return BNGetArchitectureInstructionAlignment(m_object);
+}
+
+
 size_t CoreArchitecture::GetMaxInstructionLength() const
 {
 	return BNGetArchitectureMaxInstructionLength(m_object);
diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 5f3aace7..4f62ef5f 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1585,6 +1585,7 @@ namespace BinaryNinja
 		static BNEndianness GetEndiannessCallback(void* ctxt);
 		static size_t GetAddressSizeCallback(void* ctxt);
 		static size_t GetDefaultIntegerSizeCallback(void* ctxt);
+		static size_t GetInstructionAlignmentCallback(void* ctxt);
 		static size_t GetMaxInstructionLengthCallback(void* ctxt);
 		static size_t GetOpcodeDisplayLengthCallback(void* ctxt);
 		static BNArchitecture* GetAssociatedArchitectureByAddressCallback(void* ctxt, uint64_t* addr);
@@ -1640,6 +1641,7 @@ namespace BinaryNinja
 		virtual size_t GetAddressSize() const = 0;
 		virtual size_t GetDefaultIntegerSize() const;
 
+		virtual size_t GetInstructionAlignment() const;
 		virtual size_t GetMaxInstructionLength() const;
 		virtual size_t GetOpcodeDisplayLength() const;
 
@@ -1780,6 +1782,7 @@ namespace BinaryNinja
 		virtual BNEndianness GetEndianness() const override;
 		virtual size_t GetAddressSize() const override;
 		virtual size_t GetDefaultIntegerSize() const override;
+		virtual size_t GetInstructionAlignment() const override;
 		virtual size_t GetMaxInstructionLength() const override;
 		virtual size_t GetOpcodeDisplayLength() const override;
 		virtual Ref<Architecture> GetAssociatedArchitectureByAddress(uint64_t& addr) override;
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 45e6310c..cb99958c 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -1003,6 +1003,7 @@ extern "C"
 		BNEndianness (*getEndianness)(void* ctxt);
 		size_t (*getAddressSize)(void* ctxt);
 		size_t (*getDefaultIntegerSize)(void* ctxt);
+		size_t (*getInstructionAlignment)(void* ctxt);
 		size_t (*getMaxInstructionLength)(void* ctxt);
 		size_t (*getOpcodeDisplayLength)(void* ctxt);
 		BNArchitecture* (*getAssociatedArchitectureByAddress)(void* ctxt, uint64_t* addr);
@@ -1946,6 +1947,7 @@ extern "C"
 	BINARYNINJACOREAPI BNEndianness BNGetArchitectureEndianness(BNArchitecture* arch);
 	BINARYNINJACOREAPI size_t BNGetArchitectureAddressSize(BNArchitecture* arch);
 	BINARYNINJACOREAPI size_t BNGetArchitectureDefaultIntegerSize(BNArchitecture* arch);
+	BINARYNINJACOREAPI size_t BNGetArchitectureInstructionAlignment(BNArchitecture* arch);
 	BINARYNINJACOREAPI size_t BNGetArchitectureMaxInstructionLength(BNArchitecture* arch);
 	BINARYNINJACOREAPI size_t BNGetArchitectureOpcodeDisplayLength(BNArchitecture* arch);
 	BINARYNINJACOREAPI BNArchitecture* BNGetAssociatedArchitectureByAddress(BNArchitecture* arch, uint64_t* addr);
diff --git a/examples/x86_extension/src/x86_extension.cpp b/examples/x86_extension/src/x86_extension.cpp
index 9efcc119..076551ab 100644
--- a/examples/x86_extension/src/x86_extension.cpp
+++ b/examples/x86_extension/src/x86_extension.cpp
@@ -327,6 +327,11 @@ public:
 		return LittleEndian;
 	}
 
+	virtual size_t GetInstructionAlignment() const override
+	{
+		return 1;
+	}
+
 	virtual bool GetInstructionInfo(const uint8_t* data, uint64_t addr, size_t maxLen, InstructionInfo& result) override
 	{
 		return m_arch->GetInstructionInfo(data, addr, maxLen, result);
diff --git a/python/architecture.py b/python/architecture.py
index 72403fec..41a130bf 100644
--- a/python/architecture.py
+++ b/python/architecture.py
@@ -111,6 +111,7 @@ class Architecture(object):
 	endianness = Endianness.LittleEndian
 	address_size = 8
 	default_int_size = 4
+	instr_alignment = 1
 	max_instr_length = 16
 	opcode_display_length = 8
 	regs = {}
@@ -132,6 +133,7 @@ class Architecture(object):
 			self.__dict__["endianness"] = Endianness(core.BNGetArchitectureEndianness(self.handle))
 			self.__dict__["address_size"] = core.BNGetArchitectureAddressSize(self.handle)
 			self.__dict__["default_int_size"] = core.BNGetArchitectureDefaultIntegerSize(self.handle)
+			self.__dict__["instr_alignment"] = core.BNGetArchitectureInstructionAlignment(self.handle)
 			self.__dict__["max_instr_length"] = core.BNGetArchitectureMaxInstructionLength(self.handle)
 			self.__dict__["opcode_display_length"] = core.BNGetArchitectureOpcodeDisplayLength(self.handle)
 			self.__dict__["stack_pointer"] = core.BNGetArchitectureRegisterName(self.handle,
@@ -228,6 +230,7 @@ class Architecture(object):
 			self._cb.getEndianness = self._cb.getEndianness.__class__(self._get_endianness)
 			self._cb.getAddressSize = self._cb.getAddressSize.__class__(self._get_address_size)
 			self._cb.getDefaultIntegerSize = self._cb.getDefaultIntegerSize.__class__(self._get_default_integer_size)
+			self._cb.getInstructionAlignment = self._cb.getInstructionAlignment.__class__(self._get_instruction_alignment)
 			self._cb.getMaxInstructionLength = self._cb.getMaxInstructionLength.__class__(self._get_max_instruction_length)
 			self._cb.getOpcodeDisplayLength = self._cb.getOpcodeDisplayLength.__class__(self._get_opcode_display_length)
 			self._cb.getAssociatedArchitectureByAddress = \
@@ -385,7 +388,8 @@ class Architecture(object):
 
 	def __setattr__(self, name, value):
 		if ((name == "name") or (name == "endianness") or (name == "address_size") or
-			(name == "default_int_size") or (name == "regs") or (name == "get_max_instruction_length")):
+			(name == "default_int_size") or (name == "regs") or (name == "get_max_instruction_length") or
+			(name == "get_instruction_alignment")):
 			raise AttributeError("attribute '%s' is read only" % name)
 		else:
 			try:
@@ -420,6 +424,13 @@ class Architecture(object):
 			log.log_error(traceback.format_exc())
 			return 4
 
+	def __get_instruction_alignment(self, ctxt):
+		try:
+			return self.__class__.instr_alignment
+		except:
+			log.log_error(traceback.format_exc())
+			return 1
+
 	def _get_max_instruction_length(self, ctxt):
 		try:
 			return self.__class__.max_instr_length
diff --git a/python/examples/nes.py b/python/examples/nes.py
index e55a90b7..39544c9f 100644
--- a/python/examples/nes.py
+++ b/python/examples/nes.py
@@ -367,6 +367,7 @@ class M6502(Architecture):
 	name = "6502"
 	address_size = 2
 	default_int_size = 1
+	instr_alignment = 1
 	max_instr_length = 3
 	regs = {
 		"a": RegisterInfo("a", 1),
-- 
cgit v1.3.1


From 88af32b1b20026d3bc063be558f63aeb1ccfd579 Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Tue, 14 Nov 2017 15:33:01 -0500
Subject: Fix _get_instruction_alignment type.

---
 python/architecture.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/architecture.py b/python/architecture.py
index 41a130bf..ed03a6e6 100644
--- a/python/architecture.py
+++ b/python/architecture.py
@@ -424,7 +424,7 @@ class Architecture(object):
 			log.log_error(traceback.format_exc())
 			return 4
 
-	def __get_instruction_alignment(self, ctxt):
+	def _get_instruction_alignment(self, ctxt):
 		try:
 			return self.__class__.instr_alignment
 		except:
-- 
cgit v1.3.1


From 661581594a014ceadc6284ef8c907162ef17380e Mon Sep 17 00:00:00 2001
From: David Barksdale <amatus@amat.us>
Date: Tue, 14 Nov 2017 14:05:22 -0600
Subject: Cache Platform object and not handle

---
 python/function.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'python')

diff --git a/python/function.py b/python/function.py
index bec3c2ad..9547e34a 100644
--- a/python/function.py
+++ b/python/function.py
@@ -378,8 +378,8 @@ class Function(object):
 			plat = core.BNGetFunctionPlatform(self.handle)
 			if plat is None:
 				return None
-			self._platform = plat
-			return platform.Platform(None, handle = plat)
+			self._platform = platform.Platform(None, handle = plat)
+			return self._platform
 
 	@property
 	def start(self):
-- 
cgit v1.3.1


From 8db4153af8182f9a3ef8b124a34860e5e4d16bcc Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Mon, 20 Nov 2017 11:50:34 -0500
Subject: Update Python API to display PossibleValues that are of type
 ConstantPointerValue.

---
 python/function.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'python')

diff --git a/python/function.py b/python/function.py
index 9547e34a..e9e5dcc9 100644
--- a/python/function.py
+++ b/python/function.py
@@ -123,6 +123,8 @@ class PossibleValueSet(object):
 			self.reg = arch.get_reg_name(value.value)
 		elif value.state == RegisterValueType.ConstantValue:
 			self.value = value.value
+		elif value.state == RegisterValueType.ConstantPointerValue:
+			self.value = value.value
 		elif value.state == RegisterValueType.StackFrameOffset:
 			self.offset = value.value
 		elif value.state == RegisterValueType.SignedRangeValue:
@@ -164,6 +166,8 @@ class PossibleValueSet(object):
 			return "<entry %s>" % self.reg
 		if self.type == RegisterValueType.ConstantValue:
 			return "<const %#x>" % self.value
+		if self.type == RegisterValueType.ConstantPointerValue:
+			return "<const ptr %#x>" % self.value
 		if self.type == RegisterValueType.StackFrameOffset:
 			return "<stack frame offset %#x>" % self.offset
 		if self.type == RegisterValueType.SignedRangeValue:
-- 
cgit v1.3.1


From 448ffe2842b2b1e0d21f905403489d3f865672d8 Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Mon, 4 Dec 2017 13:12:06 -0500
Subject: Add MediumLevelIL Function Recognizer.

---
 binaryninjaapi.h             |  2 ++
 binaryninjacore.h            |  1 +
 functionrecognizer.cpp       | 18 ++++++++++++++++++
 python/functionrecognizer.py | 15 +++++++++++++++
 4 files changed, 36 insertions(+)

(limited to 'python')

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index e4ef4c43..baeb5de6 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -2951,6 +2951,7 @@ namespace BinaryNinja
 	class FunctionRecognizer
 	{
 		static bool RecognizeLowLevelILCallback(void* ctxt, BNBinaryView* data, BNFunction* func, BNLowLevelILFunction* il);
+		static bool RecognizeMediumLevelILCallback(void* ctxt, BNBinaryView* data, BNFunction* func, BNMediumLevelILFunction* il);
 
 	public:
 		FunctionRecognizer();
@@ -2959,6 +2960,7 @@ namespace BinaryNinja
 		static void RegisterArchitectureFunctionRecognizer(Architecture* arch, FunctionRecognizer* recog);
 
 		virtual bool RecognizeLowLevelIL(BinaryView* data, Function* func, LowLevelILFunction* il);
+		virtual bool RecognizeMediumLevelIL(BinaryView* data, Function* func, MediumLevelILFunction* il);
 	};
 
 	class UpdateException: public std::exception
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 82198efd..7a0e585e 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -1191,6 +1191,7 @@ extern "C"
 	{
 		void* context;
 		bool (*recognizeLowLevelIL)(void* ctxt, BNBinaryView* data, BNFunction* func, BNLowLevelILFunction* il);
+		bool (*recognizeMediumLevelIL)(void* ctxt, BNBinaryView* data, BNFunction* func, BNMediumLevelILFunction* il);
 	};
 
 	struct BNTypeParserResult
diff --git a/functionrecognizer.cpp b/functionrecognizer.cpp
index 32c7245c..34f1db80 100644
--- a/functionrecognizer.cpp
+++ b/functionrecognizer.cpp
@@ -38,11 +38,22 @@ bool FunctionRecognizer::RecognizeLowLevelILCallback(void* ctxt, BNBinaryView* d
 }
 
 
+bool FunctionRecognizer::RecognizeMediumLevelILCallback(void* ctxt, BNBinaryView* data, BNFunction* func, BNMediumLevelILFunction* il)
+{
+	FunctionRecognizer* recog = (FunctionRecognizer*)ctxt;
+	Ref<BinaryView> dataObj = new BinaryView(BNNewViewReference(data));
+	Ref<Function> funcObj = new Function(BNNewFunctionReference(func));
+	Ref<MediumLevelILFunction> ilObj = new MediumLevelILFunction(BNNewMediumLevelILFunctionReference(il));
+	return recog->RecognizeMediumLevelIL(dataObj, funcObj, ilObj);
+}
+
+
 void FunctionRecognizer::RegisterGlobalRecognizer(FunctionRecognizer* recog)
 {
 	BNFunctionRecognizer reg;
 	reg.context = recog;
 	reg.recognizeLowLevelIL = RecognizeLowLevelILCallback;
+	reg.recognizeMediumLevelIL = RecognizeMediumLevelILCallback;
 	BNRegisterGlobalFunctionRecognizer(&reg);
 }
 
@@ -52,6 +63,7 @@ void FunctionRecognizer::RegisterArchitectureFunctionRecognizer(Architecture* ar
 	BNFunctionRecognizer reg;
 	reg.context = recog;
 	reg.recognizeLowLevelIL = RecognizeLowLevelILCallback;
+	reg.recognizeMediumLevelIL = RecognizeMediumLevelILCallback;
 	BNRegisterArchitectureFunctionRecognizer(arch->GetObject(), &reg);
 }
 
@@ -60,3 +72,9 @@ bool FunctionRecognizer::RecognizeLowLevelIL(BinaryView*, Function*, LowLevelILF
 {
 	return false;
 }
+
+
+bool FunctionRecognizer::RecognizeMediumLevelIL(BinaryView*, Function*, MediumLevelILFunction*)
+{
+	return false;
+}
diff --git a/python/functionrecognizer.py b/python/functionrecognizer.py
index 8514a2ee..4ac304ca 100644
--- a/python/functionrecognizer.py
+++ b/python/functionrecognizer.py
@@ -36,6 +36,7 @@ class FunctionRecognizer(object):
 		self._cb = core.BNFunctionRecognizer()
 		self._cb.context = 0
 		self._cb.recognizeLowLevelIL = self._cb.recognizeLowLevelIL.__class__(self._recognize_low_level_il)
+		self._cb.recognizeMediumLevelIL = self._cb.recognizeMediumLevelIL.__class__(self._recognize_medium_level_il)
 
 	@classmethod
 	def register_global(cls):
@@ -62,3 +63,17 @@ class FunctionRecognizer(object):
 
 	def recognize_low_level_il(self, data, func, il):
 		return False
+
+	def _recognize_medium_level_il(self, ctxt, data, func, il):
+		try:
+			file_metadata = filemetadata.FileMetadata(handle = core.BNGetFileForView(data))
+			view = binaryview.BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(data))
+			func = function.Function(view, handle = core.BNNewFunctionReference(func))
+			il = mediumlevelil.MediumLevelILFunction(func.arch, handle = core.BNNewMediumLevelILFunctionReference(il))
+			return self.recognize_medium_level_il(view, func, il)
+		except:
+			log.log_error(traceback.format_exc())
+			return False
+
+	def recognize_medium_level_il(self, data, func, il):
+		return False
-- 
cgit v1.3.1


From 10cf74045e1e2495813597a499dee4fb4baf601f Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Mon, 4 Dec 2017 13:23:26 -0500
Subject: Better Architecture Transition Support.

---
 architecture.cpp       | 1 +
 binaryninjacore.h      | 1 +
 python/architecture.py | 2 ++
 python/function.py     | 1 +
 4 files changed, 5 insertions(+)

(limited to 'python')

diff --git a/architecture.cpp b/architecture.cpp
index 17d02909..66372bcb 100644
--- a/architecture.cpp
+++ b/architecture.cpp
@@ -30,6 +30,7 @@ using namespace std;
 InstructionInfo::InstructionInfo()
 {
 	length = 0;
+	archTransitionByTargetAddr = false;
 	branchCount = 0;
 	branchDelay = false;
 }
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 7a0e585e..1bb0c70a 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -973,6 +973,7 @@ extern "C"
 	{
 		size_t length;
 		size_t branchCount;
+		bool archTransitionByTargetAddr;
 		bool branchDelay;
 		BNBranchType branchType[BN_MAX_INSTRUCTION_BRANCHES];
 		uint64_t branchTarget[BN_MAX_INSTRUCTION_BRANCHES];
diff --git a/python/architecture.py b/python/architecture.py
index ed03a6e6..a893c1d4 100644
--- a/python/architecture.py
+++ b/python/architecture.py
@@ -462,6 +462,7 @@ class Architecture(object):
 			if info is None:
 				return False
 			result[0].length = info.length
+			result[0].archTransitionByTargetAddr = info.arch_transition_by_target_addr
 			result[0].branchDelay = info.branch_delay
 			result[0].branchCount = len(info.branches)
 			for i in xrange(0, len(info.branches)):
@@ -1163,6 +1164,7 @@ class Architecture(object):
 			return None
 		result = function.InstructionInfo()
 		result.length = info.length
+		result.arch_transition_by_target_addr = info.archTransitionByTargetAddr
 		result.branch_delay = info.branchDelay
 		for i in xrange(0, info.branchCount):
 			target = info.branchTarget[i]
diff --git a/python/function.py b/python/function.py
index e9e5dcc9..58bee8f4 100644
--- a/python/function.py
+++ b/python/function.py
@@ -1755,6 +1755,7 @@ class InstructionBranch(object):
 class InstructionInfo(object):
 	def __init__(self):
 		self.length = 0
+		self.arch_transition_by_target_addr = False
 		self.branch_delay = False
 		self.branches = []
 
-- 
cgit v1.3.1


From 78a9a6fd52cb36e1e2fddfb0cbaf4f56a6b8016e Mon Sep 17 00:00:00 2001
From: David Barksdale <amatus@amat.us>
Date: Tue, 5 Dec 2017 11:34:32 -0600
Subject: Add __eq__ and __hash__ to BasicBlockEdge

---
 python/basicblock.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'python')

diff --git a/python/basicblock.py b/python/basicblock.py
index 66d96882..8e64c1c1 100644
--- a/python/basicblock.py
+++ b/python/basicblock.py
@@ -35,6 +35,14 @@ class BasicBlockEdge(object):
 		self.target = target
 		self.back_edge = back_edge
 
+	def __eq__(self, value):
+		if not isinstance(value, BasicBlockEdge):
+			return False
+		return (self.type, self.source, self.target, self.back_edge) == (value.type, value.source, value.target, value.back_edge)
+
+	def __hash__(self):
+		return hash((self.type, self.source, self.target, self.back_edge))
+
 	def __repr__(self):
 		if self.type == BranchType.UnresolvedBranch:
 			return "<%s>" % BranchType(self.type).name
-- 
cgit v1.3.1


From 565dd968745465d3ab939303056431bf9fa2f924 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Thu, 14 Dec 2017 15:13:54 -0500
Subject: Fix multi-line execution in python console

---
 python/scriptingprovider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index f9758cc9..8645c96c 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -547,7 +547,7 @@ class PythonScriptingInstance(ScriptingInstance):
 							self.locals["current_llil"] = self.active_func.low_level_il
 							self.locals["current_mlil"] = self.active_func.medium_level_il
 
-						self.interpreter.runsource(code)
+						self.interpreter.runcode(code)
 
 						if self.locals["here"] != self.active_addr:
 							if not self.active_view.file.navigate(self.active_view.file.view, self.locals["here"]):
-- 
cgit v1.3.1


From ae5ce4da4c1f6ea3a071a4eec1a5da3e6e2a3305 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Thu, 14 Dec 2017 18:38:57 -0500
Subject: Fix multi-line insertion and single expression evalutation

---
 python/scriptingprovider.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'python')

diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index 8645c96c..761b359c 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -457,7 +457,7 @@ class PythonScriptingInstance(ScriptingInstance):
 			super(PythonScriptingInstance.InterpreterThread, self).__init__()
 			self.instance = instance
 			self.locals = {"__name__": "__console__", "__doc__": None, "binaryninja": sys.modules[__name__]}
-			self.interpreter = code.InteractiveInterpreter(self.locals)
+			self.interpreter = code.InteractiveConsole(self.locals)
 			self.event = threading.Event()
 			self.daemon = True
 
@@ -484,7 +484,7 @@ class PythonScriptingInstance(ScriptingInstance):
 			self.code = None
 			self.input = ""
 
-			self.interpreter.runsource("from binaryninja import *\n")
+			self.interpreter.push("from binaryninja import *\n")
 
 		def execute(self, code):
 			self.code = code
@@ -547,7 +547,8 @@ class PythonScriptingInstance(ScriptingInstance):
 							self.locals["current_llil"] = self.active_func.low_level_il
 							self.locals["current_mlil"] = self.active_func.medium_level_il
 
-						self.interpreter.runcode(code)
+						for line in code.split("\n"):
+							self.interpreter.push(line)
 
 						if self.locals["here"] != self.active_addr:
 							if not self.active_view.file.navigate(self.active_view.file.view, self.locals["here"]):
-- 
cgit v1.3.1


From b207c76729df133c7b6fc4bc9f1abb6948ae6438 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Thu, 14 Dec 2017 18:46:10 -0500
Subject: Add autoDefined attribute to Sections and Segments

---
 binaryninjaapi.h     |  2 ++
 binaryninjacore.h    |  2 ++
 binaryview.cpp       |  2 +-
 python/binaryview.py | 17 ++++++++++-------
 4 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'python')

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index baeb5de6..72f74c5a 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1027,6 +1027,7 @@ namespace BinaryNinja
 		uint64_t start, length;
 		uint64_t dataOffset, dataLength;
 		uint32_t flags;
+		bool autoDefined;
 	};
 
 	struct Section
@@ -1037,6 +1038,7 @@ namespace BinaryNinja
 		uint64_t infoData;
 		uint64_t align, entrySize;
 		BNSectionSemantics semantics;
+		bool autoDefined;
 	};
 
 	struct QualifiedNameAndType;
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 1bb0c70a..245e6353 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -1531,6 +1531,7 @@ extern "C"
 		uint64_t start, length;
 		uint64_t dataOffset, dataLength;
 		uint32_t flags;
+		bool autoDefined;
 	};
 
 	enum BNSectionSemantics
@@ -1551,6 +1552,7 @@ extern "C"
 		uint64_t infoData;
 		uint64_t align, entrySize;
 		BNSectionSemantics semantics;
+		bool autoDefined;
 	};
 
 	struct BNAddressRange
diff --git a/binaryview.cpp b/binaryview.cpp
index 0a082458..50011a0f 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -1724,6 +1724,7 @@ vector<Segment> BinaryView::GetSegments()
 		segment.dataOffset = segments[i].dataOffset;
 		segment.dataLength = segments[i].dataLength;
 		segment.flags = segments[i].flags;
+		segment.autoDefined = segments[i].autoDefined;
 		result.push_back(segment);
 	}
 
@@ -1731,7 +1732,6 @@ vector<Segment> BinaryView::GetSegments()
 	return result;
 }
 
-
 bool BinaryView::GetSegmentAt(uint64_t addr, Segment& result)
 {
 	BNSegment segment;
diff --git a/python/binaryview.py b/python/binaryview.py
index 9f149ba8..6eb59db1 100644
--- a/python/binaryview.py
+++ b/python/binaryview.py
@@ -416,12 +416,13 @@ class BinaryViewType(object):
 
 
 class Segment(object):
-	def __init__(self, start, length, data_offset, data_length, flags):
+	def __init__(self, start, length, data_offset, data_length, flags, auto_defined):
 		self.start = start
 		self.length = length
 		self.data_offset = data_offset
 		self.data_length = data_length
 		self.flags = flags
+		self.auto_defined = auto_defined
 
 	@property
 	def executable(self):
@@ -450,7 +451,7 @@ class Segment(object):
 
 
 class Section(object):
-	def __init__(self, name, section_type, start, length, linked_section, info_section, info_data, align, entry_size, semantics):
+	def __init__(self, name, section_type, start, length, linked_section, info_section, info_data, align, entry_size, semantics, auto_defined):
 		self.name = name
 		self.type = section_type
 		self.start = start
@@ -461,6 +462,7 @@ class Section(object):
 		self.align = align
 		self.entry_size = entry_size
 		self.semantics = SectionSemantics(semantics)
+		self.auto_defined = auto_defined
 
 	@property
 	def end(self):
@@ -965,7 +967,7 @@ class BinaryView(object):
 		result = []
 		for i in xrange(0, count.value):
 			result.append(Segment(segment_list[i].start, segment_list[i].length,
-				segment_list[i].dataOffset, segment_list[i].dataLength, segment_list[i].flags))
+				segment_list[i].dataOffset, segment_list[i].dataLength, segment_list[i].flags, segment_list[i].autoDefined))
 		core.BNFreeSegmentList(segment_list)
 		return result
 
@@ -979,7 +981,7 @@ class BinaryView(object):
 			result[section_list[i].name] = Section(section_list[i].name, section_list[i].type, section_list[i].start,
 				section_list[i].length, section_list[i].linkedSection, section_list[i].infoSection,
 				section_list[i].infoData, section_list[i].align, section_list[i].entrySize,
-				section_list[i].semantics)
+				section_list[i].semantics, section_list[i].autoDefined)
 		core.BNFreeSectionList(section_list, count.value)
 		return result
 
@@ -3353,7 +3355,7 @@ class BinaryView(object):
 		if not core.BNGetSegmentAt(self.handle, addr, segment):
 			return None
 		result = Segment(segment.start, segment.length, segment.dataOffset, segment.dataLength,
-			segment.flags)
+			segment.flags, segment.autoDefined)
 		return result
 
 	def get_address_for_data_offset(self, offset):
@@ -3386,7 +3388,7 @@ class BinaryView(object):
 			result.append(Section(section_list[i].name, section_list[i].type, section_list[i].start,
 				section_list[i].length, section_list[i].linkedSection, section_list[i].infoSection,
 				section_list[i].infoData, section_list[i].align, section_list[i].entrySize,
-				section_list[i].semantics))
+				section_list[i].semantics, section_list[i].autoDefined))
 		core.BNFreeSectionList(section_list, count.value)
 		return result
 
@@ -3395,7 +3397,8 @@ class BinaryView(object):
 		if not core.BNGetSectionByName(self.handle, name, section):
 			return None
 		result = Section(section.name, section.type, section.start, section.length, section.linkedSection,
-			section.infoSection, section.infoData, section.align, section.entrySize, section.semantics)
+			section.infoSection, section.infoData, section.align, section.entrySize, section.semantics,
+			section_list.autoDefined)
 		core.BNFreeSection(section)
 		return result
 
-- 
cgit v1.3.1


From b64d65be48ba44d9c2b564d88aec15430fd289df Mon Sep 17 00:00:00 2001
From: toolCHAINZ <the.gustavo.gustavo@gmail.com>
Date: Thu, 14 Dec 2017 19:07:25 -0500
Subject: Fix PluginManager Doc Example (#885)

Fix doc string example for add_repository
---
 python/pluginmanager.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'python')

diff --git a/python/pluginmanager.py b/python/pluginmanager.py
index 6896d699..2f293577 100644
--- a/python/pluginmanager.py
+++ b/python/pluginmanager.py
@@ -382,7 +382,6 @@ class RepositoryManager(object):
 			>>> mgr = RepositoryManager()
 			>>> mgr.add_repository(url="https://github.com/vector35/community-plugins.git",
 			                       repopath="myrepo",
-			                       repomanifest="plugins",
 			                       localreference="master", remotereference="origin")
 			True
 			>>>
-- 
cgit v1.3.1


From 4862340bc92c7bcde9d377cbf7cff1417a39509e Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Fri, 15 Dec 2017 09:56:59 -0500
Subject: Make multi-line python input more robust

---
 python/scriptingprovider.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'python')

diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index 761b359c..6b03d49e 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -42,14 +42,14 @@ class _ThreadActionContext(object):
 	def __init__(self, func):
 		self.func = func
 		self.interpreter = None
-		if "value" in dir(PythonScriptingInstance._interpreter):
+		if hasattr(PythonScriptingInstance._interpreter, "value"):
 			self.interpreter = PythonScriptingInstance._interpreter.value
 		self.__class__._actions.append(self)
 		self.callback = ctypes.CFUNCTYPE(None, ctypes.c_void_p)(lambda ctxt: self.execute())
 
 	def execute(self):
 		old_interpreter = None
-		if "value" in dir(PythonScriptingInstance._interpreter):
+		if hasattr(PythonScriptingInstance._interpreter, "value"):
 			old_interpreter = PythonScriptingInstance._interpreter.value
 		PythonScriptingInstance._interpreter.value = self.interpreter
 		try:
@@ -380,7 +380,7 @@ class _PythonScriptingInstanceOutput(object):
 
 	def write(self, data):
 		interpreter = None
-		if "value" in dir(PythonScriptingInstance._interpreter):
+		if hasattr(PythonScriptingInstance._interpreter, "value"):
 			interpreter = PythonScriptingInstance._interpreter.value
 
 		if interpreter is None:
@@ -419,7 +419,7 @@ class _PythonScriptingInstanceInput(object):
 
 	def read(self, size):
 		interpreter = None
-		if "value" in dir(PythonScriptingInstance._interpreter):
+		if hasattr(PythonScriptingInstance._interpreter, "value"):
 			interpreter = PythonScriptingInstance._interpreter.value
 
 		if interpreter is None:
@@ -434,7 +434,7 @@ class _PythonScriptingInstanceInput(object):
 
 	def readline(self):
 		interpreter = None
-		if "value" in dir(PythonScriptingInstance._interpreter):
+		if hasattr(PythonScriptingInstance._interpreter, "value"):
 			interpreter = PythonScriptingInstance._interpreter.value
 
 		if interpreter is None:
@@ -548,7 +548,7 @@ class PythonScriptingInstance(ScriptingInstance):
 							self.locals["current_mlil"] = self.active_func.medium_level_il
 
 						for line in code.split("\n"):
-							self.interpreter.push(line)
+							self.interpreter.push(line + "\n")
 
 						if self.locals["here"] != self.active_addr:
 							if not self.active_view.file.navigate(self.active_view.file.view, self.locals["here"]):
-- 
cgit v1.3.1


From 0963fc9e3623f9758afb63b4b089a0fa7873c395 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Mon, 18 Dec 2017 11:43:43 -0500
Subject: Remove newline from split lines as it breaks more than it fixes

---
 python/scriptingprovider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index 6b03d49e..c92c249a 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -548,7 +548,7 @@ class PythonScriptingInstance(ScriptingInstance):
 							self.locals["current_mlil"] = self.active_func.medium_level_il
 
 						for line in code.split("\n"):
-							self.interpreter.push(line + "\n")
+							self.interpreter.push(line)
 
 						if self.locals["here"] != self.active_addr:
 							if not self.active_view.file.navigate(self.active_view.file.view, self.locals["here"]):
-- 
cgit v1.3.1