diff options
Diffstat (limited to 'miasm2/arch')
| -rw-r--r-- | miasm2/arch/aarch64/arch.py | 12 | ||||
| -rw-r--r-- | miasm2/arch/aarch64/sem.py | 36 | ||||
| -rw-r--r-- | miasm2/arch/arm/arch.py | 4 | ||||
| -rw-r--r-- | miasm2/arch/arm/sem.py | 2 | ||||
| -rw-r--r-- | miasm2/arch/msp430/sem.py | 8 | ||||
| -rw-r--r-- | miasm2/arch/x86/arch.py | 18 | ||||
| -rw-r--r-- | miasm2/arch/x86/sem.py | 222 |
7 files changed, 153 insertions, 149 deletions
diff --git a/miasm2/arch/aarch64/arch.py b/miasm2/arch/aarch64/arch.py index 96945ff2..b495821b 100644 --- a/miasm2/arch/aarch64/arch.py +++ b/miasm2/arch/aarch64/arch.py @@ -913,7 +913,7 @@ class aarch64_gpreg_ext(reg_noarg, m_arg): reg = gpregsz_info[size].expr[v] self.expr = m2_expr.ExprOp(extend_lst[self.parent.option.value], - reg, m2_expr.ExprInt_from(reg, self.parent.imm.value)) + reg, m2_expr.ExprInt(self.parent.imm.value, reg.size)) return True EXT2_OP = {0b010: 'UXTW', @@ -983,10 +983,10 @@ class aarch64_gpreg_ext2(reg_noarg, m_arg): if opt in EXT2_OP: if self.parent.shift.value == 1: arg = m2_expr.ExprOp(EXT2_OP[opt], arg, - m2_expr.ExprInt_from(arg, self.get_size())) + m2_expr.ExprInt(self.get_size(), arg.size)) else: arg = m2_expr.ExprOp(EXT2_OP[opt], arg, - m2_expr.ExprInt_from(arg, 0)) + m2_expr.ExprInt(0, arg.size)) reg = self.parent.rn.reg_info.expr[self.parent.rn.value] self.expr = m2_expr.ExprOp('segm', reg, arg) @@ -1047,7 +1047,7 @@ class aarch64_gpreg_sftimm(reg_noarg, m_arg): amount = self.parent.imm.value if amount != 0: e = m2_expr.ExprOp( - shift_expr[self.parent.shift.value], e, m2_expr.ExprInt_from(e, amount)) + shift_expr[self.parent.shift.value], e, m2_expr.ExprInt(amount, e.size)) self.expr = e return True @@ -1417,8 +1417,8 @@ class aarch64_b40(m_arg): parser = base_expr def decode(self, v): - self.expr = m2_expr.ExprInt_from( - self.parent.rt.expr, (self.parent.sf.value << self.l) | v) + self.expr = m2_expr.ExprInt( + (self.parent.sf.value << self.l) | v, self.parent.rt.expr.size) return True def encode(self): diff --git a/miasm2/arch/aarch64/sem.py b/miasm2/arch/aarch64/sem.py index 0bceb8dc..c3ed56d5 100644 --- a/miasm2/arch/aarch64/sem.py +++ b/miasm2/arch/aarch64/sem.py @@ -123,7 +123,7 @@ def extend_arg(dst, arg): base = reg.zeroExtend(dst.size) out = base << (shift.zeroExtend(dst.size) - & m2_expr.ExprInt_from(dst, dst.size - 1)) + & m2_expr.ExprInt(dst.size - 1, dst.size)) return out @@ -250,18 +250,18 @@ def tst(ir, instr, arg1, arg2): @sbuild.parse def lsl(arg1, arg2, arg3): - arg1 = arg2 << (arg3 & m2_expr.ExprInt_from(arg3, arg3.size - 1)) + arg1 = arg2 << (arg3 & m2_expr.ExprInt(arg3.size - 1, arg3.size)) @sbuild.parse def lsr(arg1, arg2, arg3): - arg1 = arg2 >> (arg3 & m2_expr.ExprInt_from(arg3, arg3.size - 1)) + arg1 = arg2 >> (arg3 & m2_expr.ExprInt(arg3.size - 1, arg3.size)) @sbuild.parse def asr(arg1, arg2, arg3): arg1 = m2_expr.ExprOp( - 'a>>', arg2, (arg3 & m2_expr.ExprInt_from(arg3, arg3.size - 1))) + 'a>>', arg2, (arg3 & m2_expr.ExprInt(arg3.size - 1, arg3.size))) @sbuild.parse @@ -311,7 +311,7 @@ def csinc(ir, instr, arg1, arg2, arg3, arg4): cond_expr = cond2expr[arg4.name] e.append(m2_expr.ExprAff(arg1, m2_expr.ExprCond(cond_expr, arg2, - arg3 + m2_expr.ExprInt_from(arg3, 1)))) + arg3 + m2_expr.ExprInt(1, arg3.size)))) return e, [] @@ -337,9 +337,9 @@ def cset(ir, instr, arg1, arg2): e = [] cond_expr = cond2expr[arg2.name] e.append(m2_expr.ExprAff(arg1, m2_expr.ExprCond(cond_expr, - m2_expr.ExprInt_from( - arg1, 1), - m2_expr.ExprInt_from(arg1, 0)))) + m2_expr.ExprInt( + 1, arg1.size), + m2_expr.ExprInt(0, arg1.size)))) return e, [] @@ -347,9 +347,9 @@ def csetm(ir, instr, arg1, arg2): e = [] cond_expr = cond2expr[arg2.name] e.append(m2_expr.ExprAff(arg1, m2_expr.ExprCond(cond_expr, - m2_expr.ExprInt_from( - arg1, -1), - m2_expr.ExprInt_from(arg1, 0)))) + m2_expr.ExprInt( + -1, arg1.size), + m2_expr.ExprInt(0, arg1.size)))) return e, [] @@ -452,7 +452,7 @@ def stp(ir, instr, arg1, arg2, arg3): addr, updt = get_mem_access(arg3) e.append(m2_expr.ExprAff(m2_expr.ExprMem(addr, arg1.size), arg1)) e.append( - m2_expr.ExprAff(m2_expr.ExprMem(addr + m2_expr.ExprInt_from(addr, arg1.size / 8), arg2.size), arg2)) + m2_expr.ExprAff(m2_expr.ExprMem(addr + m2_expr.ExprInt(arg1.size / 8, addr.size), arg2.size), arg2)) if updt: e.append(updt) return e, [] @@ -463,7 +463,7 @@ def ldp(ir, instr, arg1, arg2, arg3): addr, updt = get_mem_access(arg3) e.append(m2_expr.ExprAff(arg1, m2_expr.ExprMem(addr, arg1.size))) e.append( - m2_expr.ExprAff(arg2, m2_expr.ExprMem(addr + m2_expr.ExprInt_from(addr, arg1.size / 8), arg2.size))) + m2_expr.ExprAff(arg2, m2_expr.ExprMem(addr + m2_expr.ExprInt(arg1.size / 8, addr.size), arg2.size))) if updt: e.append(updt) return e, [] @@ -485,7 +485,7 @@ def sbfm(ir, instr, arg1, arg2, arg3, arg4): if sim > rim: res = arg2[rim:sim].signExtend(arg1.size) else: - shift = m2_expr.ExprInt_from(arg2, arg2.size - rim) + shift = m2_expr.ExprInt(arg2.size - rim, arg2.size) res = (arg2[:sim].signExtend(arg1.size) << shift) e.append(m2_expr.ExprAff(arg1, res)) return e, [] @@ -497,7 +497,7 @@ def ubfm(ir, instr, arg1, arg2, arg3, arg4): if sim > rim: res = arg2[rim:sim].zeroExtend(arg1.size) else: - shift = m2_expr.ExprInt_from(arg2, arg2.size - rim) + shift = m2_expr.ExprInt(arg2.size - rim, arg2.size) res = (arg2[:sim].zeroExtend(arg1.size) << shift) e.append(m2_expr.ExprAff(arg1, res)) return e, [] @@ -510,7 +510,7 @@ def bfm(ir, instr, arg1, arg2, arg3, arg4): e.append(m2_expr.ExprAff(arg1[:sim-rim], res)) else: shift_i = arg2.size - rim - shift = m2_expr.ExprInt_from(arg2, shift_i) + shift = m2_expr.ExprInt(shift_i, arg2.size) res = arg2[:sim] e.append(m2_expr.ExprAff(arg1[shift_i:shift_i+sim], res)) return e, [] @@ -547,7 +547,7 @@ def cbnz(arg1, arg2): @sbuild.parse def tbz(arg1, arg2, arg3): - bitmask = m2_expr.ExprInt_from(arg1, 1) << arg2 + bitmask = m2_expr.ExprInt(1, arg1.size) << arg2 dst = m2_expr.ExprId( ir.get_next_label(instr), 64) if arg1 & bitmask else arg3 PC = dst @@ -556,7 +556,7 @@ def tbz(arg1, arg2, arg3): @sbuild.parse def tbnz(arg1, arg2, arg3): - bitmask = m2_expr.ExprInt_from(arg1, 1) << arg2 + bitmask = m2_expr.ExprInt(1, arg1.size) << arg2 dst = arg3 if arg1 & bitmask else m2_expr.ExprId( ir.get_next_label(instr), 64) PC = dst diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py index e0ead4f4..04e47585 100644 --- a/miasm2/arch/arm/arch.py +++ b/miasm2/arch/arm/arch.py @@ -439,7 +439,7 @@ class instruction_arm(instruction): def get_asm_offset(self, expr): # LDR XXX, [PC, offset] => PC is self.offset+8 - return ExprInt_from(expr, self.offset+8) + return ExprInt(self.offset+8, expr.size) class instruction_armt(instruction_arm): __slots__ = [] @@ -511,7 +511,7 @@ class instruction_armt(instruction_arm): def get_asm_offset(self, expr): # ADR XXX, PC, imm => PC is 4 aligned + imm new_offset = ((self.offset+self.l)/4)*4 - return ExprInt_from(expr, new_offset) + return ExprInt(new_offset, expr.size) class mn_arm(cls_mn): diff --git a/miasm2/arch/arm/sem.py b/miasm2/arch/arm/sem.py index e251ca75..225b393c 100644 --- a/miasm2/arch/arm/sem.py +++ b/miasm2/arch/arm/sem.py @@ -398,7 +398,7 @@ def neg(ir, instr, a, b): return e def negs(ir, instr, a, b): - e = subs(ir, instr, a, ExprInt_from(b, 0), b) + e = subs(ir, instr, a, ExprInt(0, b.size), b) return e def bic(ir, instr, a, b, c=None): diff --git a/miasm2/arch/msp430/sem.py b/miasm2/arch/msp430/sem.py index a99e500c..92b005ad 100644 --- a/miasm2/arch/msp430/sem.py +++ b/miasm2/arch/msp430/sem.py @@ -29,7 +29,7 @@ def reset_sr_res(): def update_flag_zf(a): - return [ExprAff(zf, ExprCond(a, ExprInt_from(zf, 0), ExprInt_from(zf, 1)))] + return [ExprAff(zf, ExprCond(a, ExprInt(0, zf.size), ExprInt(1, zf.size)))] def update_flag_nf(a): @@ -37,11 +37,11 @@ def update_flag_nf(a): def update_flag_pf(a): - return [ExprAff(pf, ExprOp('parity', a & ExprInt_from(a, 0xFF)))] + return [ExprAff(pf, ExprOp('parity', a & ExprInt(0xFF, a.size)))] def update_flag_cf_inv_zf(a): - return [ExprAff(cf, ExprCond(a, ExprInt_from(cf, 1), ExprInt_from(cf, 0)))] + return [ExprAff(cf, ExprCond(a, ExprInt(1, cf.size), ExprInt(0, cf.size)))] def update_flag_zn_r(a): @@ -75,7 +75,7 @@ def mng_autoinc(a, b, size): return e, a, b a_r = a.args[0] - e.append(ExprAff(a_r, a_r + ExprInt_from(a_r, size / 8))) + e.append(ExprAff(a_r, a_r + ExprInt(size / 8, a_r.size))) a = ExprMem(a_r, size) if isinstance(b, ExprMem) and a_r in b.arg: b = ExprMem(b.arg + ExprInt16(size / 8), b.size) diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py index 4a07571f..87e91756 100644 --- a/miasm2/arch/x86/arch.py +++ b/miasm2/arch/x86/arch.py @@ -157,7 +157,7 @@ def parse_deref_int(s, l, t): def parse_deref_regint(s, l, t): t = t[0] r1 = reg2exprid(t[0][0]) - i1 = ExprInt_from(r1, t[1].arg) + i1 = ExprInt(t[1].arg, r1.size) return r1 + i1 @@ -170,7 +170,7 @@ def parse_deref_regregint(s, l, t): t = t[0] r1 = reg2exprid(t[0][0]) r2 = reg2exprid(t[1][0]) - i1 = ExprInt_from(r1, t[2].arg) + i1 = ExprInt(t[2].arg, r1.size) return r1 + r2 + i1 @@ -178,7 +178,7 @@ def parse_deref_reg_intmreg(s, l, t): t = t[0] r1 = reg2exprid(t[0][0]) r2 = reg2exprid(t[1][0]) - i1 = ExprInt_from(r1, t[2].arg) + i1 = ExprInt(t[2].arg, r1.size) return r1 + (r2 * i1) @@ -186,23 +186,23 @@ def parse_deref_reg_intmreg_int(s, l, t): t = t[0] r1 = reg2exprid(t[0][0]) r2 = reg2exprid(t[1][0]) - i1 = ExprInt_from(r1, t[2].arg) - i2 = ExprInt_from(r1, t[3].arg) + i1 = ExprInt(t[2].arg, r1.size) + i2 = ExprInt(t[3].arg, r1.size) return r1 + (r2 * i1) + i2 def parse_deref_intmreg(s, l, t): t = t[0] r1 = reg2exprid(t[0][0]) - i1 = ExprInt_from(r1, t[1].arg) + i1 = ExprInt(t[1].arg, r1.size) return r1 * i1 def parse_deref_intmregint(s, l, t): t = t[0] r1 = reg2exprid(t[0][0]) - i1 = ExprInt_from(r1, t[1].arg) - i2 = ExprInt_from(r1, t[1].arg) + i1 = ExprInt(t[1].arg, r1.size) + i2 = ExprInt(t[1].arg, r1.size) return (r1 * i1) + i2 @@ -903,7 +903,7 @@ class mn_x86(cls_mn): def ir_pre_instruction(self): return [ExprAff(mRIP[self.mode], - ExprInt_from(mRIP[self.mode], self.offset + self.l))] + ExprInt(self.offset + self.l, mRIP[self.mode].size))] @classmethod def filter_asm_candidates(cls, instr, candidates): diff --git a/miasm2/arch/x86/sem.py b/miasm2/arch/x86/sem.py index 5dc49efc..152208d4 100644 --- a/miasm2/arch/x86/sem.py +++ b/miasm2/arch/x86/sem.py @@ -70,8 +70,8 @@ OF(A-B) = ((A XOR D) AND (A XOR B)) < 0 def update_flag_zf(a): return [m2_expr.ExprAff( - zf, m2_expr.ExprCond(a, m2_expr.ExprInt_from(zf, 0), - m2_expr.ExprInt_from(zf, 1)))] + zf, m2_expr.ExprCond(a, m2_expr.ExprInt(0, zf.size), + m2_expr.ExprInt(1, zf.size)))] def update_flag_nf(a): @@ -81,7 +81,7 @@ def update_flag_nf(a): def update_flag_pf(a): return [m2_expr.ExprAff(pf, m2_expr.ExprOp('parity', - a & m2_expr.ExprInt_from(a, 0xFF)))] + a & m2_expr.ExprInt(0xFF, a.size)))] def update_flag_af(op1, op2, res): @@ -99,8 +99,8 @@ def update_flag_znp(a): def update_flag_logic(a): e = [] e += update_flag_znp(a) - e.append(m2_expr.ExprAff(of, m2_expr.ExprInt_from(of, 0))) - e.append(m2_expr.ExprAff(cf, m2_expr.ExprInt_from(cf, 0))) + e.append(m2_expr.ExprAff(of, m2_expr.ExprInt(0, of.size))) + e.append(m2_expr.ExprAff(cf, m2_expr.ExprInt(0, cf.size))) return e @@ -169,7 +169,7 @@ def set_float_cs_eip(instr): e = [] # XXX TODO check float updt e.append(m2_expr.ExprAff(float_eip, - m2_expr.ExprInt_from(float_eip, instr.offset))) + m2_expr.ExprInt(instr.offset, float_eip.size))) e.append(m2_expr.ExprAff(float_cs, CS)) return e @@ -363,7 +363,7 @@ def sbb(ir, instr, a, b): def neg(ir, instr, b): e = [] - a = m2_expr.ExprInt_from(b, 0) + a = m2_expr.ExprInt(0, b.size) c = a - b e += update_flag_arith(c) @@ -434,9 +434,9 @@ def get_shift(a, b): else: b = b.zeroExtend(a.size) if a.size == 64: - shift = b & m2_expr.ExprInt_from(b, 0x3f) + shift = b & m2_expr.ExprInt(0x3f, b.size) else: - shift = b & m2_expr.ExprInt_from(b, 0x1f) + shift = b & m2_expr.ExprInt(0x1f, b.size) shift = expr_simp(shift) return shift @@ -519,7 +519,7 @@ def _shift_tpl(op, ir, instr, a, b, c=None, op_inv=None, left=False, res = m2_expr.ExprOp(op, a, shifter) cf_from_dst = m2_expr.ExprOp(op, a, - (shifter - m2_expr.ExprInt_from(a, 1))) + (shifter - m2_expr.ExprInt(1, a.size))) cf_from_dst = cf_from_dst.msb() if left else cf_from_dst[:1] new_cf = cf_from_dst @@ -561,7 +561,7 @@ def _shift_tpl(op, ir, instr, a, b, c=None, op_inv=None, left=False, e_do = [ m2_expr.ExprAff(cf, new_cf), m2_expr.ExprAff(of, m2_expr.ExprCond(shifter - i1, - m2_expr.ExprInt_from(of, 0), + m2_expr.ExprInt(0, of.size), value_of)), m2_expr.ExprAff(a, res), ] @@ -607,33 +607,33 @@ def shld(ir, instr, a, b, c): # XXX todo ### def cmc(ir, instr): - e = [m2_expr.ExprAff(cf, m2_expr.ExprCond(cf, m2_expr.ExprInt_from(cf, 0), - m2_expr.ExprInt_from(cf, 1)))] + e = [m2_expr.ExprAff(cf, m2_expr.ExprCond(cf, m2_expr.ExprInt(0, cf.size), + m2_expr.ExprInt(1, cf.size)))] return e, [] def clc(ir, instr): - e = [m2_expr.ExprAff(cf, m2_expr.ExprInt_from(cf, 0))] + e = [m2_expr.ExprAff(cf, m2_expr.ExprInt(0, cf.size))] return e, [] def stc(ir, instr): - e = [m2_expr.ExprAff(cf, m2_expr.ExprInt_from(cf, 1))] + e = [m2_expr.ExprAff(cf, m2_expr.ExprInt(1, cf.size))] return e, [] def cld(ir, instr): - e = [m2_expr.ExprAff(df, m2_expr.ExprInt_from(df, 0))] + e = [m2_expr.ExprAff(df, m2_expr.ExprInt(0, df.size))] return e, [] def std(ir, instr): - e = [m2_expr.ExprAff(df, m2_expr.ExprInt_from(df, 1))] + e = [m2_expr.ExprAff(df, m2_expr.ExprInt(1, df.size))] return e, [] def cli(ir, instr): - e = [m2_expr.ExprAff(i_f, m2_expr.ExprInt_from(i_f, 0))] + e = [m2_expr.ExprAff(i_f, m2_expr.ExprInt(0, i_f.size))] return e, [] @@ -644,7 +644,7 @@ def sti(ir, instr): def inc(ir, instr, a): e = [] - b = m2_expr.ExprInt_from(a, 1) + b = m2_expr.ExprInt(1, a.size) c = a + b e += update_flag_arith(c) e += update_flag_af(a, b, c) @@ -656,7 +656,7 @@ def inc(ir, instr, a): def dec(ir, instr, a): e = [] - b = m2_expr.ExprInt_from(a, -1) + b = m2_expr.ExprInt(-1, a.size) c = a + b e += update_flag_arith(c) e += update_flag_af(a, b, ~c) @@ -678,7 +678,7 @@ def push_gen(ir, instr, a, size): raise ValueError('strange arg size') sp = mRSP[instr.mode] - new_sp = sp - m2_expr.ExprInt_from(sp, size / 8) + new_sp = sp - m2_expr.ExprInt(size / 8, sp.size) e.append(m2_expr.ExprAff(sp, new_sp)) if ir.do_stk_segm: new_sp = m2_expr.ExprOp('segm', SS, new_sp) @@ -700,7 +700,7 @@ def pop_gen(ir, instr, a, size): raise ValueError('bad size stacker!') sp = mRSP[instr.mode] - new_sp = sp + m2_expr.ExprInt_from(sp, size / 8) + new_sp = sp + m2_expr.ExprInt(size / 8, sp.size) # don't generate ESP incrementation on POP ESP if a != ir.sp: e.append(m2_expr.ExprAff(sp, new_sp)) @@ -725,16 +725,16 @@ def popw(ir, instr, a): def sete(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(zf, m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(zf, m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] def setnz(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(zf, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(zf, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] @@ -742,15 +742,15 @@ def setl(ir, instr, a): e = [] e.append( m2_expr.ExprAff( - a, m2_expr.ExprCond(nf - of, m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0)))) + a, m2_expr.ExprCond(nf - of, m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] def setg(ir, instr, a): e = [] - a0 = m2_expr.ExprInt_from(a, 0) - a1 = m2_expr.ExprInt_from(a, 1) + a0 = m2_expr.ExprInt(0, a.size) + a1 = m2_expr.ExprInt(1, a.size) ret = m2_expr.ExprCond(zf, a0, a1) & m2_expr.ExprCond(nf - of, a0, a1) e.append(m2_expr.ExprAff(a, ret)) return e, [] @@ -760,16 +760,16 @@ def setge(ir, instr, a): e = [] e.append( m2_expr.ExprAff( - a, m2_expr.ExprCond(nf - of, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + a, m2_expr.ExprCond(nf - of, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] def seta(ir, instr, a): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprCond(cf | zf, - m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] @@ -777,24 +777,24 @@ def seta(ir, instr, a): def setae(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] def setb(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] def setbe(ir, instr, a): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprCond(cf | zf, - m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0))) + m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size))) ) return e, [] @@ -802,47 +802,47 @@ def setbe(ir, instr, a): def setns(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(nf, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(nf, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] def sets(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(nf, m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(nf, m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] def seto(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(of, m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(of, m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] def setp(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(pf, m2_expr.ExprInt_from(a, 1), - m2_expr.ExprInt_from(a, 0)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(pf, m2_expr.ExprInt(1, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] def setnp(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(pf, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(pf, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] def setle(ir, instr, a): e = [] - a0 = m2_expr.ExprInt_from(a, 0) - a1 = m2_expr.ExprInt_from(a, 1) + a0 = m2_expr.ExprInt(0, a.size) + a1 = m2_expr.ExprInt(1, a.size) ret = m2_expr.ExprCond(zf, a1, a0) | m2_expr.ExprCond(nf ^ of, a1, a0) e.append(m2_expr.ExprAff(a, ret)) return e, [] @@ -850,8 +850,8 @@ def setle(ir, instr, a): def setna(ir, instr, a): e = [] - a0 = m2_expr.ExprInt_from(a, 0) - a1 = m2_expr.ExprInt_from(a, 1) + a0 = m2_expr.ExprInt(0, a.size) + a1 = m2_expr.ExprInt(1, a.size) ret = m2_expr.ExprCond(cf, a1, a0) & m2_expr.ExprCond(zf, a1, a0) e.append(m2_expr.ExprAff(a, ret)) return e, [] @@ -860,8 +860,8 @@ def setna(ir, instr, a): def setnbe(ir, instr, a): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprCond(cf | zf, - m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1))) + m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size))) ) return e, [] @@ -869,16 +869,16 @@ def setnbe(ir, instr, a): def setno(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(of, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(of, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] def setnb(ir, instr, a): e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt_from(a, 0), - m2_expr.ExprInt_from(a, 1)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt(0, a.size), + m2_expr.ExprInt(1, a.size)))) return e, [] @@ -886,8 +886,8 @@ def setalc(ir, instr): a = mRAX[instr.mode][0:8] e = [] e.append( - m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt_from(a, 0xff), - m2_expr.ExprInt_from(a, 0)))) + m2_expr.ExprAff(a, m2_expr.ExprCond(cf, m2_expr.ExprInt(0xff, a.size), + m2_expr.ExprInt(0, a.size)))) return e, [] @@ -919,17 +919,17 @@ def cmps(ir, instr, size): e0 = [] e0.append(m2_expr.ExprAff(a.arg, - a.arg + m2_expr.ExprInt_from(a.arg, size / 8))) + a.arg + m2_expr.ExprInt(size / 8, a.arg.size))) e0.append(m2_expr.ExprAff(b.arg, - b.arg + m2_expr.ExprInt_from(b.arg, size / 8))) + b.arg + m2_expr.ExprInt(size / 8, b.arg.size))) e0.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) e0 = irbloc(lbl_df_0.name, [e0]) e1 = [] e1.append(m2_expr.ExprAff(a.arg, - a.arg - m2_expr.ExprInt_from(a.arg, size / 8))) + a.arg - m2_expr.ExprInt(size / 8, a.arg.size))) e1.append(m2_expr.ExprAff(b.arg, - b.arg - m2_expr.ExprInt_from(b.arg, size / 8))) + b.arg - m2_expr.ExprInt(size / 8, b.arg.size))) e1.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) e1 = irbloc(lbl_df_1.name, [e1]) @@ -950,13 +950,13 @@ def scas(ir, instr, size): e0 = [] e0.append(m2_expr.ExprAff(a.arg, - a.arg + m2_expr.ExprInt_from(a.arg, size / 8))) + a.arg + m2_expr.ExprInt(size / 8, a.arg.size))) e0.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) e0 = irbloc(lbl_df_0.name, [e0]) e1 = [] e1.append(m2_expr.ExprAff(a.arg, - a.arg - m2_expr.ExprInt_from(a.arg, size / 8))) + a.arg - m2_expr.ExprInt(size / 8, a.arg.size))) e1.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) e1 = irbloc(lbl_df_1.name, [e1]) @@ -1016,7 +1016,7 @@ def popfd(ir, instr): e.append(m2_expr.ExprAff(vip, m2_expr.ExprSlice(tmp, 20, 21))) e.append(m2_expr.ExprAff(i_d, m2_expr.ExprSlice(tmp, 21, 22))) e.append(m2_expr.ExprAff(mRSP[instr.mode], - mRSP[instr.mode] + m2_expr.ExprInt_from(mRSP[instr.mode], instr.mode / 8))) + mRSP[instr.mode] + m2_expr.ExprInt(instr.mode / 8, mRSP[instr.mode].size))) e.append(m2_expr.ExprAff(exception_flags, m2_expr.ExprCond(m2_expr.ExprSlice(tmp, 8, 9), m2_expr.ExprInt32( @@ -1107,7 +1107,7 @@ def call(ir, instr, dst): # Far call far [eax] addr = dst.args[0].arg m1 = m2_expr.ExprMem(addr, CS.size) - m2 = m2_expr.ExprMem(addr + m2_expr.ExprInt_from(addr, 2), + m2 = m2_expr.ExprMem(addr + m2_expr.ExprInt(2, addr.size), meip.size) else: raise RuntimeError("bad call operator") @@ -1241,7 +1241,7 @@ def jmp(ir, instr, dst): # Far jmp far [eax] addr = dst.args[0].arg m1 = m2_expr.ExprMem(addr, CS.size) - m2 = m2_expr.ExprMem(addr + m2_expr.ExprInt_from(addr, 2), + m2 = m2_expr.ExprMem(addr + m2_expr.ExprInt(2, addr.size), meip.size) else: raise RuntimeError("bad jmp operator") @@ -1343,7 +1343,7 @@ def loop(ir, instr, dst): myecx = mRCX[instr.mode][:admode] n = m2_expr.ExprId(ir.get_next_label(instr), ir.IRDst.size) - c = myecx - m2_expr.ExprInt_from(myecx, 1) + c = myecx - m2_expr.ExprInt(1, myecx.size) dst_o = m2_expr.ExprCond(c, dst.zeroExtend(ir.IRDst.size), n.zeroExtend(ir.IRDst.size)) @@ -1366,7 +1366,7 @@ def loopne(ir, instr, dst): m2_expr.ExprInt1(0)) c &= zf ^ m2_expr.ExprInt1(1) - e.append(m2_expr.ExprAff(myecx, myecx - m2_expr.ExprInt_from(myecx, 1))) + e.append(m2_expr.ExprAff(myecx, myecx - m2_expr.ExprInt(1, myecx.size))) dst_o = m2_expr.ExprCond(c, dst.zeroExtend(ir.IRDst.size), n.zeroExtend(ir.IRDst.size)) @@ -1386,7 +1386,7 @@ def loope(ir, instr, dst): m2_expr.ExprInt1(1), m2_expr.ExprInt1(0)) c &= zf - e.append(m2_expr.ExprAff(myecx, myecx - m2_expr.ExprInt_from(myecx, 1))) + e.append(m2_expr.ExprAff(myecx, myecx - m2_expr.ExprInt(1, myecx.size))) dst_o = m2_expr.ExprCond(c, dst.zeroExtend(ir.IRDst.size), n.zeroExtend(ir.IRDst.size)) @@ -1584,8 +1584,8 @@ def stos(ir, instr, size): addr_o = mRDI[instr.mode][:s] addr = addr_o - addr_p = addr + m2_expr.ExprInt_from(addr, size / 8) - addr_m = addr - m2_expr.ExprInt_from(addr, size / 8) + addr_p = addr + m2_expr.ExprInt(size / 8, addr.size) + addr_m = addr - m2_expr.ExprInt(size / 8, addr.size) if ir.do_str_segm: mss = ES if instr.additional_info.g2.value: @@ -1620,8 +1620,8 @@ def lods(ir, instr, size): addr_o = mRSI[instr.mode][:s] addr = addr_o - addr_p = addr + m2_expr.ExprInt_from(addr, size / 8) - addr_m = addr - m2_expr.ExprInt_from(addr, size / 8) + addr_p = addr + m2_expr.ExprInt(size / 8, addr.size) + addr_m = addr - m2_expr.ExprInt(size / 8, addr.size) if ir.do_str_segm: mss = DS if instr.additional_info.g2.value: @@ -1675,14 +1675,14 @@ def movs(ir, instr, size): m2_expr.ExprMem(src, size))) e0 = [] - e0.append(m2_expr.ExprAff(a, a + m2_expr.ExprInt_from(a, size / 8))) - e0.append(m2_expr.ExprAff(b, b + m2_expr.ExprInt_from(b, size / 8))) + e0.append(m2_expr.ExprAff(a, a + m2_expr.ExprInt(size / 8, a.size))) + e0.append(m2_expr.ExprAff(b, b + m2_expr.ExprInt(size / 8, b.size))) e0.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) e0 = irbloc(lbl_df_0.name, [e0]) e1 = [] - e1.append(m2_expr.ExprAff(a, a - m2_expr.ExprInt_from(a, size / 8))) - e1.append(m2_expr.ExprAff(b, b - m2_expr.ExprInt_from(b, size / 8))) + e1.append(m2_expr.ExprAff(a, a - m2_expr.ExprInt(size / 8, a.size))) + e1.append(m2_expr.ExprAff(b, b - m2_expr.ExprInt(size / 8, b.size))) e1.append(m2_expr.ExprAff(ir.IRDst, lbl_next)) e1 = irbloc(lbl_df_1.name, [e1]) @@ -1734,7 +1734,7 @@ def float_pop(avoid_flt=None, popcount=1): float_list[i + popcount])) for i in xrange(8 - popcount, 8): e.append(m2_expr.ExprAff(float_list[i], - m2_expr.ExprInt_from(float_list[i], 0))) + m2_expr.ExprInt(0, float_list[i].size))) e.append( m2_expr.ExprAff(float_stack_ptr, float_stack_ptr - m2_expr.ExprInt(popcount, 3))) @@ -2176,19 +2176,19 @@ def fnstenv(ir, instr, a): s = min(32, s) ad = m2_expr.ExprMem(a.arg, size=16) e.append(m2_expr.ExprAff(ad, float_control)) - ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt_from(a.arg, s / 8 * 1), + ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt(s / 8 * 1, a.arg.size), size=16) e.append(m2_expr.ExprAff(ad, status_word)) - ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt_from(a.arg, s / 8 * 3), + ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt(s / 8 * 3, a.arg.size), size=s) e.append(m2_expr.ExprAff(ad, float_eip[:s])) - ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt_from(a.arg, s / 8 * 4), + ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt(s / 8 * 4, a.arg.size), size=16) e.append(m2_expr.ExprAff(ad, float_cs)) - ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt_from(a.arg, s / 8 * 5), + ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt(s / 8 * 5, a.arg.size), size=s) e.append(m2_expr.ExprAff(ad, float_address[:s])) - ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt_from(a.arg, s / 8 * 6), + ad = m2_expr.ExprMem(a.arg + m2_expr.ExprInt(s / 8 * 6, a.arg.size), size=16) e.append(m2_expr.ExprAff(ad, float_ds)) return e, [] @@ -2663,8 +2663,13 @@ def _tpl_aaa(ir, instr, op): cond |= af & i1 to_add = m2_expr.ExprInt(0x106, size=r_ax.size) - new_ax = m2_expr.ExprOp(op, r_ax, to_add) & m2_expr.ExprInt(0xff0f, - size=r_ax.size) + if op == "-": + # Avoid ExprOp("-", A, B), should be ExprOp("+", A, ExprOp("-", B)) + first_part = r_ax - to_add + else: + first_part = m2_expr.ExprOp(op, r_ax, to_add) + new_ax = first_part & m2_expr.ExprInt(0xff0f, + size=r_ax.size) # set AL e.append(m2_expr.ExprAff(r_ax, m2_expr.ExprCond(cond, new_ax, r_ax))) e.append(m2_expr.ExprAff(af, cond)) @@ -2698,12 +2703,12 @@ def bsr_bsf(ir, instr, a, b, op_name): lbl_src_not_null, lbl_src_null))] e_src_null = [] - e_src_null.append(m2_expr.ExprAff(zf, m2_expr.ExprInt_from(zf, 1))) + e_src_null.append(m2_expr.ExprAff(zf, m2_expr.ExprInt(1, zf.size))) # XXX destination is undefined e_src_null.append(aff_dst) e_src_not_null = [] - e_src_not_null.append(m2_expr.ExprAff(zf, m2_expr.ExprInt_from(zf, 0))) + e_src_not_null.append(m2_expr.ExprAff(zf, m2_expr.ExprInt(0, zf.size))) e_src_not_null.append(m2_expr.ExprAff(a, m2_expr.ExprOp(op_name, b))) e_src_not_null.append(aff_dst) @@ -2741,7 +2746,7 @@ def sidt(ir, instr, a): m2_expr.ExprInt32(0xe40007ff))) e.append( m2_expr.ExprAff(m2_expr.ExprMem(m2_expr.ExprOp("+", b, - m2_expr.ExprInt_from(b, 4)), 16), m2_expr.ExprInt16(0x8245))) + m2_expr.ExprInt(4, b.size)), 16), m2_expr.ExprInt16(0x8245))) return e, [] @@ -2904,13 +2909,12 @@ def bittest_get(a, b): off_bit = b.zeroExtend( a.size) & m2_expr.ExprInt((1 << b_mask[a.size]) - 1, a.size) - off_byte = ((b.zeroExtend(ptr.size) >> m2_expr.ExprInt_from(ptr, 3)) & - m2_expr.ExprInt_from(ptr, - ((1 << a.size) - 1) ^ b_decal[a.size])) + off_byte = ((b.zeroExtend(ptr.size) >> m2_expr.ExprInt(3, ptr.size)) & + m2_expr.ExprInt(((1 << a.size) - 1) ^ b_decal[a.size], ptr.size)) d = m2_expr.ExprMem(ptr + off_byte, a.size) else: - off_bit = m2_expr.ExprOp('&', b, m2_expr.ExprInt_from(a, a.size - 1)) + off_bit = m2_expr.ExprOp('&', b, m2_expr.ExprInt(a.size - 1, a.size)) d = a return d, off_bit @@ -2929,7 +2933,7 @@ def btc(ir, instr, a, b): d, off_bit = bittest_get(a, b) e.append(m2_expr.ExprAff(cf, (d >> off_bit)[:1])) - m = m2_expr.ExprInt_from(a, 1) << off_bit + m = m2_expr.ExprInt(1, a.size) << off_bit e.append(m2_expr.ExprAff(d, d ^ m)) return e, [] @@ -2939,7 +2943,7 @@ def bts(ir, instr, a, b): e = [] d, off_bit = bittest_get(a, b) e.append(m2_expr.ExprAff(cf, (d >> off_bit)[:1])) - m = m2_expr.ExprInt_from(a, 1) << off_bit + m = m2_expr.ExprInt(1, a.size) << off_bit e.append(m2_expr.ExprAff(d, d | m)) return e, [] @@ -2949,7 +2953,7 @@ def btr(ir, instr, a, b): e = [] d, off_bit = bittest_get(a, b) e.append(m2_expr.ExprAff(cf, (d >> off_bit)[:1])) - m = ~(m2_expr.ExprInt_from(a, 1) << off_bit) + m = ~(m2_expr.ExprInt(1, a.size) << off_bit) e.append(m2_expr.ExprAff(d, d & m)) return e, [] @@ -2992,7 +2996,7 @@ def cmpxchg8b(arg1): def lds(ir, instr, a, b): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprMem(b.arg, size=a.size))) - DS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt_from(b.arg, a.size / 8), + DS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt(a.size / 8, b.arg.size), size=16) e.append(m2_expr.ExprAff(DS, DS_value)) return e, [] @@ -3001,7 +3005,7 @@ def lds(ir, instr, a, b): def les(ir, instr, a, b): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprMem(b.arg, size=a.size))) - ES_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt_from(b.arg, a.size / 8), + ES_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt(a.size / 8, b.arg.size), size=16) e.append(m2_expr.ExprAff(ES, ES_value)) return e, [] @@ -3010,7 +3014,7 @@ def les(ir, instr, a, b): def lss(ir, instr, a, b): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprMem(b.arg, size=a.size))) - SS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt_from(b.arg, a.size / 8), + SS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt(a.size / 8, b.arg.size), size=16) e.append(m2_expr.ExprAff(SS, SS_value)) return e, [] @@ -3019,7 +3023,7 @@ def lss(ir, instr, a, b): def lfs(ir, instr, a, b): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprMem(b.arg, size=a.size))) - FS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt_from(b.arg, a.size / 8), + FS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt(a.size / 8, b.arg.size), size=16) e.append(m2_expr.ExprAff(FS, FS_value)) return e, [] @@ -3028,7 +3032,7 @@ def lfs(ir, instr, a, b): def lgs(ir, instr, a, b): e = [] e.append(m2_expr.ExprAff(a, m2_expr.ExprMem(b.arg, size=a.size))) - GS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt_from(b.arg, a.size / 8), + GS_value = m2_expr.ExprMem(b.arg + m2_expr.ExprInt(a.size / 8, b.arg.size), size=16) e.append(m2_expr.ExprAff(GS, GS_value)) return e, [] @@ -3137,7 +3141,7 @@ def rdmsr(ir, instr): e.append( m2_expr.ExprAff(mRAX[instr.mode][:32], m2_expr.ExprMem(msr_addr, 32))) e.append(m2_expr.ExprAff(mRDX[instr.mode][:32], m2_expr.ExprMem( - msr_addr + m2_expr.ExprInt_from(msr_addr, 4), 32))) + msr_addr + m2_expr.ExprInt(4, msr_addr.size), 32))) return e, [] @@ -4462,7 +4466,7 @@ class ir_x86_16(ir): if e.dst == zf: zf_val = e.src - cond_dec = m2_expr.ExprCond(c_reg - m2_expr.ExprInt_from(c_reg, 1), + cond_dec = m2_expr.ExprCond(c_reg - m2_expr.ExprInt(1, c_reg.size), m2_expr.ExprInt1(0), m2_expr.ExprInt1(1)) # end condition if zf_val is None: @@ -4485,8 +4489,8 @@ class ir_x86_16(ir): ir[i] = m2_expr.ExprAff(e.dst, src) cond_bloc = [] cond_bloc.append(m2_expr.ExprAff(c_reg, - c_reg - m2_expr.ExprInt_from(c_reg, - 1))) + c_reg - m2_expr.ExprInt(1, + c_reg.size))) cond_bloc.append(m2_expr.ExprAff(self.IRDst, m2_expr.ExprCond(c_cond, lbl_skip, lbl_do))) |