Changelog: bv.write and bv.insert require a bytes object in python3 Architecture.assemble outputs a bytes object in python3, a str in python2 Architecture.assemble will throw a value error if it cannot assemble the given instruction API install script should be run in the version of python you want it installed in Fundamental python changes to be aware of: Unicode-type strings are now just str, consequently anything that came out as a unicode string before (annotations) are now just str. Longs no longer exist. They're just ints.
Diffstat (limited to 'python/demangle.py')
-rw-r--r--python/demangle.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/python/demangle.py b/python/demangle.py
index 11673263..466324bc 100644
--- a/python/demangle.py
+++ b/python/demangle.py
@@ -21,8 +21,10 @@
import ctypes
# Binary Ninja components
-import _binaryninjacore as core
-import types
+from binaryninja import _binaryninjacore as core
+
+# 2-3 compatibility
+from binaryninja import range
def get_qualified_name(names):
@@ -56,26 +58,28 @@ def demangle_ms(arch, mangled_name):
(<type: public: static enum Foobar::foo __cdecl (enum Foobar::foo)>, ['Foobar', 'testf'])
>>>
"""
+ from binaryninja import types
handle = ctypes.POINTER(core.BNType)()
outName = ctypes.POINTER(ctypes.c_char_p)()
outSize = ctypes.c_ulonglong()
names = []
if core.BNDemangleMS(arch.handle, mangled_name, ctypes.byref(handle), ctypes.byref(outName), ctypes.byref(outSize)):
- for i in xrange(outSize.value):
- names.append(outName[i])
+ for i in range(outSize.value):
+ names.append(outName[i].decode('charmap'))
core.BNFreeDemangledName(ctypes.byref(outName), outSize.value)
return (types.Type(handle), names)
return (None, mangled_name)
def demangle_gnu3(arch, mangled_name):
+ from binaryninja import types
handle = ctypes.POINTER(core.BNType)()
outName = ctypes.POINTER(ctypes.c_char_p)()
outSize = ctypes.c_ulonglong()
names = []
if core.BNDemangleGNU3(arch.handle, mangled_name, ctypes.byref(handle), ctypes.byref(outName), ctypes.byref(outSize)):
- for i in xrange(outSize.value):
- names.append(outName[i])
+ for i in range(outSize.value):
+ names.append(outName[i].decode('charmap'))
core.BNFreeDemangledName(ctypes.byref(outName), outSize.value)
if not handle:
return (None, names)