Jitter: merge jitcoreARCH and vm_mngr

1 files changed, 20 insertions, 16 deletions

diff --git a/miasm2/jitter/arch/JitCore_x86.c b/miasm2/jitter/arch/JitCore_x86.c
index a09e39b1..bd5f57a8 100644
--- a/miasm2/jitter/arch/JitCore_x86.c
+++ b/miasm2/jitter/arch/JitCore_x86.c
@@ -72,7 +72,7 @@ typedef struct {
 	} while(0);
 
 
-PyObject* vm_get_gpreg(JitCpu* self)
+PyObject* cpu_get_gpreg(JitCpu* self)
 {
     PyObject *dict = PyDict_New();
     PyObject *o;
@@ -151,7 +151,7 @@ PyObject* _vm_set_gpreg(JitCpu* self, PyObject *dict)
     return NULL;
 }
 
-PyObject* vm_set_gpreg(JitCpu* self, PyObject *args)
+PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 {
 	PyObject* dict;
 	if (!PyArg_ParseTuple(args, "O", &dict))
@@ -162,7 +162,7 @@ PyObject* vm_set_gpreg(JitCpu* self, PyObject *args)
 }
 
 
-PyObject * vm_init_regs(JitCpu* self)
+PyObject * cpu_init_regs(JitCpu* self)
 {
 	memset(&self->vmcpu, 0, sizeof(vm_cpu_t));
 
@@ -189,7 +189,7 @@ void dump_gpregs(vm_cpu_t* vmcpu)
 
 }
 
-PyObject * vm_dump_gpregs(JitCpu* self, PyObject* args)
+PyObject * cpu_dump_gpregs(JitCpu* self, PyObject* args)
 {
 	vm_cpu_t* vmcpu;
 
@@ -200,7 +200,7 @@ PyObject * vm_dump_gpregs(JitCpu* self, PyObject* args)
 }
 
 
-PyObject* vm_set_segm_base(JitCpu* self, PyObject* args)
+PyObject* cpu_set_segm_base(JitCpu* self, PyObject* args)
 {
 	PyObject *item1, *item2;
 	uint64_t segm_num, segm_base;
@@ -216,7 +216,7 @@ PyObject* vm_set_segm_base(JitCpu* self, PyObject* args)
 	return Py_None;
 }
 
-PyObject* vm_get_segm_base(JitCpu* self, PyObject* args)
+PyObject* cpu_get_segm_base(JitCpu* self, PyObject* args)
 {
 	PyObject *item1;
 	uint64_t segm_num;
@@ -235,7 +235,7 @@ uint64_t segm2addr(vm_cpu_t* vmcpu, uint64_t segm, uint64_t addr)
 }
 
 
-PyObject* vm_set_exception(JitCpu* self, PyObject* args)
+PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 {
 	PyObject *item1;
 	uint64_t i;
@@ -250,7 +250,7 @@ PyObject* vm_set_exception(JitCpu* self, PyObject* args)
 	return Py_None;
 }
 
-PyObject* vm_get_exception(JitCpu* self, PyObject* args)
+PyObject* cpu_get_exception(JitCpu* self, PyObject* args)
 {
 	return PyLong_FromUnsignedLongLong((uint64_t)self->vmcpu.exception_flags);
 }
@@ -362,21 +362,21 @@ static PyMemberDef JitCpu_members[] = {
 };
 
 static PyMethodDef JitCpu_methods[] = {
-	{"vm_init_regs", (PyCFunction)vm_init_regs, METH_NOARGS,
+	{"vm_init_regs", (PyCFunction)cpu_init_regs, METH_NOARGS,
 	 "X"},
-	{"vm_dump_gpregs", (PyCFunction)vm_dump_gpregs, METH_NOARGS,
+	{"vm_dump_gpregs", (PyCFunction)cpu_dump_gpregs, METH_NOARGS,
 	 "X"},
-	{"vm_get_gpreg", (PyCFunction)vm_get_gpreg, METH_NOARGS,
+	{"vm_get_gpreg", (PyCFunction)cpu_get_gpreg, METH_NOARGS,
 	 "X"},
-	{"vm_set_gpreg", (PyCFunction)vm_set_gpreg, METH_VARARGS,
+	{"vm_set_gpreg", (PyCFunction)cpu_set_gpreg, METH_VARARGS,
 	 "X"},
-	{"vm_get_segm_base", (PyCFunction)vm_get_segm_base, METH_VARARGS,
+	{"vm_get_segm_base", (PyCFunction)cpu_get_segm_base, METH_VARARGS,
 	 "X"},
-	{"vm_set_segm_base", (PyCFunction)vm_set_segm_base, METH_VARARGS,
+	{"vm_set_segm_base", (PyCFunction)cpu_set_segm_base, METH_VARARGS,
 	 "X"},
-	{"vm_get_exception", (PyCFunction)vm_get_exception, METH_VARARGS,
+	{"vm_get_exception", (PyCFunction)cpu_get_exception, METH_VARARGS,
 	 "X"},
-	{"vm_set_exception", (PyCFunction)vm_set_exception, METH_VARARGS,
+	{"vm_set_exception", (PyCFunction)cpu_set_exception, METH_VARARGS,
 	 "X"},
 	{NULL}  /* Sentinel */
 };
@@ -815,6 +815,7 @@ static PyMethodDef JitCore_x86_Methods[] = {
 
 static PyObject *JitCore_x86_Error;
 
+extern int init_vm_mngr(PyObject* m);
 PyMODINIT_FUNC
 initJitCore_x86(void)
 {
@@ -834,6 +835,9 @@ initJitCore_x86(void)
     Py_INCREF(&JitCpuType);
     PyModule_AddObject(m, "JitCpu", (PyObject *)&JitCpuType);
 
+    /* init vm */
+    init_vm_mngr(m);
+
 }