From c03edceec59d28244efe88d0db2cf369f5c37953 Mon Sep 17 00:00:00 2001 From: Fabrice Desclaux Date: Thu, 16 Jul 2015 13:13:08 +0200 Subject: Jitter: replace vm.dump_memory_page_pool by its __repr__ --- miasm2/jitter/vm_mngr_py.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'miasm2/jitter/vm_mngr_py.c') diff --git a/miasm2/jitter/vm_mngr_py.c b/miasm2/jitter/vm_mngr_py.c index 78d636f6..9894fd02 100644 --- a/miasm2/jitter/vm_mngr_py.c +++ b/miasm2/jitter/vm_mngr_py.c @@ -353,16 +353,15 @@ PyObject* vm_reset_memory_breakpoint(VmMngr* self, PyObject* args) } - - - - - -PyObject* vm_dump_memory_page_pool(VmMngr* self, PyObject* args) +PyObject *vm_dump(PyObject* self) { - dump_memory_page_pool(&self->vm_mngr); - Py_INCREF(Py_None); - return Py_None; + char* buf_final; + PyObject* ret_obj; + + buf_final = dump(&((VmMngr* )self)->vm_mngr); + ret_obj = PyString_FromString(buf_final); + free(buf_final); + return ret_obj; } PyObject* vm_dump_memory_breakpoint(VmMngr* self, PyObject* args) @@ -571,8 +570,6 @@ static PyMethodDef VmMngr_methods[] = { "X"}, {"set_exception", (PyCFunction)vm_set_exception, METH_VARARGS, "X"}, - {"dump_memory_page_pool", (PyCFunction)vm_dump_memory_page_pool, METH_VARARGS, - "X"}, {"dump_memory_breakpoint", (PyCFunction)vm_dump_memory_breakpoint, METH_VARARGS, "X"}, {"get_all_memory",(PyCFunction)vm_get_all_memory, METH_VARARGS, @@ -613,7 +610,6 @@ static PyGetSetDef VmMngr_getseters[] = { {NULL} /* Sentinel */ }; - static PyTypeObject VmMngrType = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ @@ -625,7 +621,7 @@ static PyTypeObject VmMngrType = { 0, /*tp_getattr*/ 0, /*tp_setattr*/ 0, /*tp_compare*/ - 0, /*tp_repr*/ + vm_dump, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/ -- cgit 1.4.1