diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2015-03-27 14:22:52 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2015-04-01 23:47:37 +0200 |
| commit | 22777cc19e6e1f43fbbfb908e5d4d4cd7c76b391 (patch) | |
| tree | 9a8d78a9374ed7df6024113acca9920a1fe87df8 | |
| parent | bfd16630a2724889c9f2d5d7b39183283ac4622d (diff) | |
| download | miasm-22777cc19e6e1f43fbbfb908e5d4d4cd7c76b391.tar.gz miasm-22777cc19e6e1f43fbbfb908e5d4d4cd7c76b391.zip | |
Asmbloc: updt asmbloc api
| -rw-r--r-- | example/asm/shellcode.py | 4 | ||||
| -rw-r--r-- | example/asm/simple.py | 4 | ||||
| -rw-r--r-- | example/expression/asm_to_ir.py | 2 | ||||
| -rw-r--r-- | test/arch/x86/sem.py | 5 | ||||
| -rw-r--r-- | test/arch/x86/unit/asm_test.py | 3 |
5 files changed, 7 insertions, 11 deletions
diff --git a/example/asm/shellcode.py b/example/asm/shellcode.py index 89914b6d..7bf76093 100644 --- a/example/asm/shellcode.py +++ b/example/asm/shellcode.py @@ -88,9 +88,7 @@ graph = asmbloc.bloc2graph(blocs[0]) open("graph.txt", "w").write(graph) # Apply patches -resolved_b, patches = asmbloc.asm_resolve_final(machine.mn, - blocs[0], - symbol_pool) +patches = asmbloc.asm_resolve_final(machine.mn, blocs[0], symbol_pool) if args.encrypt: # Encrypt code ad_start = symbol_pool.getby_name_create(args.encrypt[0]).offset diff --git a/example/asm/simple.py b/example/asm/simple.py index 8664672d..1929961f 100644 --- a/example/asm/simple.py +++ b/example/asm/simple.py @@ -27,10 +27,10 @@ loop: symbol_pool.set_offset(symbol_pool.getby_name("main"), 0x0) # Spread information and resolve instructions offset -resolved_b, patches = asmbloc.asm_resolve_final(mn_x86, blocs[0], symbol_pool) +patches = asmbloc.asm_resolve_final(mn_x86, blocs[0], symbol_pool) # Show resolved blocs -for bloc in resolved_b: +for bloc in blocs[0]: print bloc # Print offset -> bytes diff --git a/example/expression/asm_to_ir.py b/example/expression/asm_to_ir.py index cec32c06..ccb7202e 100644 --- a/example/expression/asm_to_ir.py +++ b/example/expression/asm_to_ir.py @@ -39,7 +39,7 @@ for b in blocs: print "symbols:" print symbol_pool -resolved_b, patches = asmbloc.asm_resolve_final(mn_x86, blocs, symbol_pool) +patches = asmbloc.asm_resolve_final(mn_x86, blocs, symbol_pool) # Translate to IR ir_arch = ir_a_x86_32(symbol_pool) diff --git a/test/arch/x86/sem.py b/test/arch/x86/sem.py index d2c998c8..b80ab33d 100644 --- a/test/arch/x86/sem.py +++ b/test/arch/x86/sem.py @@ -47,10 +47,9 @@ def compute(ir, mode, asm, inputstate={}, debug=False): def compute_txt(ir, mode, txt, inputstate={}, debug=False): blocs, symbol_pool = parse_asm.parse_txt(mn, mode, txt) symbol_pool.set_offset(symbol_pool.getby_name("main"), 0x0) - resolved_b, patches = asmbloc.asm_resolve_final( - mn, blocs[0], symbol_pool) + patches = asmbloc.asm_resolve_final(mn, blocs[0], symbol_pool) interm = ir(symbol_pool) - for bbl in resolved_b: + for bbl in blocs[0]: interm.add_bloc(bbl) return symb_exec(interm, inputstate, debug) diff --git a/test/arch/x86/unit/asm_test.py b/test/arch/x86/unit/asm_test.py index f28c4d2f..b65ef876 100644 --- a/test/arch/x86/unit/asm_test.py +++ b/test/arch/x86/unit/asm_test.py @@ -53,8 +53,7 @@ class Asm_Test(object): # fix shellcode addr symbol_pool.set_offset(symbol_pool.getby_name("main"), 0x0) s = StrPatchwork() - resolved_b, patches = asmbloc.asm_resolve_final( - mn_x86, blocs[0], symbol_pool) + patches = asmbloc.asm_resolve_final(mn_x86, blocs[0], symbol_pool) for offset, raw in patches.items(): s[offset] = raw |