diff options
Diffstat (limited to 'miasm2/jitter/arch/JitCore_msp430.c')
| -rw-r--r-- | miasm2/jitter/arch/JitCore_msp430.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/miasm2/jitter/arch/JitCore_msp430.c b/miasm2/jitter/arch/JitCore_msp430.c index e5f7ffab..7dc2c935 100644 --- a/miasm2/jitter/arch/JitCore_msp430.c +++ b/miasm2/jitter/arch/JitCore_msp430.c @@ -107,7 +107,7 @@ typedef struct { -PyObject* vm_get_gpreg(JitCpu* self) +PyObject* cpu_get_gpreg(JitCpu* self) { PyObject *dict = PyDict_New(); PyObject *o; @@ -325,7 +325,7 @@ PyObject* _vm_set_gpreg(JitCpu* self, PyObject *dict) } return NULL; } - +/* uint8_t const bcd2bin_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, 0, 0, 0, 0, @@ -418,9 +418,9 @@ uint16_t bcd2hex_16(uint16_t a) { return bcd2bin_data[a % 100] | (bcd2bin_data[(a / 100)] << 8); } +*/ - -PyObject* vm_set_gpreg(JitCpu* self, PyObject *args) +PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args) { PyObject* dict; if (!PyArg_ParseTuple(args, "O", &dict)) @@ -431,7 +431,7 @@ PyObject* vm_set_gpreg(JitCpu* self, PyObject *args) } -PyObject* vm_set_exception(JitCpu* self, PyObject* args) +PyObject* cpu_set_exception(JitCpu* self, PyObject* args) { PyObject *item1; uint64_t i; @@ -446,13 +446,13 @@ 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); } -PyObject * vm_init_regs(JitCpu* self) +PyObject * cpu_init_regs(JitCpu* self) { memset(&self->vmcpu, 0, sizeof(vm_cpu_t)); @@ -477,7 +477,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; @@ -523,17 +523,17 @@ 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_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 */ }; @@ -686,5 +686,8 @@ initJitCore_msp430(void) Py_INCREF(&JitCpuType); PyModule_AddObject(m, "JitCpu", (PyObject *)&JitCpuType); + /* init vm */ + init_vm_mngr(m); + } |