[llvm-commits] [llvm] r169102 - in /llvm/trunk/bindings/python/llvm: disassembler.py tests/test_disassembler.py

[Gregory Szorc]

Author: gps
Date: Sat Dec  1 15:57:30 2012
New Revision: 169102

URL: http://llvm.org/viewvc/llvm-project?rev=169102&view=rev
Log:
[python] Add markup option to disassembler

Patch contributed by Wladimir J. van der Laan <laanwj at gmail.com>

Modified:
    llvm/trunk/bindings/python/llvm/disassembler.py
    llvm/trunk/bindings/python/llvm/tests/test_disassembler.py

Modified: llvm/trunk/bindings/python/llvm/disassembler.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/python/llvm/disassembler.py?rev=169102&r1=169101&r2=169102&view=diff
==============================================================================
--- llvm/trunk/bindings/python/llvm/disassembler.py (original)
+++ llvm/trunk/bindings/python/llvm/disassembler.py Sat Dec  1 15:57:30 2012
@@ -31,6 +31,9 @@
 lib = get_library()
 callbacks = {}
 
+# Constants for set_options
+Option_UseMarkup = 1
+
 class Disassembler(LLVMObject):
     """Represents a disassembler instance.
 
@@ -113,6 +116,10 @@
             address += result
             offset += result
 
+    def set_options(self, options):
+        if not lib.LLVMSetDisasmOptions(self, options):
+            raise Exception('Unable to set all disassembler options in %i' % options)
+
 
 def register_library(library):
     library.LLVMCreateDisasm.argtypes = [c_char_p, c_void_p, c_int,
@@ -125,6 +132,10 @@
             c_uint64, c_uint64, c_char_p, c_size_t]
     library.LLVMDisasmInstruction.restype = c_size_t
 
+    library.LLVMSetDisasmOptions.argtypes = [Disassembler, c_uint64]
+    library.LLVMSetDisasmOptions.restype = c_int
+
+
 callbacks['op_info'] = CFUNCTYPE(c_int, c_void_p, c_uint64, c_uint64, c_uint64,
                                  c_int, c_void_p)
 callbacks['symbol_lookup'] = CFUNCTYPE(c_char_p, c_void_p, c_uint64,

Modified: llvm/trunk/bindings/python/llvm/tests/test_disassembler.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/python/llvm/tests/test_disassembler.py?rev=169102&r1=169101&r2=169102&view=diff
==============================================================================
--- llvm/trunk/bindings/python/llvm/tests/test_disassembler.py (original)
+++ llvm/trunk/bindings/python/llvm/tests/test_disassembler.py Sat Dec  1 15:57:30 2012
@@ -1,6 +1,6 @@
 from .base import TestBase
 
-from ..disassembler import Disassembler
+from ..disassembler import Disassembler, Option_UseMarkup
 
 class TestDisassembler(TestBase):
     def test_instantiate(self):
@@ -26,3 +26,14 @@
 
         self.assertEqual(instructions[0], (0, 3, '\tjcxz\t-127'))
         self.assertEqual(instructions[1], (3, 2, '\taddl\t%eax, %edi'))
+
+    def test_set_options(self):
+        sequence = '\x10\x40\x2d\xe9'
+        triple = 'arm-linux-android'
+
+        disassembler = Disassembler(triple)
+        disassembler.set_options(Option_UseMarkup)
+        count, s = disassembler.get_instruction(sequence)
+        print s
+        self.assertEqual(count, 4)
+        self.assertEqual(s, '\tpush\t{<reg:r4>, <reg:lr>}')