diff options
Diffstat (limited to 'miasm2/core')
| -rw-r--r-- | miasm2/core/cpu.py | 6 | ||||
| -rw-r--r-- | miasm2/core/parse_asm.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py index c42de507..cfbc1dfb 100644 --- a/miasm2/core/cpu.py +++ b/miasm2/core/cpu.py @@ -260,7 +260,7 @@ def extract_ast_core(v, my_id2expr, my_int2expr): pass elif len(sizes) == 1: size = sizes.pop() - my_int2expr = lambda x: m2_expr.ExprInt_fromsize(size, x) + my_int2expr = lambda x: m2_expr.ExprInt(x, size) else: raise ValueError('multiple sizes in ids') e = ast_raw2expr(ast_tokens, my_id2expr, my_int2expr) @@ -965,7 +965,7 @@ class instruction(object): if size is None: default_size = self.get_symbol_size(x, symbols) size = default_size - value = m2_expr.ExprInt_fromsize(size, symbols[name].offset) + value = m2_expr.ExprInt(symbols[name].offset, size) fixed_ids[x] = value e = e.replace_expr(fixed_ids) e = expr_simp(e) @@ -1468,7 +1468,7 @@ class imm_noarg(object): def int2expr(self, v): if (v & ~self.intmask) != 0: return None - return m2_expr.ExprInt_fromsize(self.intsize, v) + return m2_expr.ExprInt(v, self.intsize) def expr2int(self, e): if not isinstance(e, m2_expr.ExprInt): diff --git a/miasm2/core/parse_asm.py b/miasm2/core/parse_asm.py index 3a5751ac..1df8e85b 100644 --- a/miasm2/core/parse_asm.py +++ b/miasm2/core/parse_asm.py @@ -134,7 +134,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None, gen_label_index=0): base_expr = gen_base_expr()[2] my_var_parser = parse_ast(lambda x: m2_expr.ExprId(x, size), lambda x: - m2_expr.ExprInt_fromsize(size, x)) + m2_expr.ExprInt(x, size)) base_expr.setParseAction(my_var_parser) for b in data_raw: |