1 files changed, 11 insertions, 12 deletions

diff --git a/miasm2/jitter/vm_mngr.h b/miasm2/jitter/vm_mngr.h
index e365bcee..72c64319 100644
--- a/miasm2/jitter/vm_mngr.h
+++ b/miasm2/jitter/vm_mngr.h
@@ -79,9 +79,6 @@ typedef struct {
 
 	uint64_t exception_flags;
 	uint64_t exception_flags_new;
-	uint64_t last_write_ad;
-	uint64_t last_write_size ;
-	PyObject *cb_automod;
 	PyObject *addr2obj;
 }vm_mngr_t;
 
@@ -150,20 +147,19 @@ struct memory_breakpoint_info {
 
 int is_mem_mapped(vm_mngr_t* vm_mngr, uint64_t ad);
 uint64_t get_mem_base_addr(vm_mngr_t* vm_mngr, uint64_t addr, uint64_t *addr_base);
-void MEM_WRITE(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t addr, unsigned int src);
 unsigned int MEM_LOOKUP(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t addr);
 
 
-void MEM_WRITE_08(vm_mngr_t* vm_mngr, uint64_t addr, unsigned char src);
-void MEM_WRITE_16(vm_mngr_t* vm_mngr, uint64_t addr, unsigned short src);
-void MEM_WRITE_32(vm_mngr_t* vm_mngr, uint64_t addr, unsigned int src);
-void MEM_WRITE_64(vm_mngr_t* vm_mngr, uint64_t addr, uint64_t src);
+void vm_MEM_WRITE_08(vm_mngr_t* vm_mngr, uint64_t addr, unsigned char src);
+void vm_MEM_WRITE_16(vm_mngr_t* vm_mngr, uint64_t addr, unsigned short src);
+void vm_MEM_WRITE_32(vm_mngr_t* vm_mngr, uint64_t addr, unsigned int src);
+void vm_MEM_WRITE_64(vm_mngr_t* vm_mngr, uint64_t addr, uint64_t src);
 
 
-unsigned char MEM_LOOKUP_08(vm_mngr_t* vm_mngr, uint64_t addr);
-unsigned short MEM_LOOKUP_16(vm_mngr_t* vm_mngr, uint64_t addr);
-unsigned int MEM_LOOKUP_32(vm_mngr_t* vm_mngr, uint64_t addr);
-uint64_t MEM_LOOKUP_64(vm_mngr_t* vm_mngr, uint64_t addr);
+unsigned char vm_MEM_LOOKUP_08(vm_mngr_t* vm_mngr, uint64_t addr);
+unsigned short vm_MEM_LOOKUP_16(vm_mngr_t* vm_mngr, uint64_t addr);
+unsigned int vm_MEM_LOOKUP_32(vm_mngr_t* vm_mngr, uint64_t addr);
+uint64_t vm_MEM_LOOKUP_64(vm_mngr_t* vm_mngr, uint64_t addr);
 
 
 void MEM_WRITE_08_PASSTHROUGH(uint64_t addr, unsigned char src);
@@ -175,6 +171,9 @@ unsigned short MEM_LOOKUP_16_PASSTHROUGH(uint64_t addr);
 unsigned int MEM_LOOKUP_32_PASSTHROUGH(uint64_t addr);
 uint64_t MEM_LOOKUP_64_PASSTHROUGH(uint64_t addr);
 
+int vm_read_mem(vm_mngr_t* vm_mngr, uint64_t addr, char** buffer_ptr, uint64_t size);
+int vm_write_mem(vm_mngr_t* vm_mngr, uint64_t addr, char *buffer, uint64_t size);
+
 
 unsigned int parity(unsigned int a);
 unsigned int my_imul08(unsigned int a, unsigned int b);