diff options
Diffstat (limited to '')
40 files changed, 119 insertions, 119 deletions
diff --git a/test/arch/aarch64/arch.py b/test/arch/aarch64/arch.py index 948ee489..70a44053 100644 --- a/test/arch/aarch64/arch.py +++ b/test/arch/aarch64/arch.py @@ -2,9 +2,9 @@ from __future__ import print_function import sys import time from pdb import pm -from miasm2.core.utils import decode_hex -from miasm2.arch.aarch64.arch import * -from miasm2.core.locationdb import LocationDB +from miasm.core.utils import decode_hex +from miasm.arch.aarch64.arch import * +from miasm.core.locationdb import LocationDB loc_db = LocationDB() diff --git a/test/arch/aarch64/unit/asm_test.py b/test/arch/aarch64/unit/asm_test.py index e49a2a62..65a537a0 100644 --- a/test/arch/aarch64/unit/asm_test.py +++ b/test/arch/aarch64/unit/asm_test.py @@ -3,13 +3,13 @@ import os from future.utils import viewitems -from miasm2.arch.aarch64.arch import mn_aarch64, base_expr, variable -from miasm2.core import parse_asm -from miasm2.expression.expression import * -from miasm2.core import asmblock +from miasm.arch.aarch64.arch import mn_aarch64, base_expr, variable +from miasm.core import parse_asm +from miasm.expression.expression import * +from miasm.core import asmblock from elfesteem.strpatchwork import StrPatchwork -from miasm2.analysis.machine import Machine -from miasm2.jitter.csts import * +from miasm.analysis.machine import Machine +from miasm.jitter.csts import * reg_and_id = dict(mn_aarch64.regs.all_regs_ids_byname) diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py index bf2b1a02..c8f2d433 100644 --- a/test/arch/arm/arch.py +++ b/test/arch/arm/arch.py @@ -1,9 +1,9 @@ from __future__ import print_function import time -from miasm2.core.utils import decode_hex, encode_hex -from miasm2.arch.arm.arch import * -from miasm2.core.locationdb import LocationDB +from miasm.core.utils import decode_hex, encode_hex +from miasm.arch.arm.arch import * +from miasm.core.locationdb import LocationDB from pdb import pm diff --git a/test/arch/arm/sem.py b/test/arch/arm/sem.py index 9c19431b..f38d48e9 100755 --- a/test/arch/arm/sem.py +++ b/test/arch/arm/sem.py @@ -7,12 +7,12 @@ import logging from future.utils import viewitems -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.arch.arm.arch import mn_arm as mn -from miasm2.arch.arm.sem import ir_arml as ir_arch -from miasm2.arch.arm.regs import * -from miasm2.expression.expression import * -from miasm2.core.locationdb import LocationDB +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.arch.arm.arch import mn_arm as mn +from miasm.arch.arm.sem import ir_arml as ir_arch +from miasm.arch.arm.regs import * +from miasm.expression.expression import * +from miasm.core.locationdb import LocationDB from pdb import pm logging.getLogger('cpuhelper').setLevel(logging.ERROR) diff --git a/test/arch/mep/asm/test_asm.py b/test/arch/mep/asm/test_asm.py index 217def86..7762669a 100644 --- a/test/arch/mep/asm/test_asm.py +++ b/test/arch/mep/asm/test_asm.py @@ -2,8 +2,8 @@ # Guillaume Valadon <guillaume@valadon.net> from __future__ import print_function -from miasm2.core.utils import decode_hex, encode_hex -from miasm2.arch.mep.arch import mn_mep +from miasm.core.utils import decode_hex, encode_hex +from miasm.arch.mep.arch import mn_mep class TestMisc(object): diff --git a/test/arch/mep/asm/ut_helpers_asm.py b/test/arch/mep/asm/ut_helpers_asm.py index 26520787..9f6dc5c2 100644 --- a/test/arch/mep/asm/ut_helpers_asm.py +++ b/test/arch/mep/asm/ut_helpers_asm.py @@ -5,11 +5,11 @@ from __future__ import print_function from builtins import range -from miasm2.core.utils import decode_hex, encode_hex -from miasm2.arch.mep.arch import mn_mep -from miasm2.core.cpu import Disasm_Exception -from miasm2.core.locationdb import LocationDB -from miasm2.expression.expression import ExprId, ExprInt, ExprLoc +from miasm.core.utils import decode_hex, encode_hex +from miasm.arch.mep.arch import mn_mep +from miasm.core.cpu import Disasm_Exception +from miasm.core.locationdb import LocationDB +from miasm.expression.expression import ExprId, ExprInt, ExprLoc import re diff --git a/test/arch/mep/ir/test_arithmetic.py b/test/arch/mep/ir/test_arithmetic.py index 2e0dbf32..d404f51c 100644 --- a/test/arch/mep/ir/test_arithmetic.py +++ b/test/arch/mep/ir/test_arithmetic.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestArithmetic(object): diff --git a/test/arch/mep/ir/test_bitmanipulation.py b/test/arch/mep/ir/test_bitmanipulation.py index f4ea2f29..6ec200c5 100644 --- a/test/arch/mep/ir/test_bitmanipulation.py +++ b/test/arch/mep/ir/test_bitmanipulation.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprMem +from miasm.expression.expression import ExprId, ExprInt, ExprMem class TestBitManipulation(object): diff --git a/test/arch/mep/ir/test_branchjump.py b/test/arch/mep/ir/test_branchjump.py index 7e0953fd..828b172f 100644 --- a/test/arch/mep/ir/test_branchjump.py +++ b/test/arch/mep/ir/test_branchjump.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt +from miasm.expression.expression import ExprId, ExprInt class TestBranchJump(object): diff --git a/test/arch/mep/ir/test_control.py b/test/arch/mep/ir/test_control.py index 92dcb371..04c8b4d0 100644 --- a/test/arch/mep/ir/test_control.py +++ b/test/arch/mep/ir/test_control.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestControl(object): diff --git a/test/arch/mep/ir/test_coprocessor.py b/test/arch/mep/ir/test_coprocessor.py index e9829c08..bd8fd39c 100644 --- a/test/arch/mep/ir/test_coprocessor.py +++ b/test/arch/mep/ir/test_coprocessor.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprMem, ExprInt +from miasm.expression.expression import ExprId, ExprMem, ExprInt class TestCoprocessor(object): diff --git a/test/arch/mep/ir/test_debug.py b/test/arch/mep/ir/test_debug.py index b25e3a19..0c1026de 100644 --- a/test/arch/mep/ir/test_debug.py +++ b/test/arch/mep/ir/test_debug.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestDebug(object): diff --git a/test/arch/mep/ir/test_divide.py b/test/arch/mep/ir/test_divide.py index e3e4cb99..424a9876 100644 --- a/test/arch/mep/ir/test_divide.py +++ b/test/arch/mep/ir/test_divide.py @@ -3,8 +3,8 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp -from miasm2.jitter.csts import EXCEPT_DIV_BY_ZERO +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.jitter.csts import EXCEPT_DIV_BY_ZERO class TestDivide(object): diff --git a/test/arch/mep/ir/test_extension.py b/test/arch/mep/ir/test_extension.py index 10f16ebf..72ad8c22 100644 --- a/test/arch/mep/ir/test_extension.py +++ b/test/arch/mep/ir/test_extension.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprMem, ExprInt +from miasm.expression.expression import ExprId, ExprMem, ExprInt class TestExtension(object): diff --git a/test/arch/mep/ir/test_ir.py b/test/arch/mep/ir/test_ir.py index be717db8..be8e24e1 100644 --- a/test/arch/mep/ir/test_ir.py +++ b/test/arch/mep/ir/test_ir.py @@ -3,13 +3,13 @@ from __future__ import print_function -from miasm2.core.utils import decode_hex -from miasm2.arch.mep.arch import mn_mep -from miasm2.arch.mep.regs import regs_init -from miasm2.arch.mep.ira import ir_mepb, ir_a_mepb -from miasm2.expression.expression import ExprId, ExprInt, ExprMem -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.core.locationdb import LocationDB +from miasm.core.utils import decode_hex +from miasm.arch.mep.arch import mn_mep +from miasm.arch.mep.regs import regs_init +from miasm.arch.mep.ira import ir_mepb, ir_a_mepb +from miasm.expression.expression import ExprId, ExprInt, ExprMem +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.core.locationdb import LocationDB class TestMisc(object): diff --git a/test/arch/mep/ir/test_ldz.py b/test/arch/mep/ir/test_ldz.py index 668030c8..f14172b2 100644 --- a/test/arch/mep/ir/test_ldz.py +++ b/test/arch/mep/ir/test_ldz.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestLdz(object): diff --git a/test/arch/mep/ir/test_loadstore.py b/test/arch/mep/ir/test_loadstore.py index 22cb4304..87343fcb 100644 --- a/test/arch/mep/ir/test_loadstore.py +++ b/test/arch/mep/ir/test_loadstore.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprMem, ExprInt +from miasm.expression.expression import ExprId, ExprMem, ExprInt class TestLoadStore(object): diff --git a/test/arch/mep/ir/test_logical.py b/test/arch/mep/ir/test_logical.py index e78b5488..0e5aef76 100644 --- a/test/arch/mep/ir/test_logical.py +++ b/test/arch/mep/ir/test_logical.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestLogical(object): diff --git a/test/arch/mep/ir/test_move.py b/test/arch/mep/ir/test_move.py index 8da7a18a..30af1a74 100644 --- a/test/arch/mep/ir/test_move.py +++ b/test/arch/mep/ir/test_move.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprMem, ExprInt +from miasm.expression.expression import ExprId, ExprMem, ExprInt class TestMove(object): diff --git a/test/arch/mep/ir/test_multiply.py b/test/arch/mep/ir/test_multiply.py index 5673994c..065f1a59 100644 --- a/test/arch/mep/ir/test_multiply.py +++ b/test/arch/mep/ir/test_multiply.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestMultiply(object): diff --git a/test/arch/mep/ir/test_repeat.py b/test/arch/mep/ir/test_repeat.py index 1e0e2f86..e684ef87 100644 --- a/test/arch/mep/ir/test_repeat.py +++ b/test/arch/mep/ir/test_repeat.py @@ -3,7 +3,7 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp class TestRepeat(object): diff --git a/test/arch/mep/ir/test_shift.py b/test/arch/mep/ir/test_shift.py index 99755ba5..cac48660 100644 --- a/test/arch/mep/ir/test_shift.py +++ b/test/arch/mep/ir/test_shift.py @@ -3,8 +3,8 @@ from ut_helpers_ir import exec_instruction -from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp -from miasm2.core.cpu import sign_ext +from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp +from miasm.core.cpu import sign_ext class TestShift(object): diff --git a/test/arch/mep/ir/ut_helpers_ir.py b/test/arch/mep/ir/ut_helpers_ir.py index 26eebeda..c5bf36b9 100644 --- a/test/arch/mep/ir/ut_helpers_ir.py +++ b/test/arch/mep/ir/ut_helpers_ir.py @@ -3,16 +3,16 @@ from __future__ import print_function -from miasm2.arch.mep.arch import mn_mep -from miasm2.arch.mep.sem import ir_mepb -from miasm2.arch.mep.regs import regs_init - -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.core.locationdb import LocationDB -from miasm2.core.utils import Disasm_Exception -from miasm2.ir.ir import AssignBlock -from miasm2.arch.mep.ira import ir_a_mepb -from miasm2.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, \ +from miasm.arch.mep.arch import mn_mep +from miasm.arch.mep.sem import ir_mepb +from miasm.arch.mep.regs import regs_init + +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.core.locationdb import LocationDB +from miasm.core.utils import Disasm_Exception +from miasm.ir.ir import AssignBlock +from miasm.arch.mep.ira import ir_a_mepb +from miasm.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, \ ExprAssign, ExprLoc diff --git a/test/arch/mep/jit/ut_helpers_jit.py b/test/arch/mep/jit/ut_helpers_jit.py index 999ead42..0c756e39 100644 --- a/test/arch/mep/jit/ut_helpers_jit.py +++ b/test/arch/mep/jit/ut_helpers_jit.py @@ -3,14 +3,14 @@ from __future__ import print_function -from miasm2.analysis.machine import Machine -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE +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() diff --git a/test/arch/mips32/arch.py b/test/arch/mips32/arch.py index f71d3ee8..e5e8cff6 100644 --- a/test/arch/mips32/arch.py +++ b/test/arch/mips32/arch.py @@ -2,9 +2,9 @@ from __future__ import print_function import time from pdb import pm -from miasm2.core.utils import decode_hex, encode_hex -from miasm2.core.locationdb import LocationDB -from miasm2.arch.mips32.arch import * +from miasm.core.utils import decode_hex, encode_hex +from miasm.core.locationdb import LocationDB +from miasm.arch.mips32.arch import * loc_db = LocationDB() diff --git a/test/arch/mips32/unit/asm_test.py b/test/arch/mips32/unit/asm_test.py index 7a50b38e..38a2d928 100644 --- a/test/arch/mips32/unit/asm_test.py +++ b/test/arch/mips32/unit/asm_test.py @@ -3,13 +3,13 @@ import os from future.utils import viewitems -from miasm2.arch.mips32.arch import mn_mips32 -from miasm2.core import parse_asm -from miasm2.expression.expression import * -from miasm2.core import asmblock +from miasm.arch.mips32.arch import mn_mips32 +from miasm.core import parse_asm +from miasm.expression.expression import * +from miasm.core import asmblock from elfesteem.strpatchwork import StrPatchwork -from miasm2.analysis.machine import Machine -from miasm2.jitter.csts import * +from miasm.analysis.machine import Machine +from miasm.jitter.csts import * reg_and_id = dict(mn_mips32.regs.all_regs_ids_byname) diff --git a/test/arch/msp430/arch.py b/test/arch/msp430/arch.py index eea87091..bc38c363 100644 --- a/test/arch/msp430/arch.py +++ b/test/arch/msp430/arch.py @@ -2,9 +2,9 @@ from __future__ import print_function import time from pdb import pm -from miasm2.core.utils import decode_hex, encode_hex -from miasm2.arch.msp430.arch import * -from miasm2.core.locationdb import LocationDB +from miasm.core.utils import decode_hex, encode_hex +from miasm.arch.msp430.arch import * +from miasm.core.locationdb import LocationDB loc_db = LocationDB() diff --git a/test/arch/msp430/sem.py b/test/arch/msp430/sem.py index 88aa990d..2aca66ed 100755 --- a/test/arch/msp430/sem.py +++ b/test/arch/msp430/sem.py @@ -7,12 +7,12 @@ import logging from future.utils import viewitems -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.arch.msp430.arch import mn_msp430 as mn, mode_msp430 as mode -from miasm2.arch.msp430.sem import ir_msp430 as ir_arch -from miasm2.arch.msp430.regs import * -from miasm2.expression.expression import * -from miasm2.core.locationdb import LocationDB +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.arch.msp430.arch import mn_msp430 as mn, mode_msp430 as mode +from miasm.arch.msp430.sem import ir_msp430 as ir_arch +from miasm.arch.msp430.regs import * +from miasm.expression.expression import * +from miasm.core.locationdb import LocationDB logging.getLogger('cpuhelper').setLevel(logging.ERROR) EXCLUDE_REGS = set([res, ir_arch().IRDst]) diff --git a/test/arch/sh4/arch.py b/test/arch/sh4/arch.py index f52ed070..0fbc6ba2 100644 --- a/test/arch/sh4/arch.py +++ b/test/arch/sh4/arch.py @@ -2,9 +2,9 @@ from __future__ import print_function import time from pdb import pm from sys import stderr -from miasm2.core.utils import decode_hex, encode_hex -from miasm2.arch.sh4.arch import * -from miasm2.core.locationdb import LocationDB +from miasm.core.utils import decode_hex, encode_hex +from miasm.arch.sh4.arch import * +from miasm.core.locationdb import LocationDB loc_db = LocationDB() diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py index b4cebd28..202ecac5 100644 --- a/test/arch/x86/arch.py +++ b/test/arch/x86/arch.py @@ -2,13 +2,13 @@ from __future__ import print_function import time from pdb import pm -from miasm2.core.utils import decode_hex, encode_hex -import miasm2.expression.expression as m2_expr -from miasm2.arch.x86.arch import mn_x86, deref_mem_ad, \ +from miasm.core.utils import decode_hex, encode_hex +import miasm.expression.expression as m2_expr +from miasm.arch.x86.arch import mn_x86, deref_mem_ad, \ base_expr, rmarg, print_size -from miasm2.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64 -from miasm2.core.bin_stream import bin_stream_str -from miasm2.core.locationdb import LocationDB +from miasm.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64 +from miasm.core.bin_stream import bin_stream_str +from miasm.core.locationdb import LocationDB loc_db = LocationDB() diff --git a/test/arch/x86/qemu/testqemu.py b/test/arch/x86/qemu/testqemu.py index 264a84b9..99d6e6c1 100644 --- a/test/arch/x86/qemu/testqemu.py +++ b/test/arch/x86/qemu/testqemu.py @@ -10,9 +10,9 @@ try: except AttributeError: pass -from miasm2.analysis.sandbox import Sandbox_Linux_x86_32 -from miasm2.jitter.jitload import log_func -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE +from miasm.analysis.sandbox import Sandbox_Linux_x86_32 +from miasm.jitter.jitload import log_func +from miasm.jitter.csts import PAGE_READ, PAGE_WRITE # Utils def parse_fmt(s): diff --git a/test/arch/x86/qemu/testqemu64.py b/test/arch/x86/qemu/testqemu64.py index 4fe51992..24193d40 100644 --- a/test/arch/x86/qemu/testqemu64.py +++ b/test/arch/x86/qemu/testqemu64.py @@ -10,9 +10,9 @@ try: except AttributeError: pass -from miasm2.analysis.sandbox import Sandbox_Linux_x86_64 -from miasm2.jitter.jitload import log_func -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE +from miasm.analysis.sandbox import Sandbox_Linux_x86_64 +from miasm.jitter.jitload import log_func +from miasm.jitter.csts import PAGE_READ, PAGE_WRITE # Utils def parse_fmt(s): diff --git a/test/arch/x86/sem.py b/test/arch/x86/sem.py index c0cfc8f2..5109d2b4 100755 --- a/test/arch/x86/sem.py +++ b/test/arch/x86/sem.py @@ -12,14 +12,14 @@ import unittest import logging import copy -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.arch.x86.arch import mn_x86 as mn -from miasm2.arch.x86.sem import ir_x86_32 as ir_32, ir_x86_64 as ir_64 -from miasm2.arch.x86.regs import * -from miasm2.expression.expression import * -from miasm2.expression.simplifications import expr_simp -from miasm2.core import parse_asm, asmblock -from miasm2.core.locationdb import LocationDB +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.arch.x86.arch import mn_x86 as mn +from miasm.arch.x86.sem import ir_x86_32 as ir_32, ir_x86_64 as ir_64 +from miasm.arch.x86.regs import * +from miasm.expression.expression import * +from miasm.expression.simplifications import expr_simp +from miasm.core import parse_asm, asmblock +from miasm.core.locationdb import LocationDB logging.getLogger('cpuhelper').setLevel(logging.ERROR) diff --git a/test/arch/x86/unit/access_xmm.py b/test/arch/x86/unit/access_xmm.py index 8354c30f..65248b2e 100644 --- a/test/arch/x86/unit/access_xmm.py +++ b/test/arch/x86/unit/access_xmm.py @@ -1,7 +1,7 @@ #! /usr/bin/env python2 """Test getter and setter for XMM registers (128 bits)""" -from miasm2.analysis.machine import Machine +from miasm.analysis.machine import Machine # Jitter engine doesn't matter, use the always available 'python' one myjit = Machine("x86_32").jitter("python") diff --git a/test/arch/x86/unit/asm_test.py b/test/arch/x86/unit/asm_test.py index a87fe278..0059f511 100644 --- a/test/arch/x86/unit/asm_test.py +++ b/test/arch/x86/unit/asm_test.py @@ -5,13 +5,13 @@ import os from future.utils import viewitems -from miasm2.arch.x86.arch import mn_x86, base_expr, variable -from miasm2.core import parse_asm -from miasm2.expression.expression import * -from miasm2.core import asmblock +from miasm.arch.x86.arch import mn_x86, base_expr, variable +from miasm.core import parse_asm +from miasm.expression.expression import * +from miasm.core import asmblock from elfesteem.strpatchwork import StrPatchwork -from miasm2.analysis.machine import Machine -from miasm2.jitter.csts import * +from miasm.analysis.machine import Machine +from miasm.jitter.csts import * reg_and_id = dict(mn_x86.regs.all_regs_ids_byname) diff --git a/test/arch/x86/unit/mn_cdq.py b/test/arch/x86/unit/mn_cdq.py index 947b40bb..d015ede9 100644 --- a/test/arch/x86/unit/mn_cdq.py +++ b/test/arch/x86/unit/mn_cdq.py @@ -3,7 +3,7 @@ import sys from asm_test import Asm_Test_16, Asm_Test_32, Asm_Test_64 -from miasm2.core.utils import pck16, pck32 +from miasm.core.utils import pck16, pck32 class Test_CBW_16(Asm_Test_16): diff --git a/test/arch/x86/unit/mn_int.py b/test/arch/x86/unit/mn_int.py index efacb105..8cb8080f 100755 --- a/test/arch/x86/unit/mn_int.py +++ b/test/arch/x86/unit/mn_int.py @@ -1,7 +1,7 @@ #! /usr/bin/env python2 import sys -from miasm2.jitter.csts import EXCEPT_INT_XX +from miasm.jitter.csts import EXCEPT_INT_XX from asm_test import Asm_Test_32 diff --git a/test/arch/x86/unit/mn_pushpop.py b/test/arch/x86/unit/mn_pushpop.py index fedd197b..6dc37b74 100755 --- a/test/arch/x86/unit/mn_pushpop.py +++ b/test/arch/x86/unit/mn_pushpop.py @@ -3,7 +3,7 @@ import sys from asm_test import Asm_Test_16, Asm_Test_32 -from miasm2.core.utils import pck16, pck32 +from miasm.core.utils import pck16, pck32 def init_regs(test): diff --git a/test/arch/x86/unit/mn_seh.py b/test/arch/x86/unit/mn_seh.py index 1fa0900e..8575cc46 100755 --- a/test/arch/x86/unit/mn_seh.py +++ b/test/arch/x86/unit/mn_seh.py @@ -2,10 +2,10 @@ from __future__ import print_function import sys -from miasm2.os_dep.win_api_x86_32_seh import fake_seh_handler, build_teb, \ +from miasm.os_dep.win_api_x86_32_seh import fake_seh_handler, build_teb, \ set_win_fs_0, return_from_exception, EXCEPTION_PRIV_INSTRUCTION, \ return_from_seh, DEFAULT_SEH -from miasm2.os_dep.win_32_structs import ContextException +from miasm.os_dep.win_32_structs import ContextException from asm_test import Asm_Test_32 diff --git a/test/arch/x86/unit/test_asm_x86_64.py b/test/arch/x86/unit/test_asm_x86_64.py index 4e600846..e23f9a19 100644 --- a/test/arch/x86/unit/test_asm_x86_64.py +++ b/test/arch/x86/unit/test_asm_x86_64.py @@ -1,7 +1,7 @@ -from miasm2.core import asmblock -from miasm2.arch.x86 import arch -from miasm2.core import parse_asm -from miasm2.core.interval import interval +from miasm.core import asmblock +from miasm.arch.x86 import arch +from miasm.core import parse_asm +from miasm.core.interval import interval my_mn = arch.mn_x86 |