about summary refs log tree commit diff stats
path: root/miasm2/jitter/arch/JitCore_mips32.c
diff options
context:
space:
mode:
Diffstat (limited to 'miasm2/jitter/arch/JitCore_mips32.c')
-rw-r--r--miasm2/jitter/arch/JitCore_mips32.c241
1 files changed, 48 insertions, 193 deletions
diff --git a/miasm2/jitter/arch/JitCore_mips32.c b/miasm2/jitter/arch/JitCore_mips32.c
index ecc7500c..4cd016cf 100644
--- a/miasm2/jitter/arch/JitCore_mips32.c
+++ b/miasm2/jitter/arch/JitCore_mips32.c
@@ -1,5 +1,5 @@
 #include <Python.h>
-#include "JitCore.h"
+#include "../JitCore.h"
 #include "structmember.h"
 #include <stdint.h>
 #include <inttypes.h>
@@ -8,25 +8,6 @@
 #include "../vm_mngr_py.h"
 #include "JitCore_mips32.h"
 
-#define RAISE(errtype, msg) {PyObject* p; p = PyErr_Format( errtype, msg ); return p;}
-
-typedef struct _reg_dict{
-    char* name;
-    unsigned long offset;
-} reg_dict;
-
-
-#define PyGetInt(item, value)						\
-	if (PyInt_Check(item)){						\
-		value = (uint64_t)PyInt_AsLong(item);			\
-	}								\
-	else if (PyLong_Check(item)){					\
-		value = (uint64_t)PyLong_AsUnsignedLongLong(item);	\
-	}								\
-	else{								\
-		RAISE(PyExc_TypeError,"arg must be int");		\
-	}								\
-
 
 
 reg_dict gpreg_dict[] = { {.name = "ZERO", .offset = offsetof(vm_cpu_t, ZERO)},
@@ -69,20 +50,6 @@ reg_dict gpreg_dict[] = { {.name = "ZERO", .offset = offsetof(vm_cpu_t, ZERO)},
 
 /************************** JitCpu object **************************/
 
-typedef struct {
-	PyObject_HEAD
-	PyObject *cpu; /* cpu */
-	vm_cpu_t vmcpu;
-} JitCpu;
-
-
-
-#define get_reg(reg)  do {						\
-		o = PyLong_FromUnsignedLongLong((uint32_t)self->vmcpu.reg); \
-		PyDict_SetItemString(dict, #reg, o);			\
-		Py_DECREF(o);						\
-	} while(0);
-
 
 
 PyObject* cpu_get_gpreg(JitCpu* self)
@@ -130,13 +97,19 @@ PyObject* cpu_get_gpreg(JitCpu* self)
     return dict;
 }
 
-PyObject* _vm_set_gpreg(JitCpu* self, PyObject *dict)
+
+
+
+PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 {
+    PyObject* dict;
     PyObject *d_key, *d_value = NULL;
     Py_ssize_t pos = 0;
     uint64_t val;
     unsigned int i, found;
 
+    if (!PyArg_ParseTuple(args, "O", &dict))
+	    return NULL;
     if(!PyDict_Check(dict))
 	    RAISE(PyExc_TypeError, "arg must be dict");
     while(PyDict_Next(dict, &pos, &d_key, &d_value)){
@@ -145,12 +118,11 @@ PyObject* _vm_set_gpreg(JitCpu* self, PyObject *dict)
 
 	    PyGetInt(d_value, val);
 
-
 	    found = 0;
 	    for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 		    if (strcmp(PyString_AsString(d_key), gpreg_dict[i].name))
 			    continue;
-		    *((uint32_t*)(((char*)&(self->vmcpu)) + gpreg_dict[i].offset)) = val;
+		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
 		    found = 1;
 		    break;
 	    }
@@ -160,50 +132,23 @@ PyObject* _vm_set_gpreg(JitCpu* self, PyObject *dict)
 	    fprintf(stderr, "unkown key: %s\n", PyString_AsString(d_key));
 	    RAISE(PyExc_ValueError, "unkown reg");
     }
-    return NULL;
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
-PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
-{
-	PyObject* dict;
-	if (!PyArg_ParseTuple(args, "O", &dict))
-		return NULL;
-	_vm_set_gpreg(self, dict);
-	Py_INCREF(Py_None);
-	return Py_None;
-}
 
 
-PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
-{
-	PyObject *item1;
-	uint64_t i;
-
-	if (!PyArg_ParseTuple(args, "O", &item1))
-		return NULL;
-
-	PyGetInt(item1, i);
-
-	self->vmcpu.exception_flags = i;
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-PyObject* cpu_get_exception(JitCpu* self, PyObject* args)
-{
-	return PyLong_FromUnsignedLongLong((uint32_t)self->vmcpu.exception_flags);
-}
-
 
 PyObject * cpu_init_regs(JitCpu* self)
 {
-	memset(&self->vmcpu, 0, sizeof(vm_cpu_t));
+	memset(self->cpu, 0, sizeof(vm_cpu_t));
 
 	Py_INCREF(Py_None);
 	return Py_None;
 
 }
 
+
 void dump_gpregs(vm_cpu_t* vmcpu)
 {
 
@@ -232,130 +177,74 @@ PyObject * cpu_dump_gpregs(JitCpu* self, PyObject* args)
 {
 	vm_cpu_t* vmcpu;
 
-	vmcpu = &self->vmcpu;
+	vmcpu = self->cpu;
 	dump_gpregs(vmcpu);
 	Py_INCREF(Py_None);
 	return Py_None;
 }
 
 
-
-static void
-JitCpu_dealloc(JitCpu* self)
-{
-    self->ob_type->tp_free((PyObject*)self);
-}
-
-
-static PyObject *
-JitCpu_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    JitCpu *self;
-
-    self = (JitCpu *)type->tp_alloc(type, 0);
-    return (PyObject *)self;
-}
-
-static PyObject *
-JitCpu_get_cpu(JitCpu *self, void *closure)
-{
-	return PyLong_FromUnsignedLongLong((uint64_t)&(self->vmcpu));
-}
-
-static int
-JitCpu_set_cpu(JitCpu *self, PyObject *value, void *closure)
-{
-	PyErr_SetString(PyExc_TypeError, "immutable cpu");
-	return -1;
-}
-
-
-
-static PyObject *
-JitCpu_get_vmmngr(JitCpu *self, void *closure)
+PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 {
-	return self->vmcpu.pyvm;
-}
+	PyObject *item1;
+	uint64_t i;
 
-static PyObject *
-JitCpu_set_vmmngr(JitCpu *self, PyObject *value, void *closure)
-{
-	self->vmcpu.pyvm = value;
-	return 0;
-}
+	if (!PyArg_ParseTuple(args, "O", &item1))
+		return NULL;
 
-static PyObject *
-JitCpu_get_jitter(JitCpu *self, void *closure)
-{
-	return self->vmcpu.jitter;
-}
+	PyGetInt(item1, i);
 
-static PyObject *
-JitCpu_set_jitter(JitCpu *self, PyObject *value, void *closure)
-{
-	self->vmcpu.jitter = value;
-	return 0;
+	((vm_cpu_t*)self->cpu)->exception_flags = i;
+	Py_INCREF(Py_None);
+	return Py_None;
 }
 
-uint8_t MEM_LOOKUP_08(vm_cpu_t* vmcpu, uint64_t addr)
+PyObject* cpu_get_exception(JitCpu* self, PyObject* args)
 {
-	return vm_MEM_LOOKUP_08(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr);
+	return PyLong_FromUnsignedLongLong((uint64_t)(((vm_cpu_t*)self->cpu)->exception_flags));
 }
 
-uint16_t MEM_LOOKUP_16(vm_cpu_t* vmcpu, uint64_t addr)
-{
-	return vm_MEM_LOOKUP_16(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr);
-}
 
-uint32_t MEM_LOOKUP_32(vm_cpu_t* vmcpu, uint64_t addr)
-{
-	return vm_MEM_LOOKUP_32(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr);
-}
 
-uint64_t MEM_LOOKUP_64(vm_cpu_t* vmcpu, uint64_t addr)
-{
-	return vm_MEM_LOOKUP_64(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr);
-}
 
 
 
-void check_automod(vm_cpu_t* vmcpu, uint64_t addr, int size)
+void check_automod(JitCpu* jitcpu, uint64_t addr, int size)
 {
 	PyObject *result;
 
-	if (!((((VmMngr*)vmcpu->pyvm)->vm_mngr).exception_flags & EXCEPT_CODE_AUTOMOD))
+	if (!(((VmMngr*)jitcpu->pyvm)->vm_mngr.exception_flags & EXCEPT_CODE_AUTOMOD))
 		return;
-	result = PyObject_CallMethod((PyObject *)vmcpu->jitter, "automod_cb", "LL", addr, size);
+	result = PyObject_CallMethod(jitcpu->jitter, "automod_cb", "LL", addr, size);
 	Py_DECREF(result);
 
 }
 
-void MEM_WRITE_08(vm_cpu_t* vmcpu, uint64_t addr, uint8_t src)
+void MEM_WRITE_08(JitCpu* jitcpu, uint64_t addr, uint8_t src)
 {
-	vm_MEM_WRITE_08(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr, src);
-	check_automod(vmcpu, addr, 8);
+	vm_MEM_WRITE_08(&((VmMngr*)jitcpu->pyvm)->vm_mngr, addr, src);
+	check_automod(jitcpu, addr, 8);
 }
 
-void MEM_WRITE_16(vm_cpu_t* vmcpu, uint64_t addr, uint16_t src)
+void MEM_WRITE_16(JitCpu* jitcpu, uint64_t addr, uint16_t src)
 {
-	vm_MEM_WRITE_16(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr, src);
-	check_automod(vmcpu, addr, 16);
+	vm_MEM_WRITE_16(&((VmMngr*)jitcpu->pyvm)->vm_mngr, addr, src);
+	check_automod(jitcpu, addr, 16);
 }
 
-void MEM_WRITE_32(vm_cpu_t* vmcpu, uint64_t addr, uint32_t src)
+void MEM_WRITE_32(JitCpu* jitcpu, uint64_t addr, uint32_t src)
 {
-	vm_MEM_WRITE_32(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr, src);
-	check_automod(vmcpu, addr, 32);
+	vm_MEM_WRITE_32(&((VmMngr*)jitcpu->pyvm)->vm_mngr, addr, src);
+	check_automod(jitcpu, addr, 32);
 }
 
-void MEM_WRITE_64(vm_cpu_t* vmcpu, uint64_t addr, uint64_t src)
+void MEM_WRITE_64(JitCpu* jitcpu, uint64_t addr, uint64_t src)
 {
-	vm_MEM_WRITE_64(&(((VmMngr*)vmcpu->pyvm)->vm_mngr), addr, src);
-	check_automod(vmcpu, addr, 64);
+	vm_MEM_WRITE_64(&((VmMngr*)jitcpu->pyvm)->vm_mngr, addr, src);
+	check_automod(jitcpu, addr, 64);
 }
 
 
-
 PyObject* vm_set_mem(JitCpu *self, PyObject* args)
 {
        PyObject *py_addr;
@@ -378,44 +267,15 @@ PyObject* vm_set_mem(JitCpu *self, PyObject* args)
        size = PyString_Size(py_buffer);
        PyString_AsStringAndSize(py_buffer, &buffer, &py_length);
 
-       ret = vm_write_mem(&(((VmMngr*)self->vmcpu.pyvm)->vm_mngr), addr, buffer, size);
+       ret = vm_write_mem(&(((VmMngr*)self->pyvm)->vm_mngr), addr, buffer, size);
        if (ret < 0)
 	       RAISE(PyExc_TypeError,"arg must be str");
-       check_automod(&self->vmcpu, addr, size*8);
+       check_automod(self, addr, size*8);
 
        Py_INCREF(Py_None);
        return Py_None;
 }
 
-PyObject* vm_get_mem(JitCpu *self, PyObject* args)
-{
-       PyObject *py_addr;
-       PyObject *py_len;
-
-       uint64_t addr;
-       uint64_t size;
-       PyObject *obj_out;
-       char * buf_out;
-       int ret;
-
-       if (!PyArg_ParseTuple(args, "OO", &py_addr, &py_len))
-	       return NULL;
-
-       PyGetInt(py_addr, addr);
-       PyGetInt(py_len, size);
-
-       ret = vm_read_mem(&(((VmMngr*)self->vmcpu.pyvm)->vm_mngr), addr, &buf_out, size);
-       if (ret < 0) {
-	       free(buf_out);
-	       PyErr_SetString(PyExc_RuntimeError, "cannot find address");
-	       return NULL;
-       }
-
-       obj_out = PyString_FromStringAndSize(buf_out, size);
-       free(buf_out);
-       return obj_out;
-}
-
 static PyMemberDef JitCpu_members[] = {
     {NULL}  /* Sentinel */
 };
@@ -440,9 +300,15 @@ static PyMethodDef JitCpu_methods[] = {
 	{NULL}  /* Sentinel */
 };
 
+
 static int
 JitCpu_init(JitCpu *self, PyObject *args, PyObject *kwds)
 {
+	self->cpu = malloc(sizeof(vm_cpu_t));
+	if (self->cpu == NULL) {
+		fprintf(stderr, "cannot alloc vm_cpu_t\n");
+		exit(0);
+	}
 	return 0;
 }
 
@@ -484,13 +350,6 @@ getset_reg_u32(R_LO);
 getset_reg_u32(R_HI);
 
 
-
-#define get_reg_off(reg)  do {						\
-		o = PyLong_FromUnsignedLongLong((uint64_t)offsetof(vm_cpu_t, reg)); \
-		PyDict_SetItemString(dict, #reg, o);			\
-		Py_DECREF(o);						\
-	} while(0);
-
 PyObject* get_gpreg_offset_all(void)
 {
     PyObject *dict = PyDict_New();
@@ -668,10 +527,6 @@ PyObject* get_gpreg_offset_all(void)
 
 
 static PyGetSetDef JitCpu_getseters[] = {
-    {"cpu",
-     (getter)JitCpu_get_cpu, (setter)JitCpu_set_cpu,
-     "first name",
-     NULL},
     {"vmmngr",
      (getter)JitCpu_get_vmmngr, (setter)JitCpu_set_vmmngr,
      "vmmngr",