1 files changed, 3 insertions, 61 deletions

diff --git a/miasm2/jitter/vm_mngr_py.c b/miasm2/jitter/vm_mngr_py.c
index bb0a6207..0a22c397 100644
--- a/miasm2/jitter/vm_mngr_py.c
+++ b/miasm2/jitter/vm_mngr_py.c
@@ -66,44 +66,6 @@ PyObject* _vm_get_exception(unsigned int xcpt)
 		RAISE(PyExc_TypeError,"arg must be int");		\
 	}								\
 
-
-PyObject* vm_is_mem_mapped(VmMngr* self, PyObject* item)
-{
-	PyObject *addr;
-	uint64_t page_addr;
-	uint32_t ret;
-	if (!PyArg_ParseTuple(item, "O", &addr))
-		return NULL;
-
-	PyGetInt(addr, page_addr);
-
-	ret = is_mem_mapped(&self->vm_mngr, page_addr);
-	return PyInt_FromLong((long)ret);
-}
-
-
-
-PyObject* vm_get_mem_base_addr(VmMngr* self, PyObject* item)
-{
-	PyObject *addr;
-
-	uint64_t page_addr;
-	uint64_t addr_base;
-	unsigned int ret;
-
-	if (!PyArg_ParseTuple(item, "O", &addr))
-		return NULL;
-
-	PyGetInt(addr, page_addr);
-
-	ret = get_mem_base_addr(&self->vm_mngr, page_addr, &addr_base);
-	if (ret == 0){
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-	return PyLong_FromUnsignedLongLong((uint64_t)addr_base);
-}
-
 static void sig_alarm(int signo)
 {
 	global_vmmngr->vm_mngr.exception_flags |= BREAK_SIGALARM;
@@ -145,10 +107,6 @@ PyObject* vm_add_memory_page(VmMngr* self, PyObject* args)
 	buf_size = PyString_Size(item_str);
 	PyString_AsStringAndSize(item_str, &buf_data, &length);
 
-	/*
-	fprintf(stderr, "add page %"PRIX64" %"PRIX64" %"PRIX64"\n",
-		page_addr, buf_size, page_access);
-	*/
 	mpn = create_memory_page_node(page_addr, buf_size, page_access);
 	if (mpn == NULL)
 		RAISE(PyExc_TypeError,"cannot create page");
@@ -378,11 +336,13 @@ PyObject* vm_get_all_memory(VmMngr* self, PyObject* args)
 	struct memory_page_node * mpn;
 	PyObject *dict;
 	PyObject *dict2;
+	int i;
 
 
 	dict =  PyDict_New();
 
-	LIST_FOREACH(mpn, &self->vm_mngr.memory_page_pool, next){
+	for (i=0;i<self->vm_mngr.memory_pages_number; i++) {
+		mpn = &self->vm_mngr.memory_pages_array[i];
 
 		dict2 =  PyDict_New();
 
@@ -491,24 +451,6 @@ vm_set_little_endian(VmMngr *self, PyObject *value, void *closure)
 }
 
 
-
-/*
-PyObject* add_jitbloc(VmMngr* self, PyObject* args)
-{
-	PyObject* jitobj;
-
-	if (!PyArg_ParseTuple(args, "O", &addr2obj))
-		return NULL;
-
-	Py_INCREF(Py_None);
-	return Py_None;
-
-}
-*/
-
-
-
-
 static void
 VmMngr_dealloc(VmMngr* self)
 {