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/leaked_refs.py

@@ -1,63 +1,74 @@
 #!/usr/bin/python
 
-from __future__ import print_function
-
-import time
+import gc
+import regress
+import weakref
 
 from unicorn import *
 from unicorn.x86_const import *
 
-import objgraph
-
-import regress
 
 ADDRESS = 0x8048000
 STACK_ADDRESS = 0xffff000
-STACK_SIZE = 4096
-'''
-31 DB           xor ebx, ebx
-53              push ebx
-43              inc ebx
-53              push ebx
-6A 02           push 2
-6A 66           push 66h
-58              pop eax
-89 E1           mov ecx, esp
-CD 80           int 80h
-'''
-CODE = "\x31\xDB\x53\x43\x53\x6A\x02\x6A\x66\x58\x89\xE1\xCD\x80"
+STACK_SIZE = 0x1000
+
+CODE = (
+    b"\x31\xDB"     #  xor      ebx, ebx
+    b"\x53"         #  push     ebx
+    b"\x43"         #  inc      ebx
+    b"\x53"         #  push     ebx
+    b"\x6A\x02"     #  push     2
+    b"\x6A\x66"     #  push     66h
+    b"\x58"         #  pop      eax
+    b"\x89\xE1"     #  mov      ecx, esp
+    b"\xCD\x80"     #  int      80h
+)
+
 EP = ADDRESS + 0x54
 
+
+# Dictionary to keep weak references to instances
+instances = weakref.WeakValueDictionary()
+
+def create_instance(key, *args, **kwargs):
+    obj = Uc(*args, **kwargs)
+    instances[key] = obj
+
+    return obj
+
+
 def hook_code(mu, address, size, user_data):
-        print(">>> Tracing instruction at 0x%x, instruction size = %u" %(address, size))
-        
-def emu_loop():
-    emu = Uc(UC_ARCH_X86, UC_MODE_32)
+    regress.logger.debug(">>> Tracing instruction at %#x, instruction size = %u", address, size)
+
+
+def emu_loop(key):
+    emu = create_instance(key, UC_ARCH_X86, UC_MODE_32)
     emu.mem_map(ADDRESS, 0x1000)
     emu.mem_write(EP, CODE)
 
     emu.mem_map(STACK_ADDRESS, STACK_SIZE)
     emu.reg_write(UC_X86_REG_ESP, STACK_ADDRESS + STACK_SIZE)
-    
+
     i = emu.hook_add(UC_HOOK_CODE, hook_code, None)
     emu.hook_del(i)
-    
+
     emu.emu_start(EP, EP + len(CODE), count = 3)
-    print("EIP: 0x%x" % emu.reg_read(UC_X86_REG_EIP))
+    regress.logger.debug("EIP: %#x", emu.reg_read(UC_X86_REG_EIP))
+
 
 def debugMem():
-    import gc
     gc.collect()  # don't care about stuff that would be garbage collected properly
-    #print("Orphaned objects in gc.garbage:", gc.garbage)
-    assert(len(objgraph.by_type("Uc")) == 0)
-    #assert(len(objgraph.get_leaking_objects()) == 0)
+
+    assert(len(instances) == 0)
+
 
 class EmuLoopReferenceTest(regress.RegressTest):
     def runTest(self):
         for i in range(5):
-            emu_loop()
+            emu_loop('obj%d' % i)
+
         debugMem()
 
 
 if __name__ == '__main__':
-    regress.main()
+    regress.main()