diff options
Diffstat (limited to 'example')
49 files changed, 183 insertions, 182 deletions
diff --git a/example/asm/shellcode.py b/example/asm/shellcode.py index b14b7441..ed489bbd 100755 --- a/example/asm/shellcode.py +++ b/example/asm/shellcode.py @@ -7,11 +7,11 @@ from future.utils import viewitems from elfesteem import pe_init from elfesteem.strpatchwork import StrPatchwork -from miasm2.core import parse_asm, asmblock -from miasm2.analysis.machine import Machine -from miasm2.core.interval import interval -from miasm2.core.locationdb import LocationDB -from miasm2.core.utils import iterbytes, int_to_byte +from miasm.core import parse_asm, asmblock +from miasm.analysis.machine import Machine +from miasm.core.interval import interval +from miasm.core.locationdb import LocationDB +from miasm.core.utils import iterbytes, int_to_byte parser = ArgumentParser("Multi-arch (32 bits) assembler") parser.add_argument('architecture', help="architecture: " + diff --git a/example/asm/simple.py b/example/asm/simple.py index e46faa48..8f6aac92 100644 --- a/example/asm/simple.py +++ b/example/asm/simple.py @@ -2,8 +2,8 @@ from __future__ import print_function from pdb import pm from pprint import pprint -from miasm2.arch.x86.arch import mn_x86 -from miasm2.core import parse_asm, asmblock +from miasm.arch.x86.arch import mn_x86 +from miasm.core import parse_asm, asmblock # Assemble code diff --git a/example/disasm/callback.py b/example/disasm/callback.py index 95c165d4..7219462f 100644 --- a/example/disasm/callback.py +++ b/example/disasm/callback.py @@ -1,7 +1,7 @@ from __future__ import print_function -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine -from miasm2.core.asmblock import AsmConstraint +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine +from miasm.core.asmblock import AsmConstraint def cb_x86_callpop(cur_bloc, loc_db, *args, **kwargs): diff --git a/example/disasm/dis_binary.py b/example/disasm/dis_binary.py index 4ac5ef26..37eabb14 100644 --- a/example/disasm/dis_binary.py +++ b/example/disasm/dis_binary.py @@ -1,7 +1,7 @@ from __future__ import print_function import sys -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine fdesc = open(sys.argv[1], 'rb') diff --git a/example/disasm/dis_binary_ir.py b/example/disasm/dis_binary_ir.py index ac642a36..ff7a0d36 100644 --- a/example/disasm/dis_binary_ir.py +++ b/example/disasm/dis_binary_ir.py @@ -1,8 +1,8 @@ from __future__ import print_function import sys from future.utils import viewvalues -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine ##################################### # Common section from dis_binary.py # diff --git a/example/disasm/dis_binary_ira.py b/example/disasm/dis_binary_ira.py index 04bddbbb..3ecd5349 100644 --- a/example/disasm/dis_binary_ira.py +++ b/example/disasm/dis_binary_ira.py @@ -1,8 +1,9 @@ from __future__ import print_function import sys + from future.utils import viewvalues -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine ##################################### # Common section from dis_binary.py # diff --git a/example/disasm/dis_x86_string.py b/example/disasm/dis_x86_string.py index 175e9264..6d4e2c84 100644 --- a/example/disasm/dis_x86_string.py +++ b/example/disasm/dis_x86_string.py @@ -1,6 +1,6 @@ from __future__ import print_function -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine # The Container will provide a *bin_stream*, bytes source for the disasm engine cont = Container.from_string(b"\x83\xf8\x10\x74\x07\x89\xc6\x0f\x47\xc3\xeb\x08\x89\xc8\xe8\x31\x33\x22\x11\x40\xc3") diff --git a/example/disasm/full.py b/example/disasm/full.py index de3f82ac..f7268ad0 100644 --- a/example/disasm/full.py +++ b/example/disasm/full.py @@ -5,17 +5,17 @@ from pdb import pm from future.utils import viewitems, viewvalues -from miasm2.analysis.binary import Container -from miasm2.core.asmblock import log_asmblock, AsmCFG -from miasm2.core.interval import interval -from miasm2.analysis.machine import Machine -from miasm2.analysis.data_flow import dead_simp, \ +from miasm.analysis.binary import Container +from miasm.core.asmblock import log_asmblock, AsmCFG +from miasm.core.interval import interval +from miasm.analysis.machine import Machine +from miasm.analysis.data_flow import dead_simp, \ DiGraphDefUse, ReachingDefinitions, \ replace_stack_vars, load_from_int, del_unused_edges -from miasm2.expression.simplifications import expr_simp -from miasm2.analysis.ssa import SSADiGraph -from miasm2.ir.ir import AssignBlock, IRBlock -from miasm2.analysis.simplifier import IRCFGSimplifierCommon, IRCFGSimplifierSSA +from miasm.expression.simplifications import expr_simp +from miasm.analysis.ssa import SSADiGraph +from miasm.ir.ir import AssignBlock, IRBlock +from miasm.analysis.simplifier import IRCFGSimplifierCommon, IRCFGSimplifierSSA log = logging.getLogger("dis") console_handler = logging.StreamHandler() diff --git a/example/disasm/single_instr.py b/example/disasm/single_instr.py index 70b37220..eee527b1 100644 --- a/example/disasm/single_instr.py +++ b/example/disasm/single_instr.py @@ -1,7 +1,7 @@ from __future__ import print_function -from miasm2.arch.x86.arch import mn_x86 -from miasm2.arch.x86.regs import EDX -from miasm2.core.locationdb import LocationDB +from miasm.arch.x86.arch import mn_x86 +from miasm.arch.x86.regs import EDX +from miasm.core.locationdb import LocationDB loc_db = LocationDB() l = mn_x86.fromstring('MOV EAX, EBX', loc_db, 32) diff --git a/example/expression/access_c.py b/example/expression/access_c.py index c6f26a10..c604a0bd 100644 --- a/example/expression/access_c.py +++ b/example/expression/access_c.py @@ -45,16 +45,16 @@ import sys from future.utils import viewitems, viewvalues -from miasm2.analysis.machine import Machine -from miasm2.analysis.binary import Container -from miasm2.expression.expression import ExprOp, ExprCompose, ExprId, ExprInt -from miasm2.analysis.depgraph import DependencyGraph +from miasm.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.expression.expression import ExprOp, ExprCompose, ExprId, ExprInt +from miasm.analysis.depgraph import DependencyGraph -from miasm2.arch.x86.ctype import CTypeAMD64_unk +from miasm.arch.x86.ctype import CTypeAMD64_unk -from miasm2.core.objc import ExprToAccessC, CHandler -from miasm2.core.objc import CTypesManagerNotPacked -from miasm2.core.ctypesmngr import CAstTypes, CTypePtr, CTypeStruct +from miasm.core.objc import ExprToAccessC, CHandler +from miasm.core.objc import CTypesManagerNotPacked +from miasm.core.ctypesmngr import CAstTypes, CTypePtr, CTypeStruct def find_call(ircfg): """Returns (irb, index) which call""" diff --git a/example/expression/asm_to_ir.py b/example/expression/asm_to_ir.py index 16f766e1..4bcbb05d 100644 --- a/example/expression/asm_to_ir.py +++ b/example/expression/asm_to_ir.py @@ -3,12 +3,12 @@ from pdb import pm from future.utils import viewitems -from miasm2.arch.x86.arch import mn_x86 -from miasm2.core import parse_asm -from miasm2.expression.expression import * -from miasm2.core import asmblock -from miasm2.arch.x86.ira import ir_a_x86_32 -from miasm2.analysis.data_flow import dead_simp +from miasm.arch.x86.arch import mn_x86 +from miasm.core import parse_asm +from miasm.expression.expression import * +from miasm.core import asmblock +from miasm.arch.x86.ira import ir_a_x86_32 +from miasm.analysis.data_flow import dead_simp # First, asm code diff --git a/example/expression/basic_op.py b/example/expression/basic_op.py index 8b5d7e2b..afeb4081 100644 --- a/example/expression/basic_op.py +++ b/example/expression/basic_op.py @@ -1,5 +1,5 @@ from __future__ import print_function -from miasm2.expression.expression import * +from miasm.expression.expression import * print(""" Simple expression manipulation demo diff --git a/example/expression/basic_simplification.py b/example/expression/basic_simplification.py index 5ecf21db..05ebefc6 100644 --- a/example/expression/basic_simplification.py +++ b/example/expression/basic_simplification.py @@ -1,6 +1,6 @@ from __future__ import print_function -from miasm2.expression.expression import * -from miasm2.expression.simplifications import expr_simp +from miasm.expression.expression import * +from miasm.expression.simplifications import expr_simp print(""" Simple expression simplification demo diff --git a/example/expression/constant_propagation.py b/example/expression/constant_propagation.py index 1259758b..a6efbb46 100644 --- a/example/expression/constant_propagation.py +++ b/example/expression/constant_propagation.py @@ -6,12 +6,12 @@ A "constant expression" is an expression based on constants or init regs. from argparse import ArgumentParser -from miasm2.analysis.machine import Machine -from miasm2.analysis.binary import Container -from miasm2.analysis.cst_propag import propagate_cst_expr -from miasm2.analysis.data_flow import dead_simp, \ +from miasm.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.analysis.cst_propag import propagate_cst_expr +from miasm.analysis.data_flow import dead_simp, \ merge_blocks, remove_empty_assignblks -from miasm2.expression.simplifications import expr_simp +from miasm.expression.simplifications import expr_simp parser = ArgumentParser("Constant expression propagation") diff --git a/example/expression/export_llvm.py b/example/expression/export_llvm.py index c8ee14a5..241a907d 100644 --- a/example/expression/export_llvm.py +++ b/example/expression/export_llvm.py @@ -1,11 +1,11 @@ from future.utils import viewitems, viewvalues from argparse import ArgumentParser -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine -from miasm2.jitter.llvmconvert import LLVMType, LLVMContext_IRCompilation, LLVMFunction_IRCompilation +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine +from miasm.jitter.llvmconvert import LLVMType, LLVMContext_IRCompilation, LLVMFunction_IRCompilation from llvmlite import ir as llvm_ir -from miasm2.expression.simplifications import expr_simp_high_to_explicit +from miasm.expression.simplifications import expr_simp_high_to_explicit parser = ArgumentParser("LLVM export example") parser.add_argument("target", help="Target binary") diff --git a/example/expression/expr_c.py b/example/expression/expr_c.py index 83cc727b..cdfdf4ca 100644 --- a/example/expression/expr_c.py +++ b/example/expression/expr_c.py @@ -5,10 +5,10 @@ Parse C expression to access variables and retrieve information: """ from __future__ import print_function -from miasm2.core.ctypesmngr import CTypeStruct, CAstTypes, CTypePtr -from miasm2.arch.x86.ctype import CTypeAMD64_unk -from miasm2.core.objc import CTypesManagerNotPacked, CHandler -from miasm2.expression.expression import ExprId +from miasm.core.ctypesmngr import CTypeStruct, CAstTypes, CTypePtr +from miasm.arch.x86.ctype import CTypeAMD64_unk +from miasm.core.objc import CTypesManagerNotPacked, CHandler +from miasm.expression.expression import ExprId """ diff --git a/example/expression/expr_grapher.py b/example/expression/expr_grapher.py index e1643b03..2550c5d3 100644 --- a/example/expression/expr_grapher.py +++ b/example/expression/expr_grapher.py @@ -1,6 +1,6 @@ from __future__ import print_function -from miasm2.expression.expression import * +from miasm.expression.expression import * print("Simple Expression grapher demo") diff --git a/example/expression/expr_random.py b/example/expression/expr_random.py index 5ac3be06..e1164f6f 100644 --- a/example/expression/expr_random.py +++ b/example/expression/expr_random.py @@ -3,7 +3,7 @@ from builtins import range import string import random -from miasm2.expression.expression_helper import ExprRandom +from miasm.expression.expression_helper import ExprRandom print("Simple expression generator\n") diff --git a/example/expression/expr_reduce.py b/example/expression/expr_reduce.py index 0f575e57..4c8b6c83 100644 --- a/example/expression/expr_reduce.py +++ b/example/expression/expr_reduce.py @@ -1,5 +1,5 @@ -from miasm2.expression.expression import ExprId, ExprInt, ExprMem -from miasm2.expression.expression_reduce import ExprReducer +from miasm.expression.expression import ExprId, ExprInt, ExprMem +from miasm.expression.expression_reduce import ExprReducer class StructLookup(ExprReducer): diff --git a/example/expression/expr_translate.py b/example/expression/expr_translate.py index 1a36a64c..8562975f 100644 --- a/example/expression/expr_translate.py +++ b/example/expression/expr_translate.py @@ -3,9 +3,9 @@ import random from future.utils import viewitems -from miasm2.expression.expression import * -from miasm2.expression.expression_helper import ExprRandom -from miasm2.ir.translators import Translator +from miasm.expression.expression import * +from miasm.expression.expression_helper import ExprRandom +from miasm.ir.translators import Translator random.seed(0) diff --git a/example/expression/get_read_write.py b/example/expression/get_read_write.py index 0c8bb3dd..cf333d0c 100644 --- a/example/expression/get_read_write.py +++ b/example/expression/get_read_write.py @@ -2,10 +2,10 @@ from __future__ import print_function from future.utils import viewitems -from miasm2.arch.x86.arch import mn_x86 -from miasm2.expression.expression import get_rw -from miasm2.arch.x86.ira import ir_a_x86_32 -from miasm2.core.locationdb import LocationDB +from miasm.arch.x86.arch import mn_x86 +from miasm.expression.expression import get_rw +from miasm.arch.x86.ira import ir_a_x86_32 +from miasm.core.locationdb import LocationDB loc_db = LocationDB() diff --git a/example/expression/graph_dataflow.py b/example/expression/graph_dataflow.py index 55159598..c320fba0 100644 --- a/example/expression/graph_dataflow.py +++ b/example/expression/graph_dataflow.py @@ -3,13 +3,13 @@ from argparse import ArgumentParser from future.utils import viewitems, viewvalues -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine -from miasm2.expression.expression import get_expr_mem -from miasm2.analysis.data_analysis import intra_block_flow_raw, inter_block_flow -from miasm2.core.graph import DiGraph -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.analysis.data_flow import dead_simp +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine +from miasm.expression.expression import get_expr_mem +from miasm.analysis.data_analysis import intra_block_flow_raw, inter_block_flow +from miasm.core.graph import DiGraph +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.analysis.data_flow import dead_simp parser = ArgumentParser("Simple expression use for generating dataflow graph") diff --git a/example/expression/simplification_add.py b/example/expression/simplification_add.py index 6ac36a17..ff28d56e 100644 --- a/example/expression/simplification_add.py +++ b/example/expression/simplification_add.py @@ -1,13 +1,13 @@ from __future__ import print_function -import miasm2.expression.expression as m2_expr -from miasm2.expression.simplifications import expr_simp +import miasm.expression.expression as m2_expr +from miasm.expression.simplifications import expr_simp from pdb import pm print(""" Expression simplification demo: Adding a simplification: a + a + a == a * 3 -More detailed examples can be found in miasm2/expression/simplification*. +More detailed examples can be found in miasm/expression/simplification*. """) # Define the simplification method diff --git a/example/expression/simplification_tools.py b/example/expression/simplification_tools.py index a9bcc429..b5fafba2 100644 --- a/example/expression/simplification_tools.py +++ b/example/expression/simplification_tools.py @@ -1,5 +1,5 @@ from __future__ import print_function -from miasm2.expression.expression import * +from miasm.expression.expression import * from pdb import pm print(""" diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py index e0ab09da..2c654b77 100644 --- a/example/expression/solve_condition_stp.py +++ b/example/expression/solve_condition_stp.py @@ -6,15 +6,15 @@ from pdb import pm from future.utils import viewitems -from miasm2.analysis.machine import Machine -from miasm2.analysis.binary import Container -from miasm2.expression.expression import ExprInt, ExprCond, ExprId, \ +from miasm.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.expression.expression import ExprInt, ExprCond, ExprId, \ get_expr_ids, ExprAssign, ExprLoc -from miasm2.core.bin_stream import bin_stream_str -from miasm2.ir.symbexec import SymbolicExecutionEngine, get_block -from miasm2.expression.simplifications import expr_simp -from miasm2.core import parse_asm -from miasm2.ir.translators.translator import Translator +from miasm.core.bin_stream import bin_stream_str +from miasm.ir.symbexec import SymbolicExecutionEngine, get_block +from miasm.expression.simplifications import expr_simp +from miasm.core import parse_asm +from miasm.ir.translators.translator import Translator machine = Machine("x86_32") diff --git a/example/ida/ctype_propagation.py b/example/ida/ctype_propagation.py index a043b9c9..f333d69a 100644 --- a/example/ida/ctype_propagation.py +++ b/example/ida/ctype_propagation.py @@ -5,18 +5,18 @@ import ida_funcs from future.utils import viewitems -from miasm2.core.bin_stream_ida import bin_stream_ida -from miasm2.expression import expression as m2_expr -from miasm2.expression.simplifications import expr_simp -from miasm2.ir.ir import IRBlock, AssignBlock -from miasm2.arch.x86.ctype import CTypeAMD64_unk, CTypeX86_unk -from miasm2.arch.msp430.ctype import CTypeMSP430_unk -from miasm2.core.objc import CTypesManagerNotPacked, ExprToAccessC, CHandler -from miasm2.core.ctypesmngr import CAstTypes -from miasm2.expression.expression import ExprLoc, ExprInt, ExprOp, ExprAssign -from miasm2.ir.symbexec_types import SymbExecCType -from miasm2.expression.parser import str_to_expr -from miasm2.analysis.cst_propag import add_state, propagate_cst_expr +from miasm.core.bin_stream_ida import bin_stream_ida +from miasm.expression import expression as m2_expr +from miasm.expression.simplifications import expr_simp +from miasm.ir.ir import IRBlock, AssignBlock +from miasm.arch.x86.ctype import CTypeAMD64_unk, CTypeX86_unk +from miasm.arch.msp430.ctype import CTypeMSP430_unk +from miasm.core.objc import CTypesManagerNotPacked, ExprToAccessC, CHandler +from miasm.core.ctypesmngr import CAstTypes +from miasm.expression.expression import ExprLoc, ExprInt, ExprOp, ExprAssign +from miasm.ir.symbexec_types import SymbExecCType +from miasm.expression.parser import str_to_expr +from miasm.analysis.cst_propag import add_state, propagate_cst_expr from utils import guess_machine diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py index 3de19cbc..73fc0f87 100644 --- a/example/ida/depgraph.py +++ b/example/ida/depgraph.py @@ -12,13 +12,13 @@ import ida_funcs import ida_kernwin -from miasm2.core.bin_stream_ida import bin_stream_ida -from miasm2.core.asmblock import * -from miasm2.expression import expression as m2_expr +from miasm.core.bin_stream_ida import bin_stream_ida +from miasm.core.asmblock import * +from miasm.expression import expression as m2_expr -from miasm2.expression.simplifications import expr_simp -from miasm2.analysis.depgraph import DependencyGraph -from miasm2.ir.ir import AssignBlock, IRBlock +from miasm.expression.simplifications import expr_simp +from miasm.analysis.depgraph import DependencyGraph +from miasm.ir.ir import AssignBlock, IRBlock from utils import guess_machine diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py index de46c22d..c011b4c3 100644 --- a/example/ida/graph_ir.py +++ b/example/ida/graph_ir.py @@ -11,13 +11,13 @@ import idc import ida_funcs import idautils -from miasm2.core.asmblock import is_int -from miasm2.core.bin_stream_ida import bin_stream_ida -from miasm2.expression.simplifications import expr_simp -from miasm2.ir.ir import IRBlock, AssignBlock -from miasm2.analysis.data_flow import load_from_int +from miasm.core.asmblock import is_int +from miasm.core.bin_stream_ida import bin_stream_ida +from miasm.expression.simplifications import expr_simp +from miasm.ir.ir import IRBlock, AssignBlock +from miasm.analysis.data_flow import load_from_int from utils import guess_machine, expr2colorstr -from miasm2.analysis.simplifier import IRCFGSimplifierCommon, IRCFGSimplifierSSA +from miasm.analysis.simplifier import IRCFGSimplifierCommon, IRCFGSimplifierSSA diff --git a/example/ida/symbol_exec.py b/example/ida/symbol_exec.py index aa1d57fe..c0ed89f3 100644 --- a/example/ida/symbol_exec.py +++ b/example/ida/symbol_exec.py @@ -7,8 +7,8 @@ import idaapi import idc -from miasm2.expression.expression_helper import Variables_Identifier -from miasm2.expression.expression import ExprAssign +from miasm.expression.expression_helper import Variables_Identifier +from miasm.expression.expression import ExprAssign from utils import expr2colorstr, translatorForm @@ -130,8 +130,8 @@ class Hooks(idaapi.UI_Hooks): def symbolic_exec(): - from miasm2.ir.symbexec import SymbolicExecutionEngine - from miasm2.core.bin_stream_ida import bin_stream_ida + from miasm.ir.symbexec import SymbolicExecutionEngine + from miasm.core.bin_stream_ida import bin_stream_ida from utils import guess_machine diff --git a/example/ida/utils.py b/example/ida/utils.py index b6d5dac4..cb4ef4d8 100644 --- a/example/ida/utils.py +++ b/example/ida/utils.py @@ -3,9 +3,9 @@ from builtins import map import idaapi from idc import * -from miasm2.analysis.machine import Machine -from miasm2.ir.translators import Translator -import miasm2.expression.expression as m2_expr +from miasm.analysis.machine import Machine +from miasm.ir.translators import Translator +import miasm.expression.expression as m2_expr def guess_machine(addr=None): "Return an instance of Machine corresponding to the IDA guessed processor" @@ -55,8 +55,8 @@ def guess_machine(addr=None): raise NotImplementedError('not fully functional') machine = Machine(info2machine[infos]) - from miasm2.analysis.disasm_cb import guess_funcs, guess_multi_cb - from miasm2.analysis.disasm_cb import arm_guess_subcall, arm_guess_jump_table + from miasm.analysis.disasm_cb import guess_funcs, guess_multi_cb + from miasm.analysis.disasm_cb import arm_guess_subcall, arm_guess_jump_table guess_funcs.append(arm_guess_subcall) guess_funcs.append(arm_guess_jump_table) diff --git a/example/jitter/arm.py b/example/jitter/arm.py index 86772874..daea2428 100755 --- a/example/jitter/arm.py +++ b/example/jitter/arm.py @@ -4,7 +4,7 @@ from __future__ import print_function import logging from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Linux_arml +from miasm.analysis.sandbox import Sandbox_Linux_arml # Get arguments parser = Sandbox_Linux_arml.parser(description="""Sandbox an elf binary with arm diff --git a/example/jitter/arm_sc.py b/example/jitter/arm_sc.py index b81d3784..8d5b5677 100755 --- a/example/jitter/arm_sc.py +++ b/example/jitter/arm_sc.py @@ -1,8 +1,8 @@ #! /usr/bin/env python2 #-*- coding:utf-8 -*- -from miasm2.core.utils import int_to_byte -from miasm2.analysis.sandbox import Sandbox_Linux_armb_str -from miasm2.analysis.sandbox import Sandbox_Linux_arml_str +from miasm.core.utils import int_to_byte +from miasm.analysis.sandbox import Sandbox_Linux_armb_str +from miasm.analysis.sandbox import Sandbox_Linux_arml_str from elfesteem.strpatchwork import StrPatchwork from pdb import pm diff --git a/example/jitter/example_types.py b/example/jitter/example_types.py index d0751bbd..653adaf9 100755 --- a/example/jitter/example_types.py +++ b/example/jitter/example_types.py @@ -1,16 +1,16 @@ #! /usr/bin/env python2 -"""This script is just a short example of common usages for miasm2.core.types. +"""This script is just a short example of common usages for miasm.core.types. For a more complete view of what is possible, tests/core/types.py covers most of the module possibilities, and the module doc gives useful information as well. """ from __future__ import print_function -from miasm2.core.utils import iterbytes -from miasm2.analysis.machine import Machine -from miasm2.core.types import MemStruct, Self, Void, Str, Array, Ptr, \ +from miasm.core.utils import iterbytes +from miasm.analysis.machine import Machine +from miasm.core.types import MemStruct, Self, Void, Str, Array, Ptr, \ Num, Array, set_allocator -from miasm2.os_dep.common import heap +from miasm.os_dep.common import heap # Instantiate a heap my_heap = heap() @@ -152,7 +152,7 @@ print("module in the first part, and how to play with some casts in the second." print() # A random jitter -# You can also use miasm2.jitter.VmMngr.Vm(), but it does not happen in real +# You can also use miasm.jitter.VmMngr.Vm(), but it does not happen in real # life scripts, so here is the usual way: jitter = Machine("x86_32").jitter("python") vm = jitter.vm @@ -255,6 +255,6 @@ print("An argv instance:", repr(argv)) print("argv values:", repr([val.deref.val for val in argv[:-1]])) print() -print("See test/core/types.py and the miasm2.core.types module doc for ") +print("See test/core/types.py and the miasm.core.types module doc for ") print("more information.") diff --git a/example/jitter/mips32.py b/example/jitter/mips32.py index 2eb06c87..4aeb576f 100755 --- a/example/jitter/mips32.py +++ b/example/jitter/mips32.py @@ -2,9 +2,9 @@ #-*- coding:utf-8 -*- from __future__ import print_function from argparse import ArgumentParser -from miasm2.analysis import debugging -from miasm2.jitter.csts import * -from miasm2.analysis.machine import Machine +from miasm.analysis import debugging +from miasm.jitter.csts import * +from miasm.analysis.machine import Machine parser = ArgumentParser( description="""Sandbox raw binary with mips32 engine diff --git a/example/jitter/msp430.py b/example/jitter/msp430.py index 1ecb4cef..972a1fdc 100755 --- a/example/jitter/msp430.py +++ b/example/jitter/msp430.py @@ -2,9 +2,9 @@ #-*- coding:utf-8 -*- from __future__ import print_function from argparse import ArgumentParser -from miasm2.analysis import debugging -from miasm2.jitter.csts import * -from miasm2.analysis.machine import Machine +from miasm.analysis import debugging +from miasm.jitter.csts import * +from miasm.analysis.machine import Machine parser = ArgumentParser( description="""Sandbox raw binary with msp430 engine diff --git a/example/jitter/run_with_linuxenv.py b/example/jitter/run_with_linuxenv.py index fda76f9a..e2869699 100644 --- a/example/jitter/run_with_linuxenv.py +++ b/example/jitter/run_with_linuxenv.py @@ -4,9 +4,9 @@ import re from elfesteem import elf as elf_csts -from miasm2.os_dep.linux import environment, syscall -from miasm2.analysis.machine import Machine -from miasm2.analysis.binary import Container +from miasm.os_dep.linux import environment, syscall +from miasm.analysis.machine import Machine +from miasm.analysis.binary import Container parser = ArgumentParser("Run an ELF in a Linux-like environment") parser.add_argument("target", help="Target ELF") diff --git a/example/jitter/sandbox_call.py b/example/jitter/sandbox_call.py index 3eb0b86e..7d400b7d 100644 --- a/example/jitter/sandbox_call.py +++ b/example/jitter/sandbox_call.py @@ -1,10 +1,10 @@ """This example illustrate the Sandbox.call API, for direct call of a given function""" -from miasm2.analysis.sandbox import Sandbox_Linux_arml -from miasm2.analysis.binary import Container -from miasm2.os_dep.linux_stdlib import linobjs -from miasm2.core.utils import hexdump +from miasm.analysis.sandbox import Sandbox_Linux_arml +from miasm.analysis.binary import Container +from miasm.os_dep.linux_stdlib import linobjs +from miasm.core.utils import hexdump # Parse arguments parser = Sandbox_Linux_arml.parser(description="ELF sandboxer") diff --git a/example/jitter/sandbox_elf_aarch64l.py b/example/jitter/sandbox_elf_aarch64l.py index 0f028876..472b2354 100644 --- a/example/jitter/sandbox_elf_aarch64l.py +++ b/example/jitter/sandbox_elf_aarch64l.py @@ -1,7 +1,7 @@ import logging from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Linux_aarch64l -from miasm2.jitter.jitload import log_func +from miasm.analysis.sandbox import Sandbox_Linux_aarch64l +from miasm.jitter.jitload import log_func # Insert here user defined methods diff --git a/example/jitter/sandbox_elf_ppc32.py b/example/jitter/sandbox_elf_ppc32.py index 04ecfd9e..829381fc 100644 --- a/example/jitter/sandbox_elf_ppc32.py +++ b/example/jitter/sandbox_elf_ppc32.py @@ -1,8 +1,8 @@ import os from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Linux_ppc32b -from miasm2.jitter.csts import * -from miasm2.jitter.jitload import log_func +from miasm.analysis.sandbox import Sandbox_Linux_ppc32b +from miasm.jitter.csts import * +from miasm.jitter.jitload import log_func import logging # Insert here user defined methods diff --git a/example/jitter/sandbox_pe_x86_32.py b/example/jitter/sandbox_pe_x86_32.py index 3a627b19..263fad94 100644 --- a/example/jitter/sandbox_pe_x86_32.py +++ b/example/jitter/sandbox_pe_x86_32.py @@ -1,5 +1,5 @@ from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Win_x86_32 +from miasm.analysis.sandbox import Sandbox_Win_x86_32 # Insert here user defined methods diff --git a/example/jitter/sandbox_pe_x86_64.py b/example/jitter/sandbox_pe_x86_64.py index 773c54b9..4d8f00ce 100644 --- a/example/jitter/sandbox_pe_x86_64.py +++ b/example/jitter/sandbox_pe_x86_64.py @@ -1,5 +1,5 @@ from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Win_x86_64 +from miasm.analysis.sandbox import Sandbox_Win_x86_64 # Insert here user defined methods diff --git a/example/jitter/test_x86_32_seh.py b/example/jitter/test_x86_32_seh.py index e7f8cff4..595b9586 100644 --- a/example/jitter/test_x86_32_seh.py +++ b/example/jitter/test_x86_32_seh.py @@ -1,8 +1,8 @@ import os from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Win_x86_32 -from miasm2.os_dep import win_api_x86_32_seh -from miasm2.jitter.csts import * +from miasm.analysis.sandbox import Sandbox_Win_x86_32 +from miasm.os_dep import win_api_x86_32_seh +from miasm.jitter.csts import * def deal_exception_access_violation(jitter): jitter.pc = win_api_x86_32_seh.fake_seh_handler(jitter, win_api_x86_32_seh.EXCEPTION_ACCESS_VIOLATION) diff --git a/example/jitter/trace.py b/example/jitter/trace.py index 9f025bfd..46b313c1 100644 --- a/example/jitter/trace.py +++ b/example/jitter/trace.py @@ -11,9 +11,9 @@ from __future__ import print_function import os import time from pdb import pm -from miasm2.analysis.sandbox import Sandbox_Linux_arml -from miasm2.jitter.emulatedsymbexec import EmulatedSymbExec -from miasm2.jitter.jitcore_python import JitCore_Python +from miasm.analysis.sandbox import Sandbox_Linux_arml +from miasm.jitter.emulatedsymbexec import EmulatedSymbExec +from miasm.jitter.jitcore_python import JitCore_Python # Function called at each instruction instr_count = 0 diff --git a/example/jitter/unpack_upx.py b/example/jitter/unpack_upx.py index 5d862dd1..0a41d038 100644 --- a/example/jitter/unpack_upx.py +++ b/example/jitter/unpack_upx.py @@ -3,7 +3,7 @@ import os import logging from pdb import pm from elfesteem import pe -from miasm2.analysis.sandbox import Sandbox_Win_x86_32 +from miasm.analysis.sandbox import Sandbox_Win_x86_32 # User defined methods @@ -93,7 +93,7 @@ sb.jitter.add_breakpoint(end_offset, update_binary) sb.run() # Rebuild PE -# Alternative solution: miasm2.jitter.loader.pe.vm2pe(sb.jitter, out_fname, +# Alternative solution: miasm.jitter.loader.pe.vm2pe(sb.jitter, out_fname, # libs=sb.libs, e_orig=sb.pe) new_dll = [] diff --git a/example/jitter/x86_32.py b/example/jitter/x86_32.py index 2a73a2ad..c2273b69 100644 --- a/example/jitter/x86_32.py +++ b/example/jitter/x86_32.py @@ -1,6 +1,6 @@ from argparse import ArgumentParser -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE -from miasm2.analysis.machine import Machine +from miasm.jitter.csts import PAGE_READ, PAGE_WRITE +from miasm.analysis.machine import Machine from pdb import pm diff --git a/example/symbol_exec/depgraph.py b/example/symbol_exec/depgraph.py index c1dbd422..c7b9017f 100644 --- a/example/symbol_exec/depgraph.py +++ b/example/symbol_exec/depgraph.py @@ -6,10 +6,10 @@ import json from future.utils import viewitems -from miasm2.analysis.machine import Machine -from miasm2.analysis.binary import Container -from miasm2.analysis.depgraph import DependencyGraph -from miasm2.expression.expression import ExprMem, ExprId, ExprInt +from miasm.analysis.machine import Machine +from miasm.analysis.binary import Container +from miasm.analysis.depgraph import DependencyGraph +from miasm.expression.expression import ExprMem, ExprId, ExprInt parser = ArgumentParser("Dependency grapher") parser.add_argument("filename", help="Binary to analyse") diff --git a/example/symbol_exec/dse_crackme.py b/example/symbol_exec/dse_crackme.py index 33ec3b72..90774dc3 100644 --- a/example/symbol_exec/dse_crackme.py +++ b/example/symbol_exec/dse_crackme.py @@ -16,10 +16,10 @@ from pdb import pm from tempfile import NamedTemporaryFile from future.utils import viewitems -from miasm2.core.utils import int_to_byte -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE -from miasm2.analysis.sandbox import Sandbox_Linux_x86_64 -from miasm2.expression.expression import * +from miasm.core.utils import int_to_byte +from miasm.jitter.csts import PAGE_READ, PAGE_WRITE +from miasm.analysis.sandbox import Sandbox_Linux_x86_64 +from miasm.expression.expression import * is_win = platform.system() == "Windows" @@ -96,8 +96,8 @@ sb.jitter.init_run(sb.entry_point) #### This part handle the DSE #### -from miasm2.analysis.dse import DSEPathConstraint -from miasm2.analysis.machine import Machine +from miasm.analysis.dse import DSEPathConstraint +from miasm.analysis.machine import Machine # File "management" diff --git a/example/symbol_exec/dse_strategies.py b/example/symbol_exec/dse_strategies.py index 8e479d61..3f968215 100644 --- a/example/symbol_exec/dse_strategies.py +++ b/example/symbol_exec/dse_strategies.py @@ -22,10 +22,10 @@ from argparse import ArgumentParser from future.utils import viewitems -from miasm2.analysis.machine import Machine -from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE -from miasm2.analysis.dse import DSEPathConstraint -from miasm2.expression.expression import ExprMem, ExprId, ExprInt, ExprAssign +from miasm.analysis.machine import Machine +from miasm.jitter.csts import PAGE_READ, PAGE_WRITE +from miasm.analysis.dse import DSEPathConstraint +from miasm.expression.expression import ExprMem, ExprId, ExprInt, ExprAssign # Argument handling parser = ArgumentParser("DSE Example") diff --git a/example/symbol_exec/single_instr.py b/example/symbol_exec/single_instr.py index bdc65360..789252df 100644 --- a/example/symbol_exec/single_instr.py +++ b/example/symbol_exec/single_instr.py @@ -1,9 +1,9 @@ from __future__ import print_function # Minimalist Symbol Exec example -from miasm2.analysis.binary import Container -from miasm2.analysis.machine import Machine -from miasm2.ir.symbexec import SymbolicExecutionEngine -from miasm2.core.locationdb import LocationDB +from miasm.analysis.binary import Container +from miasm.analysis.machine import Machine +from miasm.ir.symbexec import SymbolicExecutionEngine +from miasm.core.locationdb import LocationDB START_ADDR = 0 machine = Machine("x86_32") |