From 65feb2335c3fd525efde115932b512e7bbc720d1 Mon Sep 17 00:00:00 2001 From: serpilliere Date: Sun, 5 Apr 2015 23:48:24 +0200 Subject: Jitter: get/set mem is now wrapped in cpu The get/set mem used during jit is wrapped by cpu. This allows cpu object to callback (or not, depending on arch) a cache update. --- miasm2/jitter/jitcore_python.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'miasm2/jitter/jitcore_python.py') diff --git a/miasm2/jitter/jitcore_python.py b/miasm2/jitter/jitcore_python.py index 0df9f615..b768b338 100644 --- a/miasm2/jitter/jitcore_python.py +++ b/miasm2/jitter/jitcore_python.py @@ -71,7 +71,7 @@ class JitCore_Python(jitcore.JitCore): addr = expr_mem.arg.arg.arg size = expr_mem.size / 8 - value = self.vmmngr.get_mem(addr, size) + value = self.cpu.get_mem(addr, size) return m2_expr.ExprInt_fromsize(expr_mem.size, int(value[::-1].encode("hex"), 16)) @@ -97,7 +97,7 @@ class JitCore_Python(jitcore.JitCore): content = content.decode("hex")[::-1] # Write in VmMngr context - self.vmmngr.set_mem(addr, content) + self.cpu.set_mem(addr, content) def jitirblocs(self, label, irblocs): """Create a python function corresponding to an irblocs' group. @@ -195,6 +195,7 @@ class JitCore_Python(jitcore.JitCore): # Update memory state self.vmmngr = vmmngr + self.cpu = cpu # Execute the function return fc_ptr(cpu, vmmngr) -- cgit 1.4.1