diff options
| author | Ajax <commial@gmail.com> | 2018-06-17 10:58:37 +0200 |
|---|---|---|
| committer | Ajax <commial@gmail.com> | 2018-06-17 12:35:23 +0200 |
| commit | 94fbf89c0002557261baace6c5505f9ae56fff17 (patch) | |
| tree | 22ba477b543b867a8032c07bed4d34fd5a91ffb6 | |
| parent | 99e1aeaa41d3560f4f1ed226a00ad2ea198efc2d (diff) | |
| download | miasm-94fbf89c0002557261baace6c5505f9ae56fff17.tar.gz miasm-94fbf89c0002557261baace6c5505f9ae56fff17.zip | |
Unify ExprLoc str with LocKey and others
| -rw-r--r-- | miasm2/expression/expression.py | 2 | ||||
| -rw-r--r-- | test/core/asmblock.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/miasm2/expression/expression.py b/miasm2/expression/expression.py index 5ea596ae..b8266bf7 100644 --- a/miasm2/expression/expression.py +++ b/miasm2/expression/expression.py @@ -644,7 +644,7 @@ class ExprLoc(Expr): return Expr.get_object(cls, (loc_key, size)) def __str__(self): - return "label_%d" % self._loc_key.key + return "loc_%d" % self._loc_key.key def get_r(self, mem_read=False, cst_read=False): return set() diff --git a/test/core/asmblock.py b/test/core/asmblock.py index c4a97518..0e965bfd 100644 --- a/test/core/asmblock.py +++ b/test/core/asmblock.py @@ -247,7 +247,7 @@ assert len(entry_block.lines) == 4 assert map(str, entry_block.lines) == ['XOR EAX, EAX', 'XOR EBX, EBX', 'XOR ECX, ECX', - 'JNZ label_3'] + 'JNZ loc_3'] assert len(asmcfg.successors(entry_block.loc_key)) == 2 assert len(entry_block.bto) == 2 nextb = asmcfg.loc_key_to_block((cons.loc_key for cons in entry_block.bto @@ -258,11 +258,11 @@ assert len(nextb.lines) == 4 assert map(str, nextb.lines) == ['XOR EDX, EDX', 'XOR ESI, ESI', 'XOR EDI, EDI', - 'JMP label_4'] + 'JMP loc_4'] assert asmcfg.successors(nextb.loc_key) == [nextb.loc_key] assert len(tob.lines) == 2 assert map(str, tob.lines) == ['XOR EBP, EBP', - 'JMP label_3'] + 'JMP loc_3'] assert asmcfg.successors(tob.loc_key) == [tob.loc_key] # Check split_block @@ -289,7 +289,7 @@ lbl_newb = asmcfg.successors(entry_block.loc_key)[0] newb = asmcfg.loc_key_to_block(lbl_newb) assert len(newb.lines) == 2 assert map(str, newb.lines) == ['XOR ECX, ECX', - 'JNZ label_3'] + 'JNZ loc_3'] preds = asmcfg.predecessors(lbl_newb) assert len(preds) == 2 assert entry_block.loc_key in preds |