diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2017-07-20 19:35:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 19:35:49 +0200 |
| commit | 4dfca940e75ad8af65b69dd9bab9ff503141984b (patch) | |
| tree | aad96a02c272397eae9fd7377ea86a713814516a /test/core/asmblock.py | |
| parent | e45256e15c62aba315ab1e2db5697a14837f5827 (diff) | |
| parent | 4fcd0faa925d8d33db3622430548e932443d6f02 (diff) | |
| download | focaccia-miasm-4dfca940e75ad8af65b69dd9bab9ff503141984b.tar.gz focaccia-miasm-4dfca940e75ad8af65b69dd9bab9ff503141984b.zip | |
Merge pull request #579 from serpilliere/fix_get_bloc
Fix get bloc
Diffstat (limited to 'test/core/asmblock.py')
| -rw-r--r-- | test/core/asmblock.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/core/asmblock.py b/test/core/asmblock.py index d12cd510..c3b220df 100644 --- a/test/core/asmblock.py +++ b/test/core/asmblock.py @@ -15,17 +15,17 @@ cont = Container.from_string(data) # Test Disasm engine mdis = dis_x86_32(cont.bin_stream) ## Disassembly of one block -first_block = mdis.dis_bloc(0) +first_block = mdis.dis_block(0) assert len(first_block.lines) == 5 print first_block ## Disassembly of several block, with cache -blocks = mdis.dis_multibloc(0) +blocks = mdis.dis_multiblock(0) assert len(blocks) == 0 ## Test cache mdis.job_done.clear() -blocks = mdis.dis_multibloc(0) +blocks = mdis.dis_multiblock(0) assert len(blocks) == 17 ## Equality between assembly lines is not yet implemented assert len(blocks.heads()) == 1 @@ -202,11 +202,11 @@ data2 = "31c0eb0c31c9750c31d2eb0c31ffebf831dbebf031edebfc31f6ebf031e4c3".decode( cont2 = Container.from_string(data2) mdis = dis_x86_32(cont2.bin_stream) ## Elements to merge -blocks = mdis.dis_multibloc(0) +blocks = mdis.dis_multiblock(0) ## Block alone -blocks.add_node(mdis.dis_bloc(0x1c)) +blocks.add_node(mdis.dis_block(0x1c)) ## Bad block -blocks.add_node(mdis.dis_bloc(len(data2))) +blocks.add_node(mdis.dis_block(len(data2))) ## Dump the graph before merging open("graph3.dot", "w").write(blocks.dot()) ## Apply merging @@ -285,7 +285,7 @@ assert blocks.edges2constraint[(tob, newb)] == AsmConstraint.c_to data = "74097405b8020000007405b803000000b804000000c3".decode('hex') cont = Container.from_string(data) mdis = dis_x86_32(cont.bin_stream) -blocks = mdis.dis_multibloc(0) +blocks = mdis.dis_multiblock(0) ## Check resulting disasm assert len(blocks.nodes()) == 6 blocks.sanity_check() |