about summary refs log tree commit diff stats
path: root/miasm2/jitter/vm_mngr_py.c
diff options
context:
space:
mode:
authorserpilliere <fabrice.desclaux@cea.fr>2015-03-08 21:32:34 +0100
committerserpilliere <fabrice.desclaux@cea.fr>2015-03-10 18:46:56 +0100
commit644893c46eefe48f25e052d3daae89ec9824eab7 (patch)
tree7ef3a1cf099de4b5049f6caa29a6e3d7442c2aef /miasm2/jitter/vm_mngr_py.c
parentd1c270b845001965d35e36e5e13402fa718a0e5f (diff)
downloadmiasm-644893c46eefe48f25e052d3daae89ec9824eab7.tar.gz
miasm-644893c46eefe48f25e052d3daae89ec9824eab7.zip
Jitter: split VmMngr from JitCpu
Diffstat (limited to 'miasm2/jitter/vm_mngr_py.c')
-rw-r--r--miasm2/jitter/vm_mngr_py.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/miasm2/jitter/vm_mngr_py.c b/miasm2/jitter/vm_mngr_py.c
index 353d6d4b..952e620f 100644
--- a/miasm2/jitter/vm_mngr_py.c
+++ b/miasm2/jitter/vm_mngr_py.c
@@ -868,7 +868,7 @@ static PyGetSetDef VmMngr_getseters[] = {
 static PyTypeObject VmMngrType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "JitCore_x86_32.VmMngr",   /*tp_name*/
+    "VmMngr",                  /*tp_name*/
     sizeof(VmMngr),            /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)VmMngr_dealloc,/*tp_dealloc*/
@@ -907,24 +907,30 @@ static PyTypeObject VmMngrType = {
     VmMngr_new,                /* tp_new */
 };
 
+
+static PyMethodDef VmMngr_Methods[] = {
+	{NULL, NULL, 0, NULL}        /* Sentinel */
+
+};
+
 static PyObject *Vm_Mngr_Error;
 
-/*
-  return
-  0 on success
-  -1 on error
-*/
-int init_vm_mngr(PyObject* m)
+PyMODINIT_FUNC
+initVmMngr(void)
 {
+    PyObject *m;
+
     if (PyType_Ready(&VmMngrType) < 0)
-	return -1;
+	return;
 
-    Vm_Mngr_Error = PyErr_NewException("vm_mngr_.error", NULL, NULL);
+    m = Py_InitModule("VmMngr", VmMngr_Methods);
+    if (m == NULL)
+	    return;
+
+    Vm_Mngr_Error = PyErr_NewException("VmMngr.error", NULL, NULL);
     Py_INCREF(Vm_Mngr_Error);
     PyModule_AddObject(m, "error", Vm_Mngr_Error);
 
     Py_INCREF(&VmMngrType);
-    PyModule_AddObject(m, "VmMngr", (PyObject *)&VmMngrType);
-
-    return 0;
+    PyModule_AddObject(m, "Vm", (PyObject *)&VmMngrType);
 }