addition 3 compatibility changes

1 files changed, 48 insertions, 48 deletions

diff --git a/python/architecture.py b/python/architecture.py
index a705f2d9..b99da184 100644
--- a/python/architecture.py
+++ b/python/architecture.py
@@ -38,7 +38,7 @@ from binaryninja import callingconvention
 
 # 2-3 compatibility
 from six import with_metaclass
-
+from six.moves import range
 
 class _ArchitectureMetaClass(type):
 
@@ -48,7 +48,7 @@ class _ArchitectureMetaClass(type):
 		count = ctypes.c_ulonglong()
 		archs = core.BNGetArchitectureList(count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			result.append(CoreArchitecture._from_cache(archs[i]))
 		core.BNFreeArchitectureList(archs)
 		return result
@@ -58,7 +58,7 @@ class _ArchitectureMetaClass(type):
 		count = ctypes.c_ulonglong()
 		archs = core.BNGetArchitectureList(count)
 		try:
-			for i in xrange(0, count.value):
+			for i in range(0, count.value):
 				yield CoreArchitecture._from_cache(archs[i])
 		finally:
 			core.BNFreeArchitectureList(archs)
@@ -369,7 +369,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		for intrinsic in self.__class__.intrinsics.keys():
 			if intrinsic not in self._intrinsics:
 				info = self.__class__.intrinsics[intrinsic]
-				for i in xrange(0, len(info.inputs)):
+				for i in range(0, len(info.inputs)):
 					if isinstance(info.inputs[i], types.Type):
 						info.inputs[i] = binaryninja.function.IntrinsicInput(info.inputs[i])
 					elif isinstance(info.inputs[i], tuple):
@@ -406,7 +406,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		count = ctypes.c_ulonglong()
 		regs = core.BNGetFullWidthArchitectureRegisters(self.handle, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			result.append(core.BNGetArchitectureRegisterName(self.handle, regs[i]))
 		core.BNFreeRegisterList(regs)
 		return result
@@ -417,7 +417,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		count = ctypes.c_ulonglong()
 		cc = core.BNGetArchitectureCallingConventions(self.handle, count)
 		result = {}
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			obj = callingconvention.CallingConvention(handle=core.BNNewCallingConventionReference(cc[i]))
 			result[obj.name] = obj
 		core.BNFreeCallingConventionList(cc, count)
@@ -508,7 +508,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			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)):
+			for i in range(0, len(info.branches)):
 				if isinstance(info.branches[i].type, str):
 					result[0].branchType[i] = BranchType[info.branches[i].type]
 				else:
@@ -534,7 +534,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			length[0] = info[1]
 			count[0] = len(tokens)
 			token_buf = (core.BNInstructionTextToken * len(tokens))()
-			for i in xrange(0, len(tokens)):
+			for i in range(0, len(tokens)):
 				if isinstance(tokens[i].type, str):
 					token_buf[i].type = InstructionTextTokenType[tokens[i].type]
 				else:
@@ -627,7 +627,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			regs = self._full_width_regs.values()
 			count[0] = len(regs)
 			reg_buf = (ctypes.c_uint * len(regs))()
-			for i in xrange(0, len(regs)):
+			for i in range(0, len(regs)):
 				reg_buf[i] = regs[i]
 			result = ctypes.cast(reg_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, reg_buf)
@@ -642,7 +642,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			regs = self._regs_by_index.keys()
 			count[0] = len(regs)
 			reg_buf = (ctypes.c_uint * len(regs))()
-			for i in xrange(0, len(regs)):
+			for i in range(0, len(regs)):
 				reg_buf[i] = regs[i]
 			result = ctypes.cast(reg_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, reg_buf)
@@ -657,7 +657,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			flags = self._flags_by_index.keys()
 			count[0] = len(flags)
 			flag_buf = (ctypes.c_uint * len(flags))()
-			for i in xrange(0, len(flags)):
+			for i in range(0, len(flags)):
 				flag_buf[i] = flags[i]
 			result = ctypes.cast(flag_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, flag_buf)
@@ -672,7 +672,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			write_types = self._flag_write_types_by_index.keys()
 			count[0] = len(write_types)
 			type_buf = (ctypes.c_uint * len(write_types))()
-			for i in xrange(0, len(write_types)):
+			for i in range(0, len(write_types)):
 				type_buf[i] = write_types[i]
 			result = ctypes.cast(type_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, type_buf)
@@ -687,7 +687,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			sem_classes = self._semantic_flag_classes_by_index.keys()
 			count[0] = len(sem_classes)
 			class_buf = (ctypes.c_uint * len(sem_classes))()
-			for i in xrange(0, len(sem_classes)):
+			for i in range(0, len(sem_classes)):
 				class_buf[i] = sem_classes[i]
 			result = ctypes.cast(class_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, class_buf)
@@ -702,7 +702,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			sem_groups = self._semantic_flag_groups_by_index.keys()
 			count[0] = len(sem_groups)
 			group_buf = (ctypes.c_uint * len(sem_groups))()
-			for i in xrange(0, len(sem_groups)):
+			for i in range(0, len(sem_groups)):
 				group_buf[i] = sem_groups[i]
 			result = ctypes.cast(group_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, group_buf)
@@ -735,7 +735,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				flags.append(self._flags[name])
 			count[0] = len(flags)
 			flag_buf = (ctypes.c_uint * len(flags))()
-			for i in xrange(0, len(flags)):
+			for i in range(0, len(flags)):
 				flag_buf[i] = flags[i]
 			result = ctypes.cast(flag_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, flag_buf)
@@ -753,7 +753,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				flags = []
 			count[0] = len(flags)
 			flag_buf = (ctypes.c_uint * len(flags))()
-			for i in xrange(0, len(flags)):
+			for i in range(0, len(flags)):
 				flag_buf[i] = flags[i]
 			result = ctypes.cast(flag_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, flag_buf)
@@ -801,7 +801,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				flags = []
 			count[0] = len(flags)
 			flag_buf = (ctypes.c_uint * len(flags))()
-			for i in xrange(0, len(flags)):
+			for i in range(0, len(flags)):
 				flag_buf[i] = flags[i]
 			result = ctypes.cast(flag_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, flag_buf)
@@ -828,7 +828,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				write_type_name = self._flag_write_types_by_index[write_type]
 			flag_name = self._flags_by_index[flag]
 			operand_list = []
-			for i in xrange(operand_count):
+			for i in range(operand_count):
 				if operands[i].constant:
 					operand_list.append(operands[i].value)
 				elif lowlevelil.LLIL_REG_IS_TEMP(operands[i].reg):
@@ -917,7 +917,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		try:
 			count[0] = len(self.global_regs)
 			reg_buf = (ctypes.c_uint * len(self.global_regs))()
-			for i in xrange(0, len(self.global_regs)):
+			for i in range(0, len(self.global_regs)):
 				reg_buf[i] = self._all_regs[self.global_regs[i]]
 			result = ctypes.cast(reg_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, reg_buf)
@@ -941,7 +941,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			regs = self._reg_stacks_by_index.keys()
 			count[0] = len(regs)
 			reg_buf = (ctypes.c_uint * len(regs))()
-			for i in xrange(0, len(regs)):
+			for i in range(0, len(regs)):
 				reg_buf[i] = regs[i]
 			result = ctypes.cast(reg_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, reg_buf)
@@ -992,7 +992,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			regs = self._intrinsics_by_index.keys()
 			count[0] = len(regs)
 			reg_buf = (ctypes.c_uint * len(regs))()
-			for i in xrange(0, len(regs)):
+			for i in range(0, len(regs)):
 				reg_buf[i] = regs[i]
 			result = ctypes.cast(reg_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, reg_buf)
@@ -1008,7 +1008,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				inputs = self._intrinsics_by_index[intrinsic][1].inputs
 				count[0] = len(inputs)
 				input_buf = (core.BNNameAndType * len(inputs))()
-				for i in xrange(0, len(inputs)):
+				for i in range(0, len(inputs)):
 					input_buf[i].name = inputs[i].name
 					input_buf[i].type = core.BNNewTypeReference(inputs[i].type.handle)
 					input_buf[i].typeConfidence = inputs[i].type.confidence
@@ -1029,7 +1029,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				raise ValueError("freeing name and type list that wasn't allocated")
 			name_and_types = self._pending_name_and_type_lists[buf.value][1]
 			count = self._pending_name_and_type_lists[buf.value][2]
-			for i in xrange(0, count):
+			for i in range(0, count):
 				core.BNFreeType(name_and_types[i].type)
 			del self._pending_name_and_type_lists[buf.value]
 		except (ValueError, KeyError):
@@ -1041,7 +1041,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				outputs = self._intrinsics_by_index[intrinsic][1].outputs
 				count[0] = len(outputs)
 				output_buf = (core.BNTypeWithConfidence * len(outputs))()
-				for i in xrange(0, len(outputs)):
+				for i in range(0, len(outputs)):
 					output_buf[i].type = core.BNNewTypeReference(outputs[i].handle)
 					output_buf[i].confidence = outputs[i].confidence
 				result = ctypes.cast(output_buf, ctypes.c_void_p)
@@ -1061,7 +1061,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 				raise ValueError("freeing type list that wasn't allocated")
 			types = self._pending_type_lists[buf.value][1]
 			count = self._pending_type_lists[buf.value][2]
-			for i in xrange(0, count):
+			for i in range(0, count):
 				core.BNFreeType(types[i].type)
 			del self._pending_type_lists[buf.value]
 		except (ValueError, KeyError):
@@ -1710,7 +1710,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		:rtype: LowLevelILExpr index
 		"""
 		operand_list = (core.BNRegisterOrConstant * len(operands))()
-		for i in xrange(len(operands)):
+		for i in range(len(operands)):
 			if isinstance(operands[i], str):
 				operand_list[i].constant = False
 				operand_list[i].reg = self.regs[operands[i]].index
@@ -1765,7 +1765,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		count = ctypes.c_ulonglong()
 		regs = core.BNGetModifiedArchitectureRegistersOnWrite(self.handle, reg, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			result.append(core.BNGetArchitectureRegisterName(self.handle, regs[i]))
 		core.BNFreeRegisterList(regs)
 		return result
@@ -2074,7 +2074,7 @@ class CoreArchitecture(Architecture):
 		self._regs_by_index = {}
 		self._full_width_regs = {}
 		self.__dict__["regs"] = {}
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureRegisterName(self.handle, regs[i])
 			info = core.BNGetArchitectureRegisterInfo(self.handle, regs[i])
 			full_width_reg = core.BNGetArchitectureRegisterName(self.handle, info.fullWidthRegister)
@@ -2082,7 +2082,7 @@ class CoreArchitecture(Architecture):
 				ImplicitRegisterExtend(info.extend), regs[i])
 			self._all_regs[name] = regs[i]
 			self._regs_by_index[regs[i]] = name
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			info = core.BNGetArchitectureRegisterInfo(self.handle, regs[i])
 			full_width_reg = core.BNGetArchitectureRegisterName(self.handle, info.fullWidthRegister)
 			if full_width_reg not in self._full_width_regs:
@@ -2094,7 +2094,7 @@ class CoreArchitecture(Architecture):
 		self._flags = {}
 		self._flags_by_index = {}
 		self.__dict__["flags"] = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureFlagName(self.handle, flags[i])
 			self._flags[name] = flags[i]
 			self._flags_by_index[flags[i]] = name
@@ -2106,7 +2106,7 @@ class CoreArchitecture(Architecture):
 		self._flag_write_types = {}
 		self._flag_write_types_by_index = {}
 		self.__dict__["flag_write_types"] = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureFlagWriteTypeName(self.handle, write_types[i])
 			self._flag_write_types[name] = write_types[i]
 			self._flag_write_types_by_index[write_types[i]] = name
@@ -2118,7 +2118,7 @@ class CoreArchitecture(Architecture):
 		self._semantic_flag_classes = {}
 		self._semantic_flag_classes_by_index = {}
 		self.__dict__["semantic_flag_classes"] = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureSemanticFlagClassName(self.handle, sem_classes[i])
 			self._semantic_flag_classes[name] = sem_classes[i]
 			self._semantic_flag_classes_by_index[sem_classes[i]] = name
@@ -2130,7 +2130,7 @@ class CoreArchitecture(Architecture):
 		self._semantic_flag_groups = {}
 		self._semantic_flag_groups_by_index = {}
 		self.__dict__["semantic_flag_groups"] = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureSemanticFlagGroupName(self.handle, sem_groups[i])
 			self._semantic_flag_groups[name] = sem_groups[i]
 			self._semantic_flag_groups_by_index[sem_groups[i]] = name
@@ -2149,7 +2149,7 @@ class CoreArchitecture(Architecture):
 			count = ctypes.c_ulonglong()
 			flags = core.BNGetArchitectureFlagsRequiredForFlagCondition(self.handle, cond, 0, count)
 			flag_names = []
-			for i in xrange(0, count.value):
+			for i in range(0, count.value):
 				flag_names.append(self._flags_by_index[flags[i]])
 			core.BNFreeRegisterList(flags)
 			self.__dict__["flags_required_for_flag_condition"][cond] = flag_names
@@ -2162,7 +2162,7 @@ class CoreArchitecture(Architecture):
 				self._semantic_flag_groups[group], count)
 			flag_indexes = []
 			flag_names = []
-			for i in xrange(0, count.value):
+			for i in range(0, count.value):
 				flag_indexes.append(flags[i])
 				flag_names.append(self._flags_by_index[flags[i]])
 			core.BNFreeRegisterList(flags)
@@ -2177,7 +2177,7 @@ class CoreArchitecture(Architecture):
 				self._semantic_flag_groups[group], count)
 			class_index_cond = {}
 			class_cond = {}
-			for i in xrange(0, count.value):
+			for i in range(0, count.value):
 				class_index_cond[conditions[i].semanticClass] = conditions[i].condition
 				if conditions[i].semanticClass == 0:
 					class_cond[None] = conditions[i].condition
@@ -2195,7 +2195,7 @@ class CoreArchitecture(Architecture):
 				self._flag_write_types[write_type], count)
 			flag_indexes = []
 			flag_names = []
-			for i in xrange(0, count.value):
+			for i in range(0, count.value):
 				flag_indexes.append(flags[i])
 				flag_names.append(self._flags_by_index[flags[i]])
 			core.BNFreeRegisterList(flags)
@@ -2217,7 +2217,7 @@ class CoreArchitecture(Architecture):
 		count = ctypes.c_ulonglong()
 		regs = core.BNGetArchitectureGlobalRegisters(self.handle, count)
 		self.__dict__["global_regs"] = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			self.global_regs.append(core.BNGetArchitectureRegisterName(self.handle, regs[i]))
 		core.BNFreeRegisterList(regs)
 
@@ -2226,14 +2226,14 @@ class CoreArchitecture(Architecture):
 		self._all_reg_stacks = {}
 		self._reg_stacks_by_index = {}
 		self.__dict__["reg_stacks"] = {}
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureRegisterStackName(self.handle, regs[i])
 			info = core.BNGetArchitectureRegisterStackInfo(self.handle, regs[i])
 			storage = []
-			for j in xrange(0, info.storageCount):
+			for j in range(0, info.storageCount):
 				storage.append(core.BNGetArchitectureRegisterName(self.handle, info.firstStorageReg + j))
 			top_rel = []
-			for j in xrange(0, info.topRelativeCount):
+			for j in range(0, info.topRelativeCount):
 				top_rel.append(core.BNGetArchitectureRegisterName(self.handle, info.firstTopRelativeReg + j))
 			top = core.BNGetArchitectureRegisterName(self.handle, info.stackTopReg)
 			self.reg_stacks[name] = binaryninja.function.RegisterStackInfo(storage, top_rel, top, regs[i])
@@ -2246,12 +2246,12 @@ class CoreArchitecture(Architecture):
 		self._intrinsics = {}
 		self._intrinsics_by_index = {}
 		self.__dict__["intrinsics"] = {}
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			name = core.BNGetArchitectureIntrinsicName(self.handle, intrinsics[i])
 			input_count = ctypes.c_ulonglong()
 			inputs = core.BNGetArchitectureIntrinsicInputs(self.handle, intrinsics[i], input_count)
 			input_list = []
-			for j in xrange(0, input_count.value):
+			for j in range(0, input_count.value):
 				input_name = inputs[j].name
 				type_obj = types.Type(core.BNNewTypeReference(inputs[j].type), confidence = inputs[j].typeConfidence)
 				input_list.append(binaryninja.function.IntrinsicInput(type_obj, input_name))
@@ -2259,7 +2259,7 @@ class CoreArchitecture(Architecture):
 			output_count = ctypes.c_ulonglong()
 			outputs = core.BNGetArchitectureIntrinsicOutputs(self.handle, intrinsics[i], output_count)
 			output_list = []
-			for j in xrange(0, output_count.value):
+			for j in range(0, output_count.value):
 				output_list.append(types.Type(core.BNNewTypeReference(outputs[j].type), confidence = outputs[j].confidence))
 			core.BNFreeOutputTypeList(outputs, output_count.value)
 			self.intrinsics[name] = binaryninja.function.IntrinsicInfo(input_list, output_list)
@@ -2303,7 +2303,7 @@ class CoreArchitecture(Architecture):
 		result.length = info.length
 		result.arch_transition_by_target_addr = info.archTransitionByTargetAddr
 		result.branch_delay = info.branchDelay
-		for i in xrange(0, info.branchCount):
+		for i in range(0, info.branchCount):
 			target = info.branchTarget[i]
 			if info.branchArch[i]:
 				arch = CoreArchitecture._from_cache(info.branchArch[i])
@@ -2332,7 +2332,7 @@ class CoreArchitecture(Architecture):
 		if not core.BNGetInstructionText(self.handle, buf, addr, length, tokens, count):
 			return None, 0
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			token_type = InstructionTextTokenType(tokens[i].type)
 			text = tokens[i].text
 			value = tokens[i].value
@@ -2379,7 +2379,7 @@ class CoreArchitecture(Architecture):
 		"""
 		flag = self.get_flag_index(flag)
 		operand_list = (core.BNRegisterOrConstant * len(operands))()
-		for i in xrange(len(operands)):
+		for i in range(len(operands)):
 			if isinstance(operands[i], str):
 				operand_list[i].constant = False
 				operand_list[i].reg = self.regs[operands[i]].index
@@ -2664,7 +2664,7 @@ class CoreArchitecture(Architecture):
 		count = ctypes.c_ulonglong()
 		flags = core.BNGetArchitectureFlagsRequiredForFlagCondition(self.handle, cond, sem_class, count)
 		flag_names = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			flag_names.append(self._flags_by_index[flags[i]])
 		core.BNFreeRegisterList(flags)
 		return flag_names