From c7ee5b9d06b171cb39104d8f577bf82d78a975f1 Mon Sep 17 00:00:00 2001
From: serpilliere <devnull@localhost>
Date: Fri, 22 Aug 2014 13:42:32 +0200
Subject: Jitter: merge jitcoreARCH and vm_mngr

---
 miasm2/jitter/vm_mngr_py.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(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 eb5fa112..a5a24fd6 100644
--- a/miasm2/jitter/vm_mngr_py.c
+++ b/miasm2/jitter/vm_mngr_py.c
@@ -915,7 +915,7 @@ static PyMethodDef Vm_Mngr_Methods[] = {
 
 };
 
-
+/*
 PyMODINIT_FUNC
 initvm_mngr(void)
 {
@@ -936,4 +936,23 @@ initvm_mngr(void)
     PyModule_AddObject(m, "VmMngr", (PyObject *)&VmMngrType);
 
 }
+*/
+
+/*
+  return
+  0 on success
+  -1 on error
+*/
+int init_vm_mngr(PyObject* m)
+{
+    if (PyType_Ready(&VmMngrType) < 0)
+	return -1;
 
+    Vm_Mngr_Error = PyErr_NewException("vm_mngr_.error", NULL, NULL);
+    Py_INCREF(Vm_Mngr_Error);
+    PyModule_AddObject(m, "error", Vm_Mngr_Error);
+
+    Py_INCREF(&VmMngrType);
+    PyModule_AddObject(m, "VmMngr", (PyObject *)&VmMngrType);
+
+}
-- 
cgit 1.4.1