diff options
Diffstat (limited to 'miasm2/arch/msp430/arch.py')
| -rw-r--r-- | miasm2/arch/msp430/arch.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/miasm2/arch/msp430/arch.py b/miasm2/arch/msp430/arch.py index 07ba3019..9728d776 100644 --- a/miasm2/arch/msp430/arch.py +++ b/miasm2/arch/msp430/arch.py @@ -75,7 +75,7 @@ def ast_id2expr(t): def ast_int2expr(a): - return ExprInt16(a) + return ExprInt(a, 16) variable, operand, base_expr = gen_base_expr() @@ -328,12 +328,12 @@ class msp430_sreg_arg(reg_noarg, m_arg): self.expr = e elif self.parent.a_s.value == 0b01: if e == SR: - self.expr = ExprMem(ExprInt16(self.parent.off_s.value), size) + self.expr = ExprMem(ExprInt(self.parent.off_s.value, 16), size) elif e == R3: self.expr = ExprInt(1, size) else: self.expr = ExprMem( - e + ExprInt16(self.parent.off_s.value), size) + e + ExprInt(self.parent.off_s.value, 16), size) elif self.parent.a_s.value == 0b10: if e == SR: self.expr = ExprInt(4, size) @@ -431,9 +431,9 @@ class msp430_dreg_arg(msp430_sreg_arg): self.expr = e elif self.parent.a_d.value == 1: if e == SR: - x = ExprInt16(self.parent.off_d.value) + x = ExprInt(self.parent.off_d.value, 16) else: - x = e + ExprInt16(self.parent.off_d.value) + x = e + ExprInt(self.parent.off_d.value, 16) self.expr = ExprMem(x, size) else: raise NotImplementedError( @@ -448,7 +448,7 @@ class msp430_dreg_arg(msp430_sreg_arg): self.value = self.reg_info.expr.index(e) elif isinstance(e, ExprMem): if isinstance(e.arg, ExprId): - r, i = e.arg, ExprInt16(0) + r, i = e.arg, ExprInt(0, 16) elif isinstance(e.arg, ExprOp): r, i = e.arg.args[0], e.arg.args[1] elif isinstance(e.arg, ExprInt): @@ -538,7 +538,7 @@ class msp430_offs(imm_noarg, m_arg): if (1 << (self.l - 1)) & v: v |= ~0 ^ self.lmask v = self.decodeval(v) - self.expr = ExprInt16(v) + self.expr = ExprInt(v, 16) return True def encode(self): |