about summary refs log tree commit diff stats
path: root/miasm2/jitter/jitcore.py
diff options
context:
space:
mode:
Diffstat (limited to 'miasm2/jitter/jitcore.py')
-rw-r--r--miasm2/jitter/jitcore.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index 16f201c9..a3a91d76 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -51,6 +51,7 @@ class JitCore(object):
         self.blocs_mem_interval = interval()
         self.disasm_cb = None
         self.split_dis = set()
+        self.addr_mod = interval()
 
         self.options = {"jit_maxline": 50  # Maximum number of line jitted
                         }
@@ -160,7 +161,7 @@ class JitCore(object):
         """
 
         fc_ptr = self.lbl2jitbloc[label]
-        return self.exec_wrapper(fc_ptr, cpu.cpu, vmmngr.vmmngr)
+        return self.exec_wrapper(fc_ptr, cpu)
 
     def runbloc(self, cpu, vm, lbl):
         """Run the bloc starting at lbl.
@@ -249,13 +250,15 @@ class JitCore(object):
 
         return modified_blocs
 
-    def updt_automod_code(self, vm, addr, size):
-        """Remove code jitted in range [addr, addr + size]
+    def updt_automod_code(self, vm):
+        """Remove code jitted in range self.addr_mod
         @vm: VmMngr instance
-        @addr: Address of modified code in sandbox
-        @size: Modification range size (in bits)
         """
-
-        self.del_bloc_in_range(addr, addr + size / 8)
+        for addr_start, addr_stop in self.addr_mod:
+            self.del_bloc_in_range(addr_start, addr_stop + 1)
         self.__updt_jitcode_mem_range(vm)
+        self.addr_mod = interval()
 
+    def automod_cb(self, addr=0, size=0):
+        self.addr_mod += interval([(addr, addr + size / 8 - 1)])
+        return None