about summary refs log tree commit diff stats
path: root/test/jitter/bad_block.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2019-03-07 14:37:07 +0100
committerGitHub <noreply@github.com>2019-03-07 14:37:07 +0100
commit4c2320b46250a8d6f8774e1218544b72a154cd8e (patch)
treeb67e7b072439f84109bd39dad8ed7f3f135224f8 /test/jitter/bad_block.py
parenteab809932871f91d6f4aa770fc321af9e156e0f5 (diff)
parent26c1075723a02984da6d3bc7423c5c0c43082dc3 (diff)
downloadmiasm-4c2320b46250a8d6f8774e1218544b72a154cd8e.tar.gz
miasm-4c2320b46250a8d6f8774e1218544b72a154cd8e.zip
Merge pull request #990 from serpilliere/support_python2_python3
Support python2 python3
Diffstat (limited to 'test/jitter/bad_block.py')
-rw-r--r--test/jitter/bad_block.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/jitter/bad_block.py b/test/jitter/bad_block.py
index ae11e696..256d2388 100644
--- a/test/jitter/bad_block.py
+++ b/test/jitter/bad_block.py
@@ -1,6 +1,7 @@
 import sys
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_UNK_MNEMO
-from miasm2.analysis.machine import Machine
+from miasm.core.utils import decode_hex
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_UNK_MNEMO
+from miasm.analysis.machine import Machine
 
 def code_sentinelle(jitter):
     jitter.run = False
@@ -15,7 +16,7 @@ jitter.init_stack()
 # nop
 # mov eax, 0x42
 # XX
-data = "90b842000000ffff90909090".decode('hex')
+data = decode_hex("90b842000000ffff90909090")
 
 # Will raise memory error at 0x40000006