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 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'architecture.cpp')

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);
-- 
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 'architecture.cpp')

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