diff options
| author | William Bruneau <william.bruneau@epfedu.fr> | 2019-04-17 13:23:13 +0200 |
|---|---|---|
| committer | William Bruneau <william.bruneau@epfedu.fr> | 2019-05-15 12:57:10 +0200 |
| commit | 5defcd6e88047300627055e59478c5e8a767c8e8 (patch) | |
| tree | 830f2e017ec5e8f2bcaa71d55e334ce6ebf6d019 /miasm/jitter/vm_mngr_py.c | |
| parent | df7fc844a15de590331fbc13408ff89506b9efa2 (diff) | |
| download | focaccia-miasm-5defcd6e88047300627055e59478c5e8a767c8e8.tar.gz focaccia-miasm-5defcd6e88047300627055e59478c5e8a767c8e8.zip | |
Fix compilation
- add miasm/jitter/vm_mngr_py.c dependency to all JitCore (needed for PyLong_to_bn and bn_to_PyLong functions) - vm_set_mem and vm_get_mem already exist in miasm/jitter/arch/JitCore_*.c so must be renamed in miasm/jitter/vm_mngr_py.c
Diffstat (limited to 'miasm/jitter/vm_mngr_py.c')
| -rw-r--r-- | miasm/jitter/vm_mngr_py.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miasm/jitter/vm_mngr_py.c b/miasm/jitter/vm_mngr_py.c index 69e62fef..38e2171e 100644 --- a/miasm/jitter/vm_mngr_py.c +++ b/miasm/jitter/vm_mngr_py.c @@ -156,7 +156,7 @@ PyObject* vm_set_mem_access(VmMngr* self, PyObject* args) return Py_None; } -PyObject* vm_set_mem(VmMngr* self, PyObject* args) +PyObject* vm_set_mem_vmmngr(VmMngr* self, PyObject* args) { PyObject *py_addr; PyObject *py_buffer; @@ -214,7 +214,7 @@ PyObject* vm_get_mem_access(VmMngr* self, PyObject* args) return PyLong_FromUnsignedLongLong((uint64_t)mpn->access); } -PyObject* vm_get_mem(VmMngr* self, PyObject* args) +PyObject* vm_get_mem_vmmngr(VmMngr* self, PyObject* args) { PyObject *py_addr; PyObject *py_len; @@ -844,7 +844,7 @@ static PyMethodDef VmMngr_methods[] = { "init_code_bloc_pool() -> Initialize the VmMngr jitted code blocks"}, {"set_mem_access", (PyCFunction)vm_set_mem_access, METH_VARARGS, "set_mem_access(address, access) -> Change the protection of the page at @address with @access"}, - {"set_mem", (PyCFunction)vm_set_mem, METH_VARARGS, + {"set_mem", (PyCFunction)vm_set_mem_vmmngr, METH_VARARGS, "set_mem(address, data) -> Set a @data in memory at @address"}, {"is_mapped", (PyCFunction)vm_is_mapped, METH_VARARGS, "is_mapped(address, size) -> Check if the memory region at @address of @size bytes is fully mapped"}, @@ -852,7 +852,7 @@ static PyMethodDef VmMngr_methods[] = { "add_code_bloc(address_start, address_stop) -> Add a jitted code block between [@address_start, @address_stop["}, {"get_mem_access", (PyCFunction)vm_get_mem_access, METH_VARARGS, "get_mem_access(address) -> Retrieve the memory protection of the page at @address"}, - {"get_mem", (PyCFunction)vm_get_mem, METH_VARARGS, + {"get_mem", (PyCFunction)vm_get_mem_vmmngr, METH_VARARGS, "get_mem(addr, size) -> Get the memory content at @address of @size bytes"}, {"get_u8", (PyCFunction)vm_get_u8, METH_VARARGS, |