diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-07-18 17:20:39 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-07-18 17:26:46 +0200 |
| commit | 741a777ef226461f63fa40cb06e8b3406110393f (patch) | |
| tree | a26dc162654b729e1461197d5c4b7ff8094cfe88 | |
| parent | e789c705c064d8c1526fa76d85f174003dfaa9ab (diff) | |
| download | miasm-741a777ef226461f63fa40cb06e8b3406110393f.tar.gz miasm-741a777ef226461f63fa40cb06e8b3406110393f.zip | |
Aarch64: fix remaining ExprLoc
| -rw-r--r-- | miasm2/arch/aarch64/sem.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/miasm2/arch/aarch64/sem.py b/miasm2/arch/aarch64/sem.py index a17c0f14..646065f4 100644 --- a/miasm2/arch/aarch64/sem.py +++ b/miasm2/arch/aarch64/sem.py @@ -637,8 +637,10 @@ def cbnz(arg1, arg2): @sbuild.parse def tbz(arg1, arg2, arg3): bitmask = m2_expr.ExprInt(1, arg1.size) << arg2 - dst = m2_expr.ExprId( - ir.get_next_loc_key(instr), 64) if arg1 & bitmask else arg3 + dst = m2_expr.ExprLoc( + ir.get_next_loc_key(instr), + 64 + ) if arg1 & bitmask else arg3 PC = dst ir.IRDst = dst @@ -646,8 +648,10 @@ def tbz(arg1, arg2, arg3): @sbuild.parse def tbnz(arg1, arg2, arg3): bitmask = m2_expr.ExprInt(1, arg1.size) << arg2 - dst = arg3 if arg1 & bitmask else m2_expr.ExprId( - ir.get_next_loc_key(instr), 64) + dst = arg3 if arg1 & bitmask else m2_expr.ExprLoc( + ir.get_next_loc_key(instr), + 64 + ) PC = dst ir.IRDst = dst |