diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-02-15 16:01:40 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-03-13 14:13:13 +0100 |
| commit | 9f04c551bddbc7fcab1921a2081a6ee9ea50a2f2 (patch) | |
| tree | 1dee93cb415b8cc271637e332c09d223655929f2 /test/core/asmbloc.py | |
| parent | 287cb1bb182112ad8b476a9631f0099163041fdc (diff) | |
| download | miasm-9f04c551bddbc7fcab1921a2081a6ee9ea50a2f2.tar.gz miasm-9f04c551bddbc7fcab1921a2081a6ee9ea50a2f2.zip | |
Asmbloc: rename asm_bloc to AsmBlock
Diffstat (limited to 'test/core/asmbloc.py')
| -rw-r--r-- | test/core/asmbloc.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/core/asmbloc.py b/test/core/asmbloc.py index 5fbdca3e..e2f9631e 100644 --- a/test/core/asmbloc.py +++ b/test/core/asmbloc.py @@ -2,7 +2,7 @@ from pdb import pm from miasm2.arch.x86.disasm import dis_x86_32 from miasm2.analysis.binary import Container -from miasm2.core.asmbloc import AsmCFG, asm_constraint, asm_bloc, \ +from miasm2.core.asmbloc import AsmCFG, asm_constraint, AsmBlock, \ asm_label, asm_block_bad, asm_constraint_to, asm_constraint_next, \ bbl_simplifier from miasm2.core.graph import DiGraphSimplifier, MatchGraphJoker @@ -98,7 +98,7 @@ open("graph2.dot", "w").write(blocks.dot()) # Test helper methods ## Label2block should always be updated assert blocks.label2block(first_block.label) == first_block -my_block = asm_bloc(asm_label("testlabel")) +my_block = AsmBlock(asm_label("testlabel")) blocks.add_node(my_block) assert len(blocks) == 3 assert blocks.label2block(first_block.label) == first_block @@ -126,7 +126,7 @@ assert len(list(blocks.get_bad_blocks_predecessors(strict=True))) == 0 ## Sanity check blocks.sanity_check() ### Next on itself -my_block_ni = asm_bloc(asm_label("testlabel_nextitself")) +my_block_ni = AsmBlock(asm_label("testlabel_nextitself")) my_block_ni.bto.add(asm_constraint_next(my_block_ni.label)) blocks.add_node(my_block_ni) error_raised = False @@ -139,10 +139,10 @@ assert error_raised blocks.del_node(my_block_ni) blocks.sanity_check() ### Multiple next on the same node -my_block_target = asm_bloc(asm_label("testlabel_target")) +my_block_target = AsmBlock(asm_label("testlabel_target")) blocks.add_node(my_block_target) -my_block_src1 = asm_bloc(asm_label("testlabel_src1")) -my_block_src2 = asm_bloc(asm_label("testlabel_src2")) +my_block_src1 = AsmBlock(asm_label("testlabel_src1")) +my_block_src2 = AsmBlock(asm_label("testlabel_src2")) my_block_src1.bto.add(asm_constraint_next(my_block_target.label)) blocks.add_node(my_block_src1) ### OK for now @@ -171,8 +171,8 @@ assert blocks.label2block(my_block_src1.label).max_size == 0 ## Check pendings ### Create a pending element -my_block_src = asm_bloc(asm_label("testlabel_pend_src")) -my_block_dst = asm_bloc(asm_label("testlabel_pend_dst")) +my_block_src = AsmBlock(asm_label("testlabel_pend_src")) +my_block_dst = AsmBlock(asm_label("testlabel_pend_dst")) my_block_src.bto.add(asm_constraint_to(my_block_dst.label)) blocks.add_node(my_block_src) ### Check resulting state |