diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-02-15 16:59:34 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2017-03-13 14:13:14 +0100 |
| commit | 397af784e950e4df8a76b4e2806e743193580943 (patch) | |
| tree | 34716b15db60fa003fa1d07a39374e4bb42b7a05 | |
| parent | 72d7235d59d0998bee24b3bf9b18d5501e84f085 (diff) | |
| download | miasm-397af784e950e4df8a76b4e2806e743193580943.tar.gz miasm-397af784e950e4df8a76b4e2806e743193580943.zip | |
Asmbloc: rename asm_raw to AsmRaw
Diffstat (limited to '')
| -rw-r--r-- | miasm2/core/asmbloc.py | 19 | ||||
| -rw-r--r-- | miasm2/core/parse_asm.py | 8 |
2 files changed, 17 insertions, 10 deletions
diff --git a/miasm2/core/asmbloc.py b/miasm2/core/asmbloc.py index a76ec8a6..7db08e2f 100644 --- a/miasm2/core/asmbloc.py +++ b/miasm2/core/asmbloc.py @@ -69,7 +69,7 @@ class asm_label(AsmLabel): warnings.warn('DEPRECATION WARNING: use "AsmLabel" instead of "asm_label"') super(asm_label, self).__init__(name, offset) -class asm_raw: +class AsmRaw(object): def __init__(self, raw=""): self.raw = raw @@ -78,6 +78,13 @@ class asm_raw: return repr(self.raw) +class asm_raw(AsmRaw): + + def __init__(self, raw=""): + warnings.warn('DEPRECATION WARNING: use "AsmRaw" instead of "asm_raw"') + super(asm_label, self).__init__(raw) + + class asm_constraint(object): c_to = "c_to" c_next = "c_next" @@ -728,8 +735,8 @@ class AsmCFG(DiGraph): for block in self._nodes: size = 0 for instr in block.lines: - if isinstance(instr, asm_raw): - # for special asm_raw, only extract len + if isinstance(instr, AsmRaw): + # for special AsmRaw, only extract len if isinstance(instr.raw, list): data = None if len(instr.raw) == 0: @@ -1154,7 +1161,7 @@ def get_block_labels(block): """Extract labels used by @block""" symbols = set() for instr in block.lines: - if isinstance(instr, asm_raw): + if isinstance(instr, AsmRaw): if isinstance(instr.raw, list): for expr in instr.raw: symbols.update(m2_expr.get_expr_ids(expr)) @@ -1172,9 +1179,9 @@ def assemble_block(mnemo, block, symbol_pool, conservative=False): offset_i = 0 for instr in block.lines: - if isinstance(instr, asm_raw): + if isinstance(instr, AsmRaw): if isinstance(instr.raw, list): - # Fix special asm_raw + # Fix special AsmRaw data = "" for expr in instr.raw: expr_int = fix_expr_val(expr, symbol_pool) diff --git a/miasm2/core/parse_asm.py b/miasm2/core/parse_asm.py index cda330fc..bceab949 100644 --- a/miasm2/core/parse_asm.py +++ b/miasm2/core/parse_asm.py @@ -151,7 +151,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): raw = raw.decode('string_escape') if directive == 'string': raw += "\x00" - lines.append(asmbloc.asm_raw(raw)) + lines.append(asmbloc.AsmRaw(raw)) continue if directive == 'ustring': # XXX HACK @@ -159,7 +159,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): raw = line[line.find(r'"') + 1:line.rfind(r'"')] + "\x00" raw = raw.decode('string_escape') raw = "".join([string + '\x00' for string in raw]) - lines.append(asmbloc.asm_raw(raw)) + lines.append(asmbloc.AsmRaw(raw)) continue if directive in declarator: data_raw = line[match_re.end():].split(' ', 1)[1] @@ -179,7 +179,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): element_expr = base_expr.parseString(element)[0] expr_list.append(element_expr.canonize()) - raw_data = asmbloc.asm_raw(expr_list) + raw_data = asmbloc.AsmRaw(expr_list) raw_data.element_size = size lines.append(raw_data) continue @@ -278,7 +278,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): block_to_nlink = cur_block elif isinstance(line, DirectiveAlign): cur_block.alignment = line.alignment - elif isinstance(line, asmbloc.asm_raw): + elif isinstance(line, asmbloc.AsmRaw): cur_block.addline(line) block_to_nlink = cur_block elif isinstance(line, asmbloc.AsmLabel): |