diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-03-13 14:19:44 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-03-13 15:07:28 +0100 |
| commit | 1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e (patch) | |
| tree | f2ed11ae52cff5c21617d239f54d9d99f696cff3 /example/asm | |
| parent | 7a473f0df464b3134bad5ad028e92cf780cd2cc5 (diff) | |
| download | miasm-1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e.tar.gz miasm-1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e.zip | |
Core/asmbloc: move asmbloc to asmblock
Diffstat (limited to 'example/asm')
| -rwxr-xr-x | example/asm/shellcode.py | 4 | ||||
| -rw-r--r-- | example/asm/simple.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/example/asm/shellcode.py b/example/asm/shellcode.py index 20fa02d8..bacb65fb 100755 --- a/example/asm/shellcode.py +++ b/example/asm/shellcode.py @@ -5,7 +5,7 @@ from pdb import pm from elfesteem import pe_init from elfesteem.strpatchwork import StrPatchwork -from miasm2.core import parse_asm, asmbloc +from miasm2.core import parse_asm, asmblock from miasm2.analysis.machine import Machine from miasm2.core.interval import interval @@ -79,7 +79,7 @@ for block in blocks: open("graph.dot", "w").write(blocks.dot()) # Apply patches -patches = asmbloc.asm_resolve_final(machine.mn, +patches = asmblock.asm_resolve_final(machine.mn, blocks, symbol_pool, dst_interval) diff --git a/example/asm/simple.py b/example/asm/simple.py index 7ab403f4..62d2ff80 100644 --- a/example/asm/simple.py +++ b/example/asm/simple.py @@ -2,7 +2,7 @@ from pdb import pm from pprint import pprint from miasm2.arch.x86.arch import mn_x86 -from miasm2.core import parse_asm, asmbloc +from miasm2.core import parse_asm, asmblock # Assemble code @@ -25,7 +25,7 @@ loop: symbol_pool.set_offset(symbol_pool.getby_name("main"), 0x0) # Spread information and resolve instructions offset -patches = asmbloc.asm_resolve_final(mn_x86, blocks, symbol_pool) +patches = asmblock.asm_resolve_final(mn_x86, blocks, symbol_pool) # Show resolved blocks for block in blocks: |