about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorajax <devnull@localhost>2014-06-14 20:14:53 +0200
committerajax <devnull@localhost>2014-06-14 20:14:53 +0200
commit4e517fdd127932b69f138da7426e0fea50648fbc (patch)
tree66cc98d879f343b7cc39ba75966aa23583328d84
parente6f8c26e28be9ebb279866de39b0d88da10e606d (diff)
downloadmiasm-4e517fdd127932b69f138da7426e0fea50648fbc.tar.gz
miasm-4e517fdd127932b69f138da7426e0fea50648fbc.zip
Jitter: Update jit_call API to use JitCpu & VmMngr instance instead of their structure pointer
-rw-r--r--miasm2/jitter/jitcore.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index 34ae3be9..28314b97 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -146,12 +146,12 @@ class JitCore(object):
     def jit_call(self, label, cpu, vmmngr):
         """Call the function label with cpu and vmmngr states
         @label: function's label
-        @cpu: address of the cpu state structure
-        @vmmngr: address of the memory state structure
+        @cpu: JitCpu instance
+        @vm: VmMngr instance
         """
 
         fc_ptr = self.lbl2jitbloc[label]
-        return self.exec_wrapper(fc_ptr, cpu, vmmngr)
+        return self.exec_wrapper(fc_ptr, cpu.cpu, vmmngr.vmmngr)
 
     def runbloc(self, cpu, vm, lbl):
         """Run the bloc starting at lbl.
@@ -168,7 +168,7 @@ class JitCore(object):
             self.__disbloc(lbl, cpu, vm)
 
         # Run the bloc and update cpu/vmmngr state
-        ret = self.jit_call(lbl, cpu.cpu, vm.vmmngr)
+        ret = self.jit_call(lbl, cpu, vm)
 
         return ret