diff options
| author | Camille Mougey <commial@gmail.com> | 2015-04-22 19:12:10 +0200 |
|---|---|---|
| committer | Camille Mougey <commial@gmail.com> | 2015-04-22 19:12:10 +0200 |
| commit | f137c8b663d03623780532bb120c9238d69d1482 (patch) | |
| tree | 68f6d538a9ef16edc7aa5730320796d550c5cd91 /miasm2/jitter/jitcore_python.py | |
| parent | 9039f508b2e2d407495d1ab6f74cc78cc891f822 (diff) | |
| parent | 5699ee60b9052a936fa1e511a4cc455cfe8b8dc4 (diff) | |
| download | miasm-f137c8b663d03623780532bb120c9238d69d1482.tar.gz miasm-f137c8b663d03623780532bb120c9238d69d1482.zip | |
Merge pull request #142 from serpilliere/automod
Automod
Diffstat (limited to 'miasm2/jitter/jitcore_python.py')
| -rw-r--r-- | miasm2/jitter/jitcore_python.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/miasm2/jitter/jitcore_python.py b/miasm2/jitter/jitcore_python.py index 0df9f615..150e3906 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. @@ -193,8 +193,7 @@ class JitCore_Python(jitcore.JitCore): # Get Python function corresponding to @label fc_ptr = self.lbl2jitbloc[label] - # Update memory state - self.vmmngr = vmmngr + self.cpu = cpu # Execute the function return fc_ptr(cpu, vmmngr) |