diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-10-12 13:49:37 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-10-12 13:49:37 +0200 |
| commit | 9503c250c5524a6c388aba032be4e34517b358f9 (patch) | |
| tree | cb9ddd00da3917c31b570b5b9ca849ac4803c55c /miasm2/arch/ppc | |
| parent | 3cd3675165cd96c030401fbb1e6392898507a71b (diff) | |
| download | miasm-9503c250c5524a6c388aba032be4e34517b358f9.tar.gz miasm-9503c250c5524a6c388aba032be4e34517b358f9.zip | |
Expression: replace arg by ptr in ExprMem
Diffstat (limited to 'miasm2/arch/ppc')
| -rw-r--r-- | miasm2/arch/ppc/arch.py | 4 | ||||
| -rw-r--r-- | miasm2/arch/ppc/sem.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/miasm2/arch/ppc/arch.py b/miasm2/arch/ppc/arch.py index f198312e..37acc1c5 100644 --- a/miasm2/arch/ppc/arch.py +++ b/miasm2/arch/ppc/arch.py @@ -77,7 +77,7 @@ class instruction_ppc(instruction): if isinstance(e, ExprId) or isinstance(e, ExprInt): return str(e) elif isinstance(e, ExprMem): - addr = e.arg + addr = e.ptr if isinstance(addr, ExprInt) or isinstance(addr, ExprId): out = '(%s)'%addr elif isinstance(addr, ExprOp): @@ -509,7 +509,7 @@ class ppc_deref32(ppc_arg): e = self.expr if not isinstance(e, ExprMem): return False - addr = e.arg + addr = e.ptr if isinstance(addr, ExprId) or isinstance(addr, ExprInt): addr = addr + ExprInt(0, 32) elif not isinstance(addr, ExprOp): diff --git a/miasm2/arch/ppc/sem.py b/miasm2/arch/ppc/sem.py index 3a8ec244..969a8002 100644 --- a/miasm2/arch/ppc/sem.py +++ b/miasm2/arch/ppc/sem.py @@ -250,7 +250,7 @@ def mn_do_load(ir, instr, arg1, arg2, arg3=None): if arg3 is None: assert isinstance(arg2, ExprMem) - address = arg2.arg + address = arg2.ptr else: address = arg2 + arg3 @@ -267,7 +267,7 @@ def mn_do_load(ir, instr, arg1, arg2, arg3=None): ret.append(ExprAssign(arg1, src)) if has_u: if arg3 is None: - ret.append(ExprAssign(arg2.arg.args[0], address)) + ret.append(ExprAssign(arg2.ptr.args[0], address)) else: ret.append(ExprAssign(arg2, address)) @@ -586,7 +586,7 @@ def mn_do_store(ir, instr, arg1, arg2, arg3=None): if arg3 is None: assert isinstance(arg2, ExprMem) - address = arg2.arg + address = arg2.ptr else: address = arg2 + arg3 @@ -599,7 +599,7 @@ def mn_do_store(ir, instr, arg1, arg2, arg3=None): ret.append(ExprAssign(dest, src)) if has_u: if arg3 is None: - ret.append(ExprAssign(arg2.arg.args[0], address)) + ret.append(ExprAssign(arg2.ptr.args[0], address)) else: ret.append(ExprAssign(arg2, address)) |