diff options
Diffstat (limited to 'test/arch/mep/jit/ut_helpers_jit.py')
| -rw-r--r-- | test/arch/mep/jit/ut_helpers_jit.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/arch/mep/jit/ut_helpers_jit.py b/test/arch/mep/jit/ut_helpers_jit.py index 590c534f..0c756e39 100644 --- a/test/arch/mep/jit/ut_helpers_jit.py +++ b/test/arch/mep/jit/ut_helpers_jit.py @@ -1,19 +1,21 @@ # Toshiba MeP-c4 - unit tests helpers # Guillaume Valadon <guillaume@valadon.net> -from miasm2.analysis.machine import Machine -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE +from __future__ import print_function + +from miasm.analysis.machine import Machine +from miasm.jitter.csts import PAGE_READ, PAGE_WRITE def jit_instructions(mn_str): """JIT instructions and return the jitter object.""" - # Get the miasm2 Machine + # Get the miasm Machine machine = Machine("mepb") mn_mep = machine.mn() # Assemble the instructions - asm = "" + asm = b"" for instr_str in mn_str.split("\n"): instr = mn_mep.fromstring(instr_str, "b") instr.mode = "b" @@ -40,10 +42,10 @@ def launch_tests(obj): test_methods = [name for name in dir(obj) if name.startswith("test")] for method in test_methods: - print method + print(method) try: getattr(obj, method)() except AttributeError as e: - print "Method not found: %s" % method + print("Method not found: %s" % method) assert(False) - print '-' * 42 + print('-' * 42) |