diff options
25 files changed, 136 insertions, 180 deletions
diff --git a/example/disasm/full.py b/example/disasm/full.py index 33903282..3bfb7658 100644 --- a/example/disasm/full.py +++ b/example/disasm/full.py @@ -1,4 +1,3 @@ -import os import logging from argparse import ArgumentParser from pdb import pm @@ -17,10 +16,6 @@ console_handler.setFormatter(logging.Formatter("%(levelname)-5s: %(message)s")) log.addHandler(console_handler) log.setLevel(logging.INFO) -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - parser = ArgumentParser("Disassemble a binary") parser.add_argument('filename', help="File to disassemble") diff --git a/example/expression/simplification_add.py b/example/expression/simplification_add.py index 06b683fe..41720f3a 100644 --- a/example/expression/simplification_add.py +++ b/example/expression/simplification_add.py @@ -1,11 +1,6 @@ import miasm2.expression.expression as m2_expr from miasm2.expression.simplifications import expr_simp from pdb import pm -import os - -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) print """ Expression simplification demo: Adding a simplification: diff --git a/example/expression/simplification_tools.py b/example/expression/simplification_tools.py index 6a4ff715..258b5ce4 100644 --- a/example/expression/simplification_tools.py +++ b/example/expression/simplification_tools.py @@ -1,10 +1,5 @@ from miasm2.expression.expression import * from pdb import pm -import os - -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) print """ Expression simplification demo. diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py index 0ca17faa..27b0512f 100644 --- a/example/expression/solve_condition_stp.py +++ b/example/expression/solve_condition_stp.py @@ -1,4 +1,3 @@ -import os import sys import subprocess from collections import defaultdict @@ -19,11 +18,6 @@ from miasm2.core import parse_asm from miasm2.arch.x86.disasm import dis_x86_32 as dis_engine -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - - mn = mn_x86 parser = OptionParser(usage="usage: %prog [options] file") diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py index faec2857..cbd0cf0f 100644 --- a/example/ida/depgraph.py +++ b/example/ida/depgraph.py @@ -7,6 +7,7 @@ from miasm2.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 from utils import guess_machine @@ -21,10 +22,18 @@ class depGraphSettingsForm(Form): self.stk_unalias_force = False self.address = ScreenEA() - cur_block = list(ira.getby_offset(self.address))[0] - for line_nb, l in enumerate(cur_block.lines): - if l.offset == self.address: + cur_block = None + for block in ira.getby_offset(self.address): + if block.label.offset is not None: + # Only one block non-generated + assert cur_block is None + cur_block = block + assert cur_block is not None + line_nb = None + for line_nb, assignblk in enumerate(cur_block.irs): + if assignblk.instr.offset == self.address: break + assert line_nb is not None cur_label = str(cur_block.label) labels = sorted(map(str, ira.blocks.keys())) regs = sorted(ir_arch.arch.regs.all_regs_ids_byname.keys()) @@ -102,7 +111,7 @@ Method to use: def elements(self): value = self.cbReg.value if value in self.stk_args: - line = self.ira.blocks[self.label].lines[self.line_nb] + line = self.ira.blocks[self.label].irs[self.line_nb].instr arg_num = self.stk_args[value] stk_high = m2_expr.ExprInt(GetSpd(line.offset), ir_arch.sp.size) stk_off = m2_expr.ExprInt(self.ira.sp.size/8 * arg_num, ir_arch.sp.size) @@ -167,17 +176,18 @@ for irb in ir_arch.blocks.values(): fix_stack = irb.label.offset is not None and settings.unalias_stack for i, assignblk in enumerate(irb.irs): if fix_stack: - stk_high = m2_expr.ExprInt(GetSpd(irb.lines[i].offset), ir_arch.sp.size) + stk_high = m2_expr.ExprInt(GetSpd(irb.irs[i].instr.offset), ir_arch.sp.size) fix_dct = {ir_arch.sp: mn.regs.regs_init[ir_arch.sp] + stk_high} - for dst, src in assignblk.items(): - del(assignblk[dst]) + new_assignblk = {} + for dst, src in assignblk.iteritems(): if fix_stack: src = src.replace_expr(fix_dct) if dst != ir_arch.sp: dst = dst.replace_expr(fix_dct) dst, src = expr_simp(dst), expr_simp(src) - assignblk[dst] = src + new_assignblk[dst] = src + irb.irs[i] = AssignBlock(new_assignblk, instr=assignblk.instr) # Get dependency graphs dg = settings.depgraph @@ -215,7 +225,7 @@ def treat_element(): for node in graph.relevant_nodes: try: - offset = ir_arch.blocks[node.label].lines[node.line_nb].offset + offset = ir_arch.blocks[node.label].irs[node.line_nb].instr.offset except IndexError: print "Unable to highlight %s" % node continue diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py index d2552c82..6ff4304a 100644 --- a/example/ida/graph_ir.py +++ b/example/ida/graph_ir.py @@ -11,6 +11,8 @@ from miasm2.expression.expression import * from miasm2.analysis.data_analysis import inter_bloc_flow, \ intra_bloc_flow_symbexec from miasm2.analysis.data_flow import dead_simp +from miasm2.ir.ir import AssignBlock + from utils import guess_machine, expr2colorstr @@ -133,12 +135,13 @@ for block in ab: print "IR ok... %x" % ad -for irb in ir_arch.blocks.values(): - for assignblk in irb.irs: - for dst, src in assignblk.items(): - del(assignblk[dst]) - dst, src = expr_simp(dst), expr_simp(src) - assignblk[dst] = src +for irb in ir_arch.blocks.itervalues(): + for i, assignblk in enumerate(irb.irs): + new_assignblk = { + expr_simp(dst): expr_simp(src) + for dst, src in assignblk.iteritems() + } + irb.irs[i] = AssignBlock(new_assignblk, instr=assignblk.instr) out = ir_arch.graph.dot() open(os.path.join(tempfile.gettempdir(), 'graph.dot'), 'wb').write(out) diff --git a/example/jitter/sandbox_elf_aarch64l.py b/example/jitter/sandbox_elf_aarch64l.py index 0a4c88db..0f028876 100644 --- a/example/jitter/sandbox_elf_aarch64l.py +++ b/example/jitter/sandbox_elf_aarch64l.py @@ -1,14 +1,7 @@ -import os +import logging from pdb import pm from miasm2.analysis.sandbox import Sandbox_Linux_aarch64l from miasm2.jitter.jitload import log_func -import logging - - -# Python auto completion -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) # Insert here user defined methods diff --git a/example/jitter/sandbox_pe_x86_32.py b/example/jitter/sandbox_pe_x86_32.py index 738e0778..3a627b19 100644 --- a/example/jitter/sandbox_pe_x86_32.py +++ b/example/jitter/sandbox_pe_x86_32.py @@ -1,12 +1,6 @@ -import os from pdb import pm from miasm2.analysis.sandbox import Sandbox_Win_x86_32 -# Python auto completion -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - # Insert here user defined methods # Parse arguments diff --git a/example/jitter/sandbox_pe_x86_64.py b/example/jitter/sandbox_pe_x86_64.py index 8d9db88e..773c54b9 100644 --- a/example/jitter/sandbox_pe_x86_64.py +++ b/example/jitter/sandbox_pe_x86_64.py @@ -1,12 +1,6 @@ -import os from pdb import pm from miasm2.analysis.sandbox import Sandbox_Win_x86_64 -# Python auto completion -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - # Insert here user defined methods # Parse arguments diff --git a/example/jitter/unpack_upx.py b/example/jitter/unpack_upx.py index d95c5a18..8160e51b 100644 --- a/example/jitter/unpack_upx.py +++ b/example/jitter/unpack_upx.py @@ -4,12 +4,6 @@ from pdb import pm from elfesteem import pe from miasm2.analysis.sandbox import Sandbox_Win_x86_32 - -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - - # User defined methods def kernel32_GetProcAddress(jitter): diff --git a/example/jitter/x86_32.py b/example/jitter/x86_32.py index 91244bf6..1409d7aa 100644 --- a/example/jitter/x86_32.py +++ b/example/jitter/x86_32.py @@ -1,15 +1,9 @@ -import os from argparse import ArgumentParser from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE from miasm2.analysis.machine import Machine from pdb import pm - -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - parser = ArgumentParser(description="x86 32 basic Jitter") parser.add_argument("filename", help="x86 32 shellcode filename") parser.add_argument("-j", "--jitter", diff --git a/miasm2/arch/x86/jit.py b/miasm2/arch/x86/jit.py index e64c610b..1329d7a4 100644 --- a/miasm2/arch/x86/jit.py +++ b/miasm2/arch/x86/jit.py @@ -152,12 +152,12 @@ class jitter_x86_32(jitter): def func_prepare_fastcall(self, ret_addr, *args): args_regs = ['ECX', 'EDX'] - self.push_uint32_t(ret_addr) for i in xrange(min(len(args), len(args_regs))): setattr(self.cpu, args_regs[i], args[i]) remaining_args = args[len(args_regs):] for arg in reversed(remaining_args): self.push_uint32_t(arg) + self.push_uint32_t(ret_addr) def get_arg_n_fastcall(self, index): args_regs = ['ECX', 'EDX'] @@ -171,6 +171,7 @@ class jitter_x86_64(jitter): C_Gen = x86_64_CGen args_regs_systemv = ['RDI', 'RSI', 'RDX', 'RCX', 'R8', 'R9'] + args_regs_stdcall = ['RCX', 'RDX', 'R8', 'R9'] def __init__(self, *args, **kwargs): sp = asmblock.AsmSymbolPool() @@ -205,7 +206,7 @@ class jitter_x86_64(jitter): # stdcall @named_arguments def func_args_stdcall(self, n_args): - args_regs = ['RCX', 'RDX', 'R8', 'R9'] + args_regs = self.args_regs_stdcall ret_ad = self.pop_uint64_t() args = [] for i in xrange(min(n_args, 4)): @@ -214,6 +215,15 @@ class jitter_x86_64(jitter): args.append(self.get_stack_arg(i)) return ret_ad, args + def func_prepare_stdcall(self, ret_addr, *args): + args_regs = self.args_regs_stdcall + for i in xrange(min(len(args), len(args_regs))): + setattr(self.cpu, args_regs[i], args[i]) + remaining_args = args[len(args_regs):] + for arg in reversed(remaining_args): + self.push_uint64_t(arg) + self.push_uint64_t(ret_addr) + def func_ret_stdcall(self, ret_addr, ret_value=None): self.pc = self.cpu.RIP = ret_addr if ret_value is not None: @@ -223,6 +233,7 @@ class jitter_x86_64(jitter): # cdecl func_args_cdecl = func_args_stdcall func_ret_cdecl = func_ret_stdcall + func_prepare_cdecl = func_prepare_stdcall # System V diff --git a/miasm2/jitter/arch/JitCore_aarch64.c b/miasm2/jitter/arch/JitCore_aarch64.c index 8674b684..03113d30 100644 --- a/miasm2/jitter/arch/JitCore_aarch64.c +++ b/miasm2/jitter/arch/JitCore_aarch64.c @@ -115,7 +115,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args) unsigned int i, found; if (!PyArg_ParseTuple(args, "O", &dict)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); if(!PyDict_Check(dict)) RAISE(PyExc_TypeError, "arg must be dict"); while(PyDict_Next(dict, &pos, &d_key, &d_value)){ @@ -194,7 +194,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -248,10 +248,6 @@ void MEM_WRITE_64(JitCpu* jitcpu, uint64_t addr, uint64_t src) } - - - - PyObject* vm_set_mem(JitCpu *self, PyObject* args) { PyObject *py_addr; @@ -261,10 +257,10 @@ PyObject* vm_set_mem(JitCpu *self, PyObject* args) char * buffer; uint64_t size; uint64_t addr; - int ret = 0x1337; + int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_buffer)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); diff --git a/miasm2/jitter/arch/JitCore_arm.c b/miasm2/jitter/arch/JitCore_arm.c index 869a9a7c..d6e27acc 100644 --- a/miasm2/jitter/arch/JitCore_arm.c +++ b/miasm2/jitter/arch/JitCore_arm.c @@ -79,7 +79,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args) unsigned int i, found; if (!PyArg_ParseTuple(args, "O", &dict)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); if(!PyDict_Check(dict)) RAISE(PyExc_TypeError, "arg must be dict"); while(PyDict_Next(dict, &pos, &d_key, &d_value)){ @@ -147,7 +147,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -225,10 +225,10 @@ PyObject* vm_set_mem(JitCpu *self, PyObject* args) char * buffer; uint64_t size; uint64_t addr; - int ret = 0x1337; + int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_buffer)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); diff --git a/miasm2/jitter/arch/JitCore_mips32.c b/miasm2/jitter/arch/JitCore_mips32.c index fc5589ff..04e4d883 100644 --- a/miasm2/jitter/arch/JitCore_mips32.c +++ b/miasm2/jitter/arch/JitCore_mips32.c @@ -109,7 +109,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args) unsigned int i, found; if (!PyArg_ParseTuple(args, "O", &dict)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); if(!PyDict_Check(dict)) RAISE(PyExc_TypeError, "arg must be dict"); while(PyDict_Next(dict, &pos, &d_key, &d_value)){ @@ -190,7 +190,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -254,10 +254,10 @@ PyObject* vm_set_mem(JitCpu *self, PyObject* args) char * buffer; uint64_t size; uint64_t addr; - int ret = 0x1337; + int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_buffer)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); diff --git a/miasm2/jitter/arch/JitCore_msp430.c b/miasm2/jitter/arch/JitCore_msp430.c index bfa35926..d30655dd 100644 --- a/miasm2/jitter/arch/JitCore_msp430.c +++ b/miasm2/jitter/arch/JitCore_msp430.c @@ -92,7 +92,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args) unsigned int i, found; if (!PyArg_ParseTuple(args, "O", &dict)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); if(!PyDict_Check(dict)) RAISE(PyExc_TypeError, "arg must be dict"); while(PyDict_Next(dict, &pos, &d_key, &d_value)){ @@ -164,7 +164,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -227,10 +227,10 @@ PyObject* vm_set_mem(JitCpu *self, PyObject* args) char * buffer; uint64_t size; uint64_t addr; - int ret = 0x1337; + int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_buffer)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); diff --git a/miasm2/jitter/arch/JitCore_x86.c b/miasm2/jitter/arch/JitCore_x86.c index 8b52b8eb..3198eff3 100644 --- a/miasm2/jitter/arch/JitCore_x86.c +++ b/miasm2/jitter/arch/JitCore_x86.c @@ -138,7 +138,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args) unsigned int i, found; if (!PyArg_ParseTuple(args, "O", &dict)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); if(!PyDict_Check(dict)) RAISE(PyExc_TypeError, "arg must be dict"); while(PyDict_Next(dict, &pos, &d_key, &d_value)){ @@ -238,7 +238,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -258,7 +258,7 @@ PyObject* cpu_set_interrupt_num(JitCpu* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -278,7 +278,7 @@ PyObject* cpu_set_segm_base(JitCpu* self, PyObject* args) uint64_t segm_num, segm_base; if (!PyArg_ParseTuple(args, "OO", &item1, &item2)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, segm_num); PyGetInt(item2, segm_base); @@ -295,7 +295,7 @@ PyObject* cpu_get_segm_base(JitCpu* self, PyObject* args) PyObject* v; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, segm_num); v = PyInt_FromLong((long)(((vm_cpu_t*)self->cpu)->segm_base[segm_num])); return v; @@ -355,10 +355,10 @@ PyObject* vm_set_mem(JitCpu *self, PyObject* args) char * buffer; uint64_t size; uint64_t addr; - int ret = 0x1337; + int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_buffer)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); diff --git a/miasm2/jitter/codegen.py b/miasm2/jitter/codegen.py index e91f3505..b2398dd2 100644 --- a/miasm2/jitter/codegen.py +++ b/miasm2/jitter/codegen.py @@ -8,7 +8,7 @@ from miasm2.ir.translators import Translator from miasm2.core.asmblock import expr_is_label, AsmBlockBad, AsmLabel # Miasm to C translator -translator = Translator.to_language("C") +TRANSLATOR = Translator.to_language("C") SIZE_TO_MASK = {x: 2**x - 1 for x in (1, 2, 3, 7, 8, 16, 32, 64)} @@ -32,6 +32,9 @@ class Attributes(object): class CGen(object): + """ + Helper to generate C code for a given AsmBlock + """ IMPLICIT_EXCEPTION_OP = set(['umod', 'udiv']) @@ -104,6 +107,7 @@ class CGen(object): self.init_arch_C() def init_arch_C(self): + """Iinitialize jitter internals""" self.id_to_c_id = {} for reg in self.ir_arch.arch.regs.all_regs_ids: self.id_to_c_id[reg] = m2_expr.ExprId('mycpu->%s' % reg, reg.size) @@ -112,24 +116,29 @@ class CGen(object): @staticmethod def label_to_jitlabel(lbl): + """Convert AsmLabel to a jitter label name""" assert lbl.offset is not None return "jitblock_%X" % lbl.offset def dst_to_c(self, src): + """Translate Expr @src into C code""" if not isinstance(src, m2_expr.Expr): src = m2_expr.ExprInt(src, self.PC.size) return self.id_to_c(src) def patch_c_id(self, expr): + """Replace ExprId in @expr with corresponding C variables""" return expr.replace_expr(self.id_to_c_id) def id_to_c(self, expr): - return translator.from_expr(self.patch_c_id(expr)) - - def get_post_instr_label(self, offset): - return self.ir_arch.symbol_pool.getby_name_create("lbl_gen_post_instr_%.8X" % (offset)) + """Translate Expr @expr into corresponding C code""" + return TRANSLATOR.from_expr(self.patch_c_id(expr)) def add_label_index(self, dst2index, lbl): + """Insert @lbl to the dictionnary @dst2index with a uniq value + @dst2index: AsmLabel -> uniq value + @lbl: AsmLabel istance""" + dst2index[lbl] = len(dst2index) def assignblk_to_irbloc(self, instr, assignblk): @@ -260,10 +269,14 @@ class CGen(object): return c_prefetch, c_var, c_main, c_mem, c_updt def gen_check_memory_exception(self, address): + """Generate C code to check memory exceptions + @address: address of the faulty instruction""" dst = self.dst_to_c(address) return (self.CODE_EXCEPTION_MEM_AT_INSTR % (self.C_PC, dst, dst)).split('\n') def gen_check_cpu_exception(self, address): + """Generate C code to check cpu exceptions + @address: address of the faulty instruction""" dst = self.dst_to_c(address) return (self.CODE_EXCEPTION_AT_INSTR % (self.C_PC, dst, dst)).split('\n') @@ -279,29 +292,25 @@ class CGen(object): src2, src2b = self.traverse_expr_dst(expr.src2, dst2index) return ("((%s)?(%s):(%s))" % (cond, src1, src2), "((%s)?(%s):(%s))" % (cond, src1b, src2b)) - elif isinstance(expr, m2_expr.ExprInt): + if isinstance(expr, m2_expr.ExprInt): offset = int(expr) self.add_label_index(dst2index, offset) - return ("%s" % dst2index[offset], - hex(offset)) - elif expr_is_label(expr): + return ("%s" % dst2index[offset], hex(offset)) + if expr_is_label(expr): label = expr.name if label.offset != None: offset = label.offset self.add_label_index(dst2index, offset) - return ("%s" % dst2index[offset], - hex(offset)) - else: - self.add_label_index(dst2index, label) - return ("%s" % dst2index[label], - "0") + return ("%s" % dst2index[offset], hex(offset)) + self.add_label_index(dst2index, label) + return ("%s" % dst2index[label], "0") - else: - dst2index[expr] = -1 - return ("-1", - self.id_to_c(expr)) + dst2index[expr] = -1 + return ("-1", self.id_to_c(expr)) def gen_assignblk_dst(self, dst): + """Generate C code to handle instruction destination + @dst: instruction destination Expr""" dst2index = {} (ret, retb) = self.traverse_expr_dst(dst, dst2index) ret = "DST_case = %s;" % ret @@ -311,6 +320,8 @@ class CGen(object): '%s' % retb], dst2index def gen_post_instr_checks(self, attrib): + """Generate C code for handling potential exceptions + @attrib: Attributes instance""" out = [] if attrib.mem_read | attrib.mem_write: out += (self.CODE_VM_EXCEPTION_POST_INSTR % (self.C_PC)).split('\n') @@ -323,6 +334,9 @@ class CGen(object): return out def gen_pre_code(self, instr_attrib): + """Callback to generate code BEFORE the instruction execution + @instr_attrib: Attributes instance""" + out = [] if instr_attrib.log_mn: @@ -331,12 +345,18 @@ class CGen(object): return out def gen_post_code(self, attrib): + """Callback to generate code AFTER the instruction execution + @attrib: Attributes instance""" out = [] if attrib.log_regs: out.append('dump_gpregs(jitcpu->cpu);') return out def gen_goto_code(self, attrib, instr_offsets, dst): + """Generate C code for a potential destination @dst + @attrib: instruction Attributes + @instr_offsets: instructions offsets list + @dst: potential instruction destination""" if isinstance(dst, AsmLabel) and dst.offset is None: # Generate goto for local labels return ['goto %s;' % dst.name] @@ -479,7 +499,7 @@ class CGen(object): @log_regs: generate code to log registers states """ - instr_attrib = Attributes() + instr_attrib = Attributes(log_mn, log_regs) instr_attrib.instr = instr irblocks_attributes = [] @@ -505,6 +525,9 @@ class CGen(object): return self.CODE_BAD_BLOCK.split("\n") def get_block_post_label(self, block): + """Get label next to the @block + @block: AsmBlock instance""" + last_instr = block.lines[-1] offset = last_instr.offset + last_instr.l return self.ir_arch.symbol_pool.getby_offset_create(offset) diff --git a/miasm2/jitter/vm_mngr_py.c b/miasm2/jitter/vm_mngr_py.c index 4436add2..5f25b707 100644 --- a/miasm2/jitter/vm_mngr_py.c +++ b/miasm2/jitter/vm_mngr_py.c @@ -76,7 +76,9 @@ PyObject* set_alarm(VmMngr* self) { global_vmmngr = self; signal(SIGALRM, sig_alarm); - return PyLong_FromUnsignedLongLong((uint64_t)0); + + Py_INCREF(Py_None); + return Py_None; } @@ -90,7 +92,6 @@ PyObject* vm_add_memory_page(VmMngr* self, PyObject* args) uint64_t buf_size; char* buf_data; Py_ssize_t length; - uint64_t ret = 0x1337beef; uint64_t page_addr; uint64_t page_access; char* name_ptr; @@ -98,7 +99,7 @@ PyObject* vm_add_memory_page(VmMngr* self, PyObject* args) struct memory_page_node * mpn; if (!PyArg_ParseTuple(args, "OOO|O", &addr, &access, &item_str, &name)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(addr, page_addr); PyGetInt(access, page_access); @@ -128,8 +129,8 @@ PyObject* vm_add_memory_page(VmMngr* self, PyObject* args) memcpy(mpn->ad_hp, buf_data, buf_size); add_memory_page(&self->vm_mngr, mpn); - return PyLong_FromUnsignedLongLong((uint64_t)ret); - + Py_INCREF(Py_None); + return Py_None; } @@ -138,14 +139,12 @@ PyObject* vm_set_mem_access(VmMngr* self, PyObject* args) { PyObject *addr; PyObject *access; - - uint64_t ret = 0x1337beef; uint64_t page_addr; uint64_t page_access; struct memory_page_node * mpn; if (!PyArg_ParseTuple(args, "OO", &addr, &access)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(addr, page_addr); PyGetInt(access, page_access); @@ -157,7 +156,9 @@ PyObject* vm_set_mem_access(VmMngr* self, PyObject* args) } mpn->access = page_access; - return PyLong_FromUnsignedLongLong((uint64_t)ret); + + Py_INCREF(Py_None); + return Py_None; } PyObject* vm_set_mem(VmMngr* self, PyObject* args) @@ -169,15 +170,15 @@ PyObject* vm_set_mem(VmMngr* self, PyObject* args) char * buffer; uint64_t size; uint64_t addr; - int ret = 0x1337; + int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_buffer)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); - if(!PyString_Check(py_buffer)) - RAISE(PyExc_TypeError,"arg must be str"); + if (!PyString_Check(py_buffer)) + RAISE(PyExc_TypeError,"arg must be str"); size = PyString_Size(py_buffer); PyString_AsStringAndSize(py_buffer, &buffer, &py_length); @@ -202,7 +203,7 @@ PyObject* vm_get_mem_access(VmMngr* self, PyObject* args) struct memory_page_node * mpn; if (!PyArg_ParseTuple(args, "O", &py_addr)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, page_addr); @@ -227,15 +228,14 @@ PyObject* vm_get_mem(VmMngr* self, PyObject* args) int ret; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_len)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); PyGetInt(py_len, size); ret = vm_read_mem(&self->vm_mngr, addr, &buf_out, size); if (ret < 0) { - PyErr_SetString(PyExc_RuntimeError, "cannot find address"); - return NULL; + RAISE(PyExc_TypeError,"Cannot find address"); } obj_out = PyString_FromStringAndSize(buf_out, size); @@ -255,7 +255,7 @@ PyObject* vm_add_memory_breakpoint(VmMngr* self, PyObject* args) uint64_t b_access; if (!PyArg_ParseTuple(args, "OOO", &ad, &size, &access)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(ad, b_ad); PyGetInt(size, b_size); @@ -283,7 +283,7 @@ PyObject* vm_remove_memory_breakpoint(VmMngr* self, PyObject* args) uint64_t b_access; if (!PyArg_ParseTuple(args, "OO", &ad, &access)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(ad, b_ad); PyGetInt(access, b_access); @@ -300,7 +300,7 @@ PyObject* vm_set_exception(VmMngr* self, PyObject* args) uint64_t i; if (!PyArg_ParseTuple(args, "O", &item1)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, i); @@ -363,7 +363,7 @@ PyObject* py_add_mem_read(VmMngr* self, PyObject* args) uint64_t size; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_size)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); PyGetInt(py_size, size); @@ -381,7 +381,7 @@ PyObject* py_add_mem_write(VmMngr* self, PyObject* args) uint64_t size; if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_size)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(py_addr, addr); PyGetInt(py_size, size); @@ -482,13 +482,12 @@ PyObject* vm_add_code_bloc(VmMngr *self, PyObject *args) { PyObject *item1; PyObject *item2; - uint64_t ret = 0x1337beef; uint64_t ad_start, ad_stop, ad_code = 0; struct code_bloc_node * cbp; if (!PyArg_ParseTuple(args, "OO", &item1, &item2)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(item1, ad_start); PyGetInt(item2, ad_stop); @@ -498,7 +497,9 @@ PyObject* vm_add_code_bloc(VmMngr *self, PyObject *args) cbp->ad_stop = ad_stop; cbp->ad_code = ad_code; add_code_bloc(&self->vm_mngr, cbp); - return PyLong_FromUnsignedLongLong((uint64_t)ret); + + Py_INCREF(Py_None); + return Py_None; } PyObject* vm_dump_code_bloc_pool(VmMngr* self) @@ -520,7 +521,7 @@ PyObject* vm_is_mapped(VmMngr* self, PyObject* args) int ret; if (!PyArg_ParseTuple(args, "OO", &ad, &size)) - return NULL; + RAISE(PyExc_TypeError,"Cannot parse arguments"); PyGetInt(ad, b_ad); PyGetInt(size, b_size); diff --git a/test/arch/aarch64/arch.py b/test/arch/aarch64/arch.py index 4fc9a3c4..ec978024 100644 --- a/test/arch/aarch64/arch.py +++ b/test/arch/aarch64/arch.py @@ -1,12 +1,7 @@ -import os, sys +import sys import time from miasm2.arch.aarch64.arch import * -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - - reg_tests_aarch64 = [ ("XXXXXXXX MOV W1, WZR", "E1031F2A"), diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py index d2022238..cb0e56fe 100644 --- a/test/arch/arm/arch.py +++ b/test/arch/arm/arch.py @@ -1,11 +1,6 @@ -import os import time from miasm2.arch.arm.arch import * -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - if 0: a = bs('00') b = bs('01') diff --git a/test/arch/mips32/arch.py b/test/arch/mips32/arch.py index 0fb12e1b..b28e2583 100644 --- a/test/arch/mips32/arch.py +++ b/test/arch/mips32/arch.py @@ -1,18 +1,8 @@ -import os, sys import time from pdb import pm -sys.path.append('/home/serpilliere/projet/m2_devel') from miasm2.arch.mips32.arch import * -import sys - - -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - - reg_tests_mips32 = [ ("004496D8 ADDU GP, GP, T9", "0399E021"), diff --git a/test/arch/msp430/arch.py b/test/arch/msp430/arch.py index 613af385..b3dbac82 100644 --- a/test/arch/msp430/arch.py +++ b/test/arch/msp430/arch.py @@ -1,12 +1,6 @@ - -import os import time from miasm2.arch.msp430.arch import * -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - def h2i(s): return s.replace(' ', '').decode('hex') diff --git a/test/arch/sh4/arch.py b/test/arch/sh4/arch.py index b7e79d30..7d3d890e 100644 --- a/test/arch/sh4/arch.py +++ b/test/arch/sh4/arch.py @@ -1,13 +1,7 @@ -import os import time from sys import stderr from miasm2.arch.sh4.arch import * -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) - - def h2i(s): return s.replace(' ', '').decode('hex') diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py index 83039368..72884f7e 100644 --- a/test/arch/x86/arch.py +++ b/test/arch/x86/arch.py @@ -1,4 +1,3 @@ -import os import time import miasm2.expression.expression as m2_expr from miasm2.arch.x86.arch import mn_x86, deref_mem_ad, ParseAst, ast_int2expr, \ @@ -6,9 +5,6 @@ from miasm2.arch.x86.arch import mn_x86, deref_mem_ad, ParseAst, ast_int2expr, \ from miasm2.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64 from miasm2.core.bin_stream import bin_stream_str -filename = os.environ.get('PYTHONSTARTUP') -if filename and os.path.isfile(filename): - execfile(filename) for s in ["[EAX]", "[0x10]", "[EBX + 0x10]", |