diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-02-15 16:22:21 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-03-13 14:13:14 +0100 |
| commit | d0727aa74bf264580e82f37abc9833b75804daca (patch) | |
| tree | e5ec4298599a5907b45d009c4da2755c6ba523c0 /miasm2/core/parse_asm.py | |
| parent | e1fc2de7e4d8662d5b97ceb7d7a9b9ba24acddaa (diff) | |
| download | miasm-d0727aa74bf264580e82f37abc9833b75804daca.tar.gz miasm-d0727aa74bf264580e82f37abc9833b75804daca.zip | |
Asmbloc: rename asm_label to AsmLabel
Diffstat (limited to 'miasm2/core/parse_asm.py')
| -rw-r--r-- | miasm2/core/parse_asm.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/miasm2/core/parse_asm.py b/miasm2/core/parse_asm.py index ce982b48..e51a2412 100644 --- a/miasm2/core/parse_asm.py +++ b/miasm2/core/parse_asm.py @@ -73,11 +73,11 @@ def guess_next_new_label(symbol_pool): def replace_expr_labels(expr, symbol_pool, replace_id): - """Create asm_label of the expression @expr in the @symbol_pool + """Create AsmLabel of the expression @expr in the @symbol_pool Update @replace_id""" if not (isinstance(expr, m2_expr.ExprId) and - isinstance(expr.name, asmbloc.asm_label)): + isinstance(expr.name, asmbloc.AsmLabel)): return expr old_lbl = expr.name @@ -218,7 +218,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): line = line.strip(' ').strip('\t') instr = mnemo.fromstring(line, attrib) - # replace orphan asm_label with labels from symbol_pool + # replace orphan AsmLabel with labels from symbol_pool replace_orphan_labels(instr, symbol_pool) if instr.dstflow(): @@ -250,7 +250,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): block_to_nlink = None i += 1 continue - elif not isinstance(line, asmbloc.asm_label): + elif not isinstance(line, asmbloc.AsmLabel): # First line must be a label. If it's not the case, generate # it. label = guess_next_new_label(symbol_pool) @@ -281,7 +281,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): elif isinstance(line, asmbloc.asm_raw): cur_block.addline(line) block_to_nlink = cur_block - elif isinstance(line, asmbloc.asm_label): + elif isinstance(line, asmbloc.AsmLabel): if block_to_nlink: cur_block.addto( asmbloc.asm_constraint(line, C_NEXT)) |