about summary refs log tree commit diff stats
path: root/miasm2/jitter/emulatedsymbexec.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2017-02-13 09:41:39 +0100
committerGitHub <noreply@github.com>2017-02-13 09:41:39 +0100
commit827c6cb8e1cdcc6e501c319353f89615b9cc09c9 (patch)
tree248eef50d915fc3eb8fec634318f6492af6d0f27 /miasm2/jitter/emulatedsymbexec.py
parent1719580d49d297f8b9b647569372e3eff888fbdf (diff)
parent4cadfcf63e4e74918f022d24c5efa56aafbaff12 (diff)
downloadmiasm-827c6cb8e1cdcc6e501c319353f89615b9cc09c9.tar.gz
miasm-827c6cb8e1cdcc6e501c319353f89615b9cc09c9.zip
Merge pull request #492 from serpilliere/fix_mem_accesses
Fix mem accesses
Diffstat (limited to 'miasm2/jitter/emulatedsymbexec.py')
-rw-r--r--miasm2/jitter/emulatedsymbexec.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/miasm2/jitter/emulatedsymbexec.py b/miasm2/jitter/emulatedsymbexec.py
index ff9e5eaa..9ece5ff5 100644
--- a/miasm2/jitter/emulatedsymbexec.py
+++ b/miasm2/jitter/emulatedsymbexec.py
@@ -103,13 +103,11 @@ class EmulatedSymbExec(symbexec):
     # CPU specific simplifications
     def _simp_handle_segm(self, e_s, expr):
         """Handle 'segm' operation"""
-        if expr.op != "segm":
+        if not expr.is_op_segm():
             return expr
         segm_nb = int(expr.args[0])
         segmaddr = self.cpu.get_segm_base(segm_nb)
-        return e_s(m2_expr.ExprOp("+",
-                                  m2_expr.ExprInt(segmaddr, expr.size),
-                                  expr.args[1]))
+        return e_s(m2_expr.ExprInt(segmaddr, expr.size) + expr.args[1])
 
     def _simp_handle_cpuid(self, e_s, expr):
         """From miasm2/jitter/vm_mngr.h: cpuid"""