about summary refs log tree commit diff stats
path: root/miasm2/expression/simplifications_common.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2016-07-03 20:36:06 +0200
committerGitHub <noreply@github.com>2016-07-03 20:36:06 +0200
commit9165fa1768814f251fe72884f9ffeb1cb2454b94 (patch)
tree93e31ef92089dee04b23e2bb3e275f96b4507206 /miasm2/expression/simplifications_common.py
parenta22ba6e7166f0a30ed0a0e502e7e876127b8c218 (diff)
parent0b30f6441d37f3c2109cba34f070555bf31582e8 (diff)
downloadmiasm-9165fa1768814f251fe72884f9ffeb1cb2454b94.tar.gz
miasm-9165fa1768814f251fe72884f9ffeb1cb2454b94.zip
Merge pull request #389 from jbcayrou/pow_op
Add ** (pow) operator
Diffstat (limited to 'miasm2/expression/simplifications_common.py')
-rw-r--r--miasm2/expression/simplifications_common.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/miasm2/expression/simplifications_common.py b/miasm2/expression/simplifications_common.py
index a52debe6..2d5e4e6b 100644
--- a/miasm2/expression/simplifications_common.py
+++ b/miasm2/expression/simplifications_common.py
@@ -30,6 +30,8 @@ def simp_cst_propagation(e_s, e):
                 o = i1.arg + i2.arg
             elif op == '*':
                 o = i1.arg * i2.arg
+            elif op == '**':
+                o =i1.arg ** i2.arg
             elif op == '^':
                 o = i1.arg ^ i2.arg
             elif op == '&':
@@ -194,7 +196,7 @@ def simp_cst_propagation(e_s, e):
             j += 1
         i += 1
 
-    if op in ['|', '&', '%', '/'] and len(args) == 1:
+    if op in ['|', '&', '%', '/', '**'] and len(args) == 1:
         return args[0]
 
     # A <<< A.size => A