From acb866d6d401e5cfbdb01c4a888fe8017c472281 Mon Sep 17 00:00:00 2001 From: Camille Mougey Date: Mon, 3 Nov 2014 19:12:35 +0100 Subject: TestDis: update example to use Container --- example/disasm_03.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'example/disasm_03.py') diff --git a/example/disasm_03.py b/example/disasm_03.py index 08b209a1..72c08c0d 100644 --- a/example/disasm_03.py +++ b/example/disasm_03.py @@ -11,10 +11,8 @@ if len(sys.argv) != 3: fname = sys.argv[1] ad = int(sys.argv[2], 16) -e = pe_init.PE(open(fname).read()) -bs = bin_stream_pe(e.virt) - -mdis = dis_x86_32(bs) +cont = Container.from_stream(open(sys.argv[1])) +mdis = dis_x86_32(cont.bin_stream) # inform the engine not to disasm nul instructions mdis.dont_dis_nulstart_bloc = True blocs = mdis.dis_multibloc(ad) -- cgit 1.4.1 From 1a09c007ae8f6a391a90fa4ef4aa14c71ed672f6 Mon Sep 17 00:00:00 2001 From: Camille Mougey Date: Mon, 3 Nov 2014 19:15:09 +0100 Subject: TestDis: fix imports --- example/disasm_03.py | 4 +--- example/test_dis.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'example/disasm_03.py') diff --git a/example/disasm_03.py b/example/disasm_03.py index 72c08c0d..1141dc55 100644 --- a/example/disasm_03.py +++ b/example/disasm_03.py @@ -1,15 +1,13 @@ import sys -from elfesteem import pe_init from miasm2.arch.x86.disasm import dis_x86_32 from miasm2.core.asmbloc import bloc2graph -from miasm2.core.bin_stream import bin_stream_pe +from miasm2.analysis.binary import Container if len(sys.argv) != 3: print 'Example:' print "%s box_upx.exe 0x410f90" % sys.argv[0] sys.exit(0) -fname = sys.argv[1] ad = int(sys.argv[2], 16) cont = Container.from_stream(open(sys.argv[1])) mdis = dis_x86_32(cont.bin_stream) diff --git a/example/test_dis.py b/example/test_dis.py index ba0d7921..722e99c9 100644 --- a/example/test_dis.py +++ b/example/test_dis.py @@ -4,10 +4,8 @@ import time from miasm2.analysis.binary import Container from miasm2.core.asmbloc import * -from miasm2.expression.simplifications import expr_simp from optparse import OptionParser -from miasm2.core.cpu import dum_arg -from miasm2.expression.expression import * +from miasm2.expression.expression import ExprId from miasm2.core.interval import interval from miasm2.analysis.machine import Machine from pdb import pm -- cgit 1.4.1