Revamp Python regression tests suite (#2022)

* Fix Python regression test suite (partial)

* Fix Python regression test suite

* Add a test for mapping at high addresses

* Add ctl tests

tests/regress/mips_branch_delay.py

@@ -1,8 +1,19 @@
 #!/usr/bin/python
+
+import regress
+
 from capstone import *
 from unicorn import *
 
-import regress
+
+CODE = (
+	b'\x00\x00\xa4\x12'     #  beq $a0, $s5, 0x4008a0
+    b'\x6a\x00\x82\x28'     #  slti $v0, $a0, 0x6a
+    b'\x00\x00\x00\x00'     #  nop
+)
+
+BASE = 0x400000
+
 
 class MipsBranchDelay(regress.RegressTest):
 
@@ -10,27 +21,24 @@ class MipsBranchDelay(regress.RegressTest):
         md = Cs(CS_ARCH_MIPS, CS_MODE_MIPS32 + CS_MODE_LITTLE_ENDIAN)
 
         def disas(code, addr):
-            for i in md.disasm(code, addr):
-                print '0x%x: %s %-6s %s' % (i.address, str(i.bytes).encode('hex'), i.mnemonic, i.op_str)
+            for insn in md.disasm(code, addr):
+                regress.logger.debug('%#x: %-8s %s', insn.address, insn.mnemonic, insn.op_str)
 
         def hook_code(uc, addr, size, _):
-            mem = str(uc.mem_read(addr, size))
-            disas(mem, addr)
+            disas(uc.mem_read(addr, size), addr)
 
-        CODE = 0x400000
-        asm = '0000a4126a00822800000000'.decode('hex') # beq $a0, $s5, 0x4008a0; slti   $v0, $a0, 0x6a; nop
+        regress.logger.debug('Input instructions:')
+        disas(CODE, BASE)
 
-        print 'Input instructions:'
-        disas(asm, CODE)
-        print
-
-        print 'Hooked instructions:'
+        regress.logger.debug('Hooked instructions:')
 
         uc = Uc(UC_ARCH_MIPS, UC_MODE_MIPS32 + UC_MODE_LITTLE_ENDIAN)
         uc.hook_add(UC_HOOK_CODE, hook_code)
-        uc.mem_map(CODE, 0x1000)
-        uc.mem_write(CODE, asm)
-        self.assertEqual(None, uc.emu_start(CODE, CODE + len(asm)))
+        uc.mem_map(BASE, 0x1000)
+        uc.mem_write(BASE, CODE)
+
+        self.assertEqual(None, uc.emu_start(BASE, BASE + len(CODE)))
+
 
 if __name__ == '__main__':
     regress.main()