about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAjax <commial@gmail.com>2017-01-05 17:29:39 +0100
committerAjax <commial@gmail.com>2017-01-05 17:29:39 +0100
commit143ecd6768224acd109f5680e52175fcf9b0e945 (patch)
treebe0290a1301bd1cc4416aa4b040dec8e109d0d97
parent18c9b48fb2a667f0d4d5709e108a7cbd827a49cd (diff)
downloadmiasm-143ecd6768224acd109f5680e52175fcf9b0e945.tar.gz
miasm-143ecd6768224acd109f5680e52175fcf9b0e945.zip
Remove useless jit_call wrapper
-rw-r--r--miasm2/jitter/jitcore.py14
-rw-r--r--miasm2/jitter/jitcore_python.py5
2 files changed, 5 insertions, 14 deletions
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index 7b519c2e..7e831280 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -165,15 +165,6 @@ class JitCore(object):
         # Update jitcode mem range
         self.add_bloc_to_mem_interval(vm, cur_bloc)
 
-    def jit_call(self, label, cpu, breakpoints):
-        """Call the function label with cpu and vmmngr states
-        @label: function's label
-        @cpu: JitCpu instance
-        @breakpoints: Dict instance of used breakpoints
-        """
-        return self.exec_wrapper(label, cpu, self.lbl2jitbloc.data, breakpoints,
-                                 self.options["max_exec_per_call"])
-
     def runbloc(self, cpu, lbl, breakpoints):
         """Run the bloc starting at lbl.
         @cpu: JitCpu instance
@@ -188,9 +179,8 @@ class JitCore(object):
             self.disbloc(lbl, cpu.vmmngr)
 
         # Run the bloc and update cpu/vmmngr state
-        ret = self.jit_call(lbl, cpu, breakpoints)
-
-        return ret
+        return self.exec_wrapper(lbl, cpu, self.lbl2jitbloc.data, breakpoints,
+                                 self.options["max_exec_per_call"])
 
     def blocs2memrange(self, blocs):
         """Return an interval instance standing for blocs addresses
diff --git a/miasm2/jitter/jitcore_python.py b/miasm2/jitter/jitcore_python.py
index 98ee25a8..27666ab4 100644
--- a/miasm2/jitter/jitcore_python.py
+++ b/miasm2/jitter/jitcore_python.py
@@ -126,8 +126,9 @@ class JitCore_Python(jitcore.JitCore):
         # Associate myfunc with current label
         self.lbl2jitbloc[label.offset] = myfunc
 
-    def jit_call(self, label, cpu, _breakpoints):
-        """Call the function label with cpu and vmmngr states
+    def exec_wrapper(self, label, cpu, _lbl2jitbloc, _breakpoints,
+                     _max_exec_per_call):
+        """Call the function @label with @cpu
         @label: function's label
         @cpu: JitCpu instance
         """