about summary refs log tree commit diff stats
path: root/miasm2/core/cpu.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2016-10-03 13:33:56 +0200
committerGitHub <noreply@github.com>2016-10-03 13:33:56 +0200
commit664cd60430c535931e2a10c5fbe18235756fba0c (patch)
treea90abf03c7495779b12549f0a6d7a443b5b96def /miasm2/core/cpu.py
parent9bc007e7350851d1d97e426f4d1ae369facdb721 (diff)
parentc86e781f38e4b3688392d726bdd6fcbc2e6d377b (diff)
downloadmiasm-664cd60430c535931e2a10c5fbe18235756fba0c.tar.gz
miasm-664cd60430c535931e2a10c5fbe18235756fba0c.zip
Merge pull request #430 from commial/feature/int_ExprInt
Feature/int expr int
Diffstat (limited to 'miasm2/core/cpu.py')
-rw-r--r--miasm2/core/cpu.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py
index 92bde778..81c18f1f 100644
--- a/miasm2/core/cpu.py
+++ b/miasm2/core/cpu.py
@@ -1433,7 +1433,7 @@ class cls_mn(object):
         args = []
         for d in dst:
             if isinstance(d, m2_expr.ExprInt):
-                l = symbol_pool.getby_offset_create(int(d.arg))
+                l = symbol_pool.getby_offset_create(int(d))
 
                 a = m2_expr.ExprId(l.name, d.size)
             else:
@@ -1457,7 +1457,7 @@ class imm_noarg(object):
     def expr2int(self, e):
         if not isinstance(e, m2_expr.ExprInt):
             return None
-        v = int(e.arg)
+        v = int(e)
         if v & ~self.intmask != 0:
             return None
         return v
@@ -1542,7 +1542,7 @@ class int32_noarg(imm_noarg):
     def encode(self):
         if not isinstance(self.expr, m2_expr.ExprInt):
             return False
-        v = int(self.expr.arg)
+        v = int(self.expr)
         if sign_ext(v & self.lmask, self.l, self.intsize) != v:
             return False
         v = self.encodeval(v & self.lmask)