diff options
| -rw-r--r-- | miasm2/arch/x86/sem.py | 20 | ||||
| -rw-r--r-- | miasm2/ir/translators/C.py | 1 | ||||
| -rw-r--r-- | miasm2/ir/translators/smt2.py | 2 | ||||
| -rw-r--r-- | miasm2/ir/translators/z3_ir.py | 2 |
4 files changed, 2 insertions, 23 deletions
diff --git a/miasm2/arch/x86/sem.py b/miasm2/arch/x86/sem.py index cd456f7b..cc227819 100644 --- a/miasm2/arch/x86/sem.py +++ b/miasm2/arch/x86/sem.py @@ -597,22 +597,6 @@ def shrd(ir, instr, a, b, c): return _shift_tpl(">>>", ir, instr, a, b, c, "<<<") -def sal(ir, instr, a, b): - e = [] - shifter = get_shift(a, b) - c = m2_expr.ExprOp('a<<', a, shifter) - new_cf = (a >> (m2_expr.ExprInt_from(a, a.size) - shifter))[:1] - e.append(m2_expr.ExprAff(cf, m2_expr.ExprCond(shifter, - new_cf, - cf) - ) - ) - e += update_flag_znp(c) - e.append(m2_expr.ExprAff(of, c.msb() ^ new_cf)) - e.append(m2_expr.ExprAff(a, c)) - return e, [] - - def shl(ir, instr, a, b): return _shift_tpl("<<", ir, instr, a, b, left=True) @@ -3623,7 +3607,7 @@ def ps_rl_ll(ir, instr, a, b, op, size): e_do = [] slices = [] for i in xrange(0, a.size, size): - slices.append((m2_expr.ExprOp(op,a[i:i + size], count[:size]), + slices.append((m2_expr.ExprOp(op, a[i:i + size], count[:size]), i, i + size)) e.append(m2_expr.ExprAff(a[0:a.size], m2_expr.ExprCompose(slices))) e_do.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) @@ -3995,7 +3979,7 @@ mnemo_func = {'mov': mov, 'rcr': rcr, 'sar': sar, 'shr': shr, - 'sal': sal, + 'sal': shl, 'shl': shl, 'shld': shld, 'cmc': cmc, diff --git a/miasm2/ir/translators/C.py b/miasm2/ir/translators/C.py index a7ba1a20..2c44d9e1 100644 --- a/miasm2/ir/translators/C.py +++ b/miasm2/ir/translators/C.py @@ -13,7 +13,6 @@ class TranslatorC(Translator): dct_shift = {'a>>': "right_arith", '>>': "right_logic", '<<': "left_logic", - 'a<<': "left_logic", } dct_rot = {'<<<': 'rot_left', '>>>': 'rot_right', diff --git a/miasm2/ir/translators/smt2.py b/miasm2/ir/translators/smt2.py index e832d3b8..21f40e54 100644 --- a/miasm2/ir/translators/smt2.py +++ b/miasm2/ir/translators/smt2.py @@ -220,8 +220,6 @@ class TranslatorSMT2(Translator): res = bvshl(res, arg) elif expr.op == ">>": res = bvlshr(res, arg) - elif expr.op == "a<<": - res = bvshl(res, arg) elif expr.op == "a>>": res = bvashr(res, arg) elif expr.op == "<<<": diff --git a/miasm2/ir/translators/z3_ir.py b/miasm2/ir/translators/z3_ir.py index a1b90ae8..79099520 100644 --- a/miasm2/ir/translators/z3_ir.py +++ b/miasm2/ir/translators/z3_ir.py @@ -165,8 +165,6 @@ class TranslatorZ3(Translator): res = z3.LShR(res, arg) elif expr.op == "a>>": res = res >> arg - elif expr.op == "a<<": - res = res << arg elif expr.op == "<<<": res = z3.RotateLeft(res, arg) elif expr.op == ">>>": |