about summary refs log tree commit diff stats
path: root/miasm2/expression/expression_helper.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/expression/expression_helper.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/expression/expression_helper.py')
-rw-r--r--miasm2/expression/expression_helper.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/expression/expression_helper.py b/miasm2/expression/expression_helper.py
index 09feffc2..0c661c2a 100644
--- a/miasm2/expression/expression_helper.py
+++ b/miasm2/expression/expression_helper.py
@@ -43,7 +43,7 @@ def merge_sliceto_slice(args):
             # sources_int[a.start] = a
             # copy ExprInt because we will inplace modify arg just below
             # /!\ TODO XXX never ever modify inplace args...
-            sources_int[a[1]] = (m2_expr.ExprInt(int(a[0].arg),
+            sources_int[a[1]] = (m2_expr.ExprInt(int(a[0]),
                                                  a[2] - a[1]),
                                  a[1],
                                  a[2])
@@ -80,12 +80,12 @@ def merge_sliceto_slice(args):
             s_start, s_stop = sorted_s[-1][1][1], sorted_s[-1][1][2]
             size += s_stop - s_start
             a = m2_expr.mod_size2uint[size](
-                (int(out[0].arg) << (out[1] - s_start)) +
-                 int(sorted_s[-1][1][0].arg))
+                (int(out[0]) << (out[1] - s_start)) +
+                 int(sorted_s[-1][1][0]))
             out[0] = m2_expr.ExprInt(a)
             sorted_s.pop()
             out[1] = s_start
-        out[0] = m2_expr.ExprInt(int(out[0].arg), size)
+        out[0] = m2_expr.ExprInt(int(out[0]), size)
         final_sources.append((start, out))
 
     final_sources_int = final_sources