diff options
Diffstat (limited to '')
| -rw-r--r-- | miasm2/arch/aarch64/arch.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/miasm2/arch/aarch64/arch.py b/miasm2/arch/aarch64/arch.py index 816d67f4..3545e4c5 100644 --- a/miasm2/arch/aarch64/arch.py +++ b/miasm2/arch/aarch64/arch.py @@ -592,7 +592,7 @@ class aarch64_simdreg_32_64_zero(aarch64_simdreg_32_64): def decode(self, v): if v == 0 and self.parent.opc.value == 1: size = 64 if self.parent.size.value else 32 - self.expr = m2_expr.ExprInt_fromsize(size, 0) + self.expr = m2_expr.ExprInt(0, size) return True else: return super(aarch64_simdreg_32_64_zero, self).decode(v) @@ -651,7 +651,7 @@ class aarch64_gpreg0(bsi, m_arg): def decode(self, v): size = 64 if self.parent.sf.value else 32 if v == 0x1F: - self.expr = m2_expr.ExprInt_fromsize(size, 0) + self.expr = m2_expr.ExprInt(0, size) else: self.expr = self.gpregs_info[size].expr[v] return True @@ -806,11 +806,11 @@ def set_imm_to_size(size, expr): if size == expr.size: return expr if size > expr.size: - expr = m2_expr.ExprInt_fromsize(size, expr.arg) + expr = m2_expr.ExprInt(int(expr.arg), size) else: if expr.arg > (1 << size) - 1: return None - expr = m2_expr.ExprInt_fromsize(size, expr.arg) + expr = m2_expr.ExprInt(int(expr.arg), size) return expr @@ -845,7 +845,7 @@ class aarch64_imm_sf(imm_noarg): def decode(self, v): size = 64 if self.parent.sf.value else 32 - self.expr = m2_expr.ExprInt_fromsize(size, v) + self.expr = m2_expr.ExprInt(v, size) return True @@ -872,9 +872,9 @@ class aarch64_imm_sft(aarch64_imm_sf, m_arg): def decode(self, v): size = 64 if self.parent.sf.value else 32 if self.parent.shift.value == 0: - self.expr = m2_expr.ExprInt_fromsize(size, v) + self.expr = m2_expr.ExprInt(v, size) elif self.parent.shift.value == 1: - self.expr = m2_expr.ExprInt_fromsize(size, v << 12) + self.expr = m2_expr.ExprInt(v << 12, size) else: return False return True @@ -1076,7 +1076,7 @@ class aarch64_imm_nsr(aarch64_imm_sf, m_arg): size = 64 if self.parent.sf.value else 32 mask = UINTS[size]((1 << (v + 1)) - 1) mask = ror(mask, self.parent.immr.value, size) - self.expr = m2_expr.ExprInt_fromsize(size, mask) + self.expr = m2_expr.ExprInt(mask, size) return True def encode(self): @@ -1158,7 +1158,7 @@ class aarch64_imm_hw(m_arg): def decode(self, v): size = 64 if self.parent.sf.value else 32 - self.expr = m2_expr.ExprInt_fromsize(size, v << (16 * self.parent.hw.value)) + self.expr = m2_expr.ExprInt(v << (16 * self.parent.hw.value), size) return True def encode(self): @@ -1184,8 +1184,8 @@ class aarch64_imm_hw_sc(m_arg): def decode(self, v): size = 64 if self.parent.sf.value else 32 - expr = m2_expr.ExprInt_fromsize(size, v) - amount = m2_expr.ExprInt_fromsize(size, 16 * self.parent.hw.value) + expr = m2_expr.ExprInt(v, size) + amount = m2_expr.ExprInt(16 * self.parent.hw.value, size) if self.parent.hw.value: self.expr = m2_expr.ExprOp(self.shift_op, expr, amount) else: |