diff options
| -rw-r--r-- | miasm2/arch/x86/arch.py | 11 | ||||
| -rw-r--r-- | miasm2/arch/x86/regs.py | 16 | ||||
| -rw-r--r-- | miasm2/arch/x86/sem.py | 261 | ||||
| -rw-r--r-- | miasm2/expression/expression.py | 8 | ||||
| -rw-r--r-- | test/arch/x86/arch.py | 3 |
5 files changed, 206 insertions, 93 deletions
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py index 5cbf62ff..2d49135a 100644 --- a/miasm2/arch/x86/arch.py +++ b/miasm2/arch/x86/arch.py @@ -2998,16 +2998,12 @@ class bs_msegoff(m_arg): return start, stop def encode(self): - print 'ENCODE', self.expr if not (isinstance(self.expr, ExprOp) and self.expr.op == 'segm'): raise StopIteration - print 'ENCODE1', self.expr if not isinstance(self.expr.args[0], ExprInt): raise StopIteration - print 'ENCODE2', self.expr if not isinstance(self.expr.args[1], ExprInt): raise StopIteration - print 'ENCODE3', self.expr l = self.parent.v_opmode() # self.parent.args[0].expr.size # print 'imm enc', l, self.parent.rex_w.value v = int(self.expr.args[0].arg) @@ -3016,7 +3012,6 @@ class bs_msegoff(m_arg): # self.l, l)) if v != sign_ext(v & mask, self.l, l): raise StopIteration - print 'ENCODE4', self.expr self.value = swap_uint(self.l, v & ((1 << self.l) - 1)) yield True @@ -3024,8 +3019,8 @@ class bs_msegoff(m_arg): opmode = self.parent.v_opmode() v = swap_uint(self.l, v) self.value = v - v = sign_ext(v, self.l, opmode) - v = ExprInt_fromsize(opmode, v) + #v = sign_ext(v, self.l, opmode) + v = ExprInt16(v) e = ExprOp('segm', v, self.parent.off.expr) self.expr = e # print self.expr, repr(self.expr) @@ -3531,7 +3526,7 @@ addop("jmp", [bs8(0xeb), rel_off08]) addop("jmp", [bs8(0xe9), rel_off]) # TODO XXX replace stk force64? addop("jmp", [bs8(0xff), stk] + rmmod(d4)) -addop("jmp", [bs8(0xea), moff, msegoff]) +addop("jmpf", [bs8(0xea), moff, msegoff]) addop("jmpf", [bs8(0xff), stk] + rmmod(d5)) diff --git a/miasm2/arch/x86/regs.py b/miasm2/arch/x86/regs.py index 37935edc..a4383249 100644 --- a/miasm2/arch/x86/regs.py +++ b/miasm2/arch/x86/regs.py @@ -342,14 +342,14 @@ float_cs = ExprId(reg_float_cs, size=16) float_address = ExprId(reg_float_address) float_ds = ExprId(reg_float_ds, size=16) -float_st0 = ExprId(reg_float_st0, 64) -float_st1 = ExprId(reg_float_st1, 64) -float_st2 = ExprId(reg_float_st2, 64) -float_st3 = ExprId(reg_float_st3, 64) -float_st4 = ExprId(reg_float_st4, 64) -float_st5 = ExprId(reg_float_st5, 64) -float_st6 = ExprId(reg_float_st6, 64) -float_st7 = ExprId(reg_float_st7, 64) +float_st0 = ExprId("ST", 64) +float_st1 = ExprId("ST(1)", 64) +float_st2 = ExprId("ST(2)", 64) +float_st3 = ExprId("ST(3)", 64) +float_st4 = ExprId("ST(4)", 64) +float_st5 = ExprId("ST(5)", 64) +float_st6 = ExprId("ST(6)", 64) +float_st7 = ExprId("ST(7)", 64) EAX_init = ExprId('EAX_init') EBX_init = ExprId('EBX_init') diff --git a/miasm2/arch/x86/sem.py b/miasm2/arch/x86/sem.py index 14ee3d78..1b3a13af 100644 --- a/miasm2/arch/x86/sem.py +++ b/miasm2/arch/x86/sem.py @@ -196,7 +196,7 @@ def lea(ir, instr, a, b): src = b.arg if src.size > a.size: src = src[:a.size] - e = [ExprAff(a, src)] + e = [ExprAff(a, src.zeroExtend(a.size))] return None, e, [] @@ -401,10 +401,9 @@ def sar(ir, instr, a, b): if int(shifter.arg) != 0: return None, e_do, [] else: - raise NotImplementedError("TODO check me") + return None, [], [] - return ExprCond(shifter, lbl_do, lbl_skip), - [], [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(shifter, lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] def shr(ir, instr, a, b): @@ -566,7 +565,6 @@ def inc(ir, instr, a): e.append(ExprAff(a, c)) return None, e, [] - def dec(ir, instr, a): e = [] b = ExprInt_from(a, -1) @@ -1072,25 +1070,25 @@ def jmp(ir, instr, dst): def jmpf(ir, instr, a): e = [] meip = mRIP[instr.mode] - assert(isinstance(a, ExprMem) and - isinstance(a.arg, ExprOp) and - a.arg.op == "segm") - segm = a.arg.args[0] - base = a.arg.args[1] s = instr.mode - print segm, base - m1 = ExprMem(ExprOp('segm', segm, base), 16) - m2 = ExprMem(ExprOp('segm', segm, base + ExprInt_from(base, 2)), s) + if (isinstance(a, ExprOp) and a.op == "segm"): + segm = a.args[0] + base = a.args[1] + m1 = segm.zeroExtend(CS.size)#ExprMem(ExprOp('segm', segm, base), 16) + m2 = base.zeroExtend(meip.size)#ExprMem(ExprOp('segm', segm, base + ExprInt_from(base, 2)), s) + else: + m1 = ExprMem(a, 16) + m2 = ExprMem(a + ExprInt_from(a, 2), meip.size) - e.append(ExprAff(meip, m1)) - e.append(ExprAff(CS, m2)) + e.append(ExprAff(CS, m1)) + e.append(ExprAff(meip, m2)) return meip, e, [] def jz(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(zf, dst, n).zeroExtend(instr.mode) e = [ExprAff(meip, dst_o)] return dst_o, e, [] @@ -1099,7 +1097,7 @@ def jz(ir, instr, dst): def jcxz(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(mRCX[instr.mode][:16], n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1108,7 +1106,7 @@ def jcxz(ir, instr, dst): def jecxz(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(mRCX[instr.mode][:32], n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1117,7 +1115,7 @@ def jecxz(ir, instr, dst): def jrcxz(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(mRCX[instr.mode], n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1126,7 +1124,7 @@ def jrcxz(ir, instr, dst): def jnz(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(zf, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1135,7 +1133,7 @@ def jnz(ir, instr, dst): def jp(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(pf, dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1144,7 +1142,7 @@ def jp(ir, instr, dst): def jnp(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(pf, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1153,7 +1151,7 @@ def jnp(ir, instr, dst): def ja(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(cf | zf, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1162,7 +1160,7 @@ def ja(ir, instr, dst): def jae(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(cf, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1171,7 +1169,7 @@ def jae(ir, instr, dst): def jb(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(cf, dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1180,7 +1178,7 @@ def jb(ir, instr, dst): def jbe(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(cf | zf, dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1189,7 +1187,7 @@ def jbe(ir, instr, dst): def jge(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(nf - of, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1198,7 +1196,7 @@ def jge(ir, instr, dst): def jg(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(zf | (nf - of), n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1207,7 +1205,7 @@ def jg(ir, instr, dst): def jl(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(nf - of, dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1216,7 +1214,7 @@ def jl(ir, instr, dst): def jle(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(zf | (nf - of), dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1225,7 +1223,7 @@ def jle(ir, instr, dst): def js(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(nf, dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1234,7 +1232,7 @@ def js(ir, instr, dst): def jns(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(nf, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1243,7 +1241,7 @@ def jns(ir, instr, dst): def jo(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(of, dst, n).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1252,7 +1250,7 @@ def jo(ir, instr, dst): def jno(ir, instr, dst): e = [] meip = mRIP[instr.mode] - n = ExprId(ir.get_next_label(instr), instr.mode) + n = ExprId(ir.get_next_label(instr), dst.size) dst_o = ExprCond(of, n, dst).zeroExtend(instr.mode) e.append(ExprAff(meip, dst_o)) return dst_o, e, [] @@ -1657,30 +1655,44 @@ def float_pop(avoid_flt=None): # XXX TODO -def fcom(ir, instr, a, b): +def fcom(ir, instr, a, b = None): + + if b is None: + b = a + a = float_st0 + e = [] - """ - if isinstance(a, ExprMem): - src = ExprOp('mem_%.2d_to_double'%a.size, a) - else: - src = a - """ - src = b - e.append(ExprAff(float_c0, ExprOp('fcom_c0', a, src.zeroExtend(a.size)))) - e.append(ExprAff(float_c1, ExprOp('fcom_c1', a, src.zeroExtend(a.size)))) - e.append(ExprAff(float_c2, ExprOp('fcom_c2', a, src.zeroExtend(a.size)))) - e.append(ExprAff(float_c3, ExprOp('fcom_c3', a, src.zeroExtend(a.size)))) + if isinstance(b, ExprMem): + b = ExprOp('mem_%.2d_to_double'%b.size, b) + + + e.append(ExprAff(float_c0, ExprOp('fcom_c0', a, b))) + e.append(ExprAff(float_c1, ExprOp('fcom_c1', a, b))) + e.append(ExprAff(float_c2, ExprOp('fcom_c2', a, b))) + e.append(ExprAff(float_c3, ExprOp('fcom_c3', a, b))) e += set_float_cs_eip(instr) return None, e, [] -def ficom(ir, instr, a): +def ficom(ir, instr, a, b = None): + + if b is None: + b = a + a = float_st0 + e = [] + + e.append(ExprAff(float_c0, ExprOp('fcom_c0', a, b.zeroExtend(a.size)))) + e.append(ExprAff(float_c1, ExprOp('fcom_c1', a, b.zeroExtend(a.size)))) + e.append(ExprAff(float_c2, ExprOp('fcom_c2', a, b.zeroExtend(a.size)))) + e.append(ExprAff(float_c3, ExprOp('fcom_c3', a, b.zeroExtend(a.size)))) + e += set_float_cs_eip(instr) return None, e, [] + def fcomi(ir, instr, a): # Invalid emulation InvalidEmulation @@ -1696,25 +1708,32 @@ def fucomi(ir, instr, a): InvalidEmulation -def fucomip(ir, instr, a): - # Invalid emulation, only read/write analysis is valid - cond = ExprOp('fcomp', float_st0, a) +def fucomip(ir, instr, a, b): e = [] - e.append( - ExprAff(zf, ExprCond(cond, ExprInt_from(zf, 0), ExprInt_from(zf, 1)))) - e.append( - ExprAff(pf, ExprCond(cond, ExprInt_from(zf, 0), ExprInt_from(zf, 1)))) - e.append( - ExprAff(cf, ExprCond(cond, ExprInt_from(zf, 0), ExprInt_from(zf, 1)))) + # XXX TODO add exception on NaN + e.append(ExprAff(cf, ExprOp('fcom_c0', a, b))) + #e.append(ExprAff(float_c1, ExprOp('fcom_c1', a, b))) + e.append(ExprAff(pf, ExprOp('fcom_c2', a, b))) + e.append(ExprAff(zf, ExprOp('fcom_c3', a, b))) + + e += float_pop() + + e += set_float_cs_eip(instr) return None, e, [] -def fcomp(ir, instr, a, b): +def fcomp(ir, instr, a, b = None): dst, e, extra = fcom(ir, instr, a, b) e += float_pop() e += set_float_cs_eip(instr) return dst, e, extra +def ficomp(ir, instr, a, b = None): + dst, e, extra = ficom(ir, instr, a, b) + e += float_pop() + e += set_float_cs_eip(instr) + return dst, e, extra + def fld(ir, instr, a): if isinstance(a, ExprMem): @@ -1763,12 +1782,26 @@ def fist(ir, instr, a): e += set_float_cs_eip(instr) return None, e, [] - def fistp(ir, instr, a): dst, e, extra = fist(ir, instr, a) e += float_pop(a) return dst, e, extra +def fist(ir, instr, a): + e = [] + e.append(ExprAff(a, ExprOp('double_to_int_%d' % a.size, float_st0))) + + e += set_float_cs_eip(instr) + return None, e, [] + +def fisttp(ir, instr, a): + e = [] + e.append(ExprAff(a, ExprOp('double_trunc_to_int_%d' % a.size, float_st0))) + + e += set_float_cs_eip(instr) + e += float_pop(a) + return None, e, [] + def fild(ir, instr, a): # XXXXX @@ -1814,6 +1847,19 @@ def fadd(ir, instr, a, b=None): e += set_float_cs_eip(instr) return None, e, [] +def fiadd(ir, instr, a, b=None): + if b is None: + b = a + a = float_st0 + e = [] + if isinstance(b, ExprMem): + src = ExprOp('mem_%.2d_to_double' % b.size, b) + else: + src = b + e.append(ExprAff(a, ExprOp('fiadd', a, src))) + e += set_float_cs_eip(instr) + return None, e, [] + def faddp(ir, instr, a, b=None): if b is None: @@ -1877,6 +1923,34 @@ def fsub(ir, instr, a, b=None): e += set_float_cs_eip(instr) return None, e, [] +def fsubp(ir, instr, a, b=None): + if b is None: + b = a + a = float_st0 + e = [] + if isinstance(b, ExprMem): + src = ExprOp('mem_%.2d_to_double' % b.size, b) + else: + src = b + e.append(ExprAff(float_prev(a), ExprOp('fsub', a, src))) + e += set_float_cs_eip(instr) + e += float_pop(a) + return None, e, [] + + +def fsubr(ir, instr, a, b=None): + if b is None: + b = a + a = float_st0 + e = [] + if isinstance(b, ExprMem): + src = ExprOp('mem_%.2d_to_double' % b.size, b) + else: + src = b + e.append(ExprAff(a, ExprOp('fsub', src, a))) + e += set_float_cs_eip(instr) + return None, e, [] + def fmul(ir, instr, a, b=None): if b is None: @@ -1891,6 +1965,19 @@ def fmul(ir, instr, a, b=None): e += set_float_cs_eip(instr) return None, e, [] +def fimul(ir, instr, a, b=None): + if b is None: + b = a + a = float_st0 + e = [] + if isinstance(b, ExprMem): + src = ExprOp('mem_%.2d_to_double' % b.size, b) + else: + src = b + e.append(ExprAff(a, ExprOp('fimul', a, src))) + e += set_float_cs_eip(instr) + return None, e, [] + def fdiv(ir, instr, a, b=None): if b is None: @@ -1905,7 +1992,6 @@ def fdiv(ir, instr, a, b=None): e += set_float_cs_eip(instr) return None, e, [] - def fdivr(ir, instr, a, b=None): if b is None: b = a @@ -1920,6 +2006,34 @@ def fdivr(ir, instr, a, b=None): return None, e, [] +def fidiv(ir, instr, a, b=None): + if b is None: + b = a + a = float_st0 + e = [] + if isinstance(b, ExprMem): + src = ExprOp('mem_%.2d_to_double' % b.size, b) + else: + src = b + e.append(ExprAff(a, ExprOp('fidiv', a, src))) + e += set_float_cs_eip(instr) + return None, e, [] + + +def fidivr(ir, instr, a, b=None): + if b is None: + b = a + a = float_st0 + e = [] + if isinstance(b, ExprMem): + src = ExprOp('mem_%.2d_to_double' % b.size, b) + else: + src = b + e.append(ExprAff(a, ExprOp('fidiv', src, a))) + e += set_float_cs_eip(instr) + return None, e, [] + + def fdivp(ir, instr, a, b=None): # Invalid emulation if b is None: @@ -2185,8 +2299,7 @@ def bsf(ir, instr, a, b): e_do = [] e_do.append(ExprAff(a, ExprOp('bsf', b))) - return ExprCond(b, - lbl_do, lbl_skip), e, [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(b, lbl_do, lbl_skip), e, [irbloc(lbl_do.name, lbl_skip, [e_do])] def bsr(ir, instr, a, b): @@ -2197,8 +2310,7 @@ def bsr(ir, instr, a, b): e_do = [] e_do.append(ExprAff(a, ExprOp('bsr', b))) - return ExprCond(b, - lbl_do, lbl_skip), e, [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(b, lbl_do, lbl_skip), e, [irbloc(lbl_do.name, lbl_skip, [e_do])] def arpl(ir, instr, a, b): @@ -2237,8 +2349,7 @@ def cmovz(ir, instr, a, b): lbl_skip = ExprId(ir.get_next_label(instr), instr.mode) dum, e_do, extra_irs = mov(ir, instr, a, b) - return ExprCond(zf, - lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(zf, lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] def cmovnz(ir, instr, a, b): @@ -2275,32 +2386,28 @@ def cmova(ir, instr, a, b): lbl_do = ExprId(ir.gen_label(), instr.mode) lbl_skip = ExprId(ir.get_next_label(instr), instr.mode) dum, e_do, extra_irs = mov(ir, instr, a, b) - return ExprCond(cf | zf, - lbl_skip, lbl_do), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(cf | zf, lbl_skip, lbl_do), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] def cmovae(ir, instr, a, b): lbl_do = ExprId(ir.gen_label(), instr.mode) lbl_skip = ExprId(ir.get_next_label(instr), instr.mode) dum, e_do, extra_irs = mov(ir, instr, a, b) - return ExprCond(cf, - lbl_skip, lbl_do), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(cf, lbl_skip, lbl_do), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] def cmovbe(ir, instr, a, b): lbl_do = ExprId(ir.gen_label(), instr.mode) lbl_skip = ExprId(ir.get_next_label(instr), instr.mode) dum, e_do, extra_irs = mov(ir, instr, a, b) - return ExprCond(cf | zf, - lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(cf | zf, lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] def cmovb(ir, instr, a, b): lbl_do = ExprId(ir.gen_label(), instr.mode) lbl_skip = ExprId(ir.get_next_label(instr), instr.mode) dum, e_do, extra_irs = mov(ir, instr, a, b) - return ExprCond(cf, - lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] + return ExprCond(cf, lbl_do, lbl_skip), [], [irbloc(lbl_do.name, lbl_skip, [e_do])] def cmovo(ir, instr, a, b): @@ -2859,6 +2966,7 @@ mnemo_func = {'mov': mov, 'movsd': lambda ir, instr: movs(ir, instr, 32), 'movsq': lambda ir, instr: movs(ir, instr, 64), 'fcomp': fcomp, + 'ficomp': ficomp, 'nop': nop, 'fnop': nop, # XXX 'hlt': hlt, @@ -2867,6 +2975,7 @@ mnemo_func = {'mov': mov, 'fstp': fstp, 'fist': fist, 'fistp': fistp, + 'fisttp': fisttp, 'fld': fld, 'fldz': fldz, 'fld1': fld1, @@ -2874,13 +2983,19 @@ mnemo_func = {'mov': mov, 'fldlg2': fldlg2, 'fild': fild, 'fadd': fadd, + 'fiadd': fiadd, 'fninit': fninit, 'faddp': faddp, 'fsub': fsub, + 'fsubp': fsubp, + 'fsubr': fsubr, 'fmul': fmul, + 'fimul': fimul, 'fmulp': fmulp, 'fdiv': fdiv, 'fdivr': fdivr, + 'fidiv': fidiv, + 'fidivr': fidivr, 'fdivp': fdivp, 'fxch': fxch, 'fptan': fptan, diff --git a/miasm2/expression/expression.py b/miasm2/expression/expression.py index 3d73ee10..d59dca2c 100644 --- a/miasm2/expression/expression.py +++ b/miasm2/expression/expression.py @@ -678,13 +678,13 @@ class ExprOp(Expr): 'int_16_to_double', 'int_32_to_double', 'int_64_to_double', 'int_80_to_double']: sz = 64 - elif self.op in ['double_to_mem_16', 'double_to_int_16']: + elif self.op in ['double_to_mem_16', 'double_to_int_16', 'double_trunc_to_int_16']: sz = 16 - elif self.op in ['double_to_mem_32', 'double_to_int_32']: + elif self.op in ['double_to_mem_32', 'double_to_int_32', 'double_trunc_to_int_32']: sz = 32 - elif self.op in ['double_to_mem_64', 'double_to_int_64']: + elif self.op in ['double_to_mem_64', 'double_to_int_64', 'double_trunc_to_int_64']: sz = 64 - elif self.op in ['double_to_mem_80', 'double_to_int_80']: + elif self.op in ['double_to_mem_80', 'double_to_int_80', 'double_trunc_to_int_80']: sz = 80 elif self.op in ['segm']: sz = self.args[1].size diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py index eba4e1f7..be4d63cd 100644 --- a/test/arch/x86/arch.py +++ b/test/arch/x86/arch.py @@ -383,6 +383,9 @@ reg_tests = [ "d818"), (m32, "00000000 FCOMP QWORD PTR [EAX]", "dC18"), + (m32, "00000000 FCOM ST, ST(2)", + "d8d2"), + (m32, "00000000 FCOMPP", "ded9"), |