diff options
Diffstat (limited to 'miasm2/jitter')
| -rw-r--r-- | miasm2/jitter/codegen.py | 4 | ||||
| -rw-r--r-- | miasm2/jitter/jitcore_python.py | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/miasm2/jitter/codegen.py b/miasm2/jitter/codegen.py index fec10f41..69e83de5 100644 --- a/miasm2/jitter/codegen.py +++ b/miasm2/jitter/codegen.py @@ -8,7 +8,7 @@ from miasm2.ir.ir import IRBlock, AssignBlock from miasm2.ir.translators.C import TranslatorC, int_size_to_bn from miasm2.core.asmblock import AsmBlockBad -from miasm2.expression.simplifications_high_level import expr_simp +from miasm2.expression.simplifications import expr_simp_high_to_explicit TRANSLATOR_NO_SYMBOL = TranslatorC(loc_db=None) @@ -170,7 +170,7 @@ class CGen(object): # Simplify high level operators out = [] for irblock in irblocks: - new_irblock = irblock.simplify(expr_simp)[1] + new_irblock = irblock.simplify(expr_simp_high_to_explicit)[1] out.append(new_irblock) irblocks = out diff --git a/miasm2/jitter/jitcore_python.py b/miasm2/jitter/jitcore_python.py index 61bd98d0..b97727cd 100644 --- a/miasm2/jitter/jitcore_python.py +++ b/miasm2/jitter/jitcore_python.py @@ -1,7 +1,7 @@ import miasm2.jitter.jitcore as jitcore import miasm2.expression.expression as m2_expr import miasm2.jitter.csts as csts -from miasm2.expression.simplifications import ExpressionSimplifier +from miasm2.expression.simplifications import ExpressionSimplifier, expr_simp_explicit from miasm2.jitter.emulatedsymbexec import EmulatedSymbExec ################################################################################ @@ -20,12 +20,11 @@ class JitCore_Python(jitcore.JitCore): self.ircfg = self.ir_arch.new_ircfg() # CPU & VM (None for now) will be set later - expr_simp = ExpressionSimplifier() - expr_simp.enable_passes(ExpressionSimplifier.PASS_COMMONS) + self.symbexec = self.SymbExecClass( None, None, self.ir_arch, {}, - sb_expr_simp=expr_simp + sb_expr_simp=expr_simp_explicit ) self.symbexec.enable_emulated_simplifications() |