From e21a663409b525fe4c720717a3681ba88795556e Mon Sep 17 00:00:00 2001 From: ajax Date: Mon, 16 Jun 2014 17:29:41 +0200 Subject: Jitter: VmMngr: Avoid code duplication && set exceptions flags on "vm_set_mem" --- miasm2/jitter/vm_mngr_py.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (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 a99890fd..19686930 100644 --- a/miasm2/jitter/vm_mngr_py.c +++ b/miasm2/jitter/vm_mngr_py.c @@ -163,9 +163,6 @@ PyObject* vm_set_mem(VmMngr* self, PyObject* args) Py_ssize_t length; int ret = 0x1337; uint64_t val; - uint64_t l; - - struct memory_page_node * mpn; if (!PyArg_ParseTuple(args, "OO", &addr, &item_str)) return NULL; @@ -178,18 +175,12 @@ PyObject* vm_set_mem(VmMngr* self, PyObject* args) buf_size = PyString_Size(item_str); PyString_AsStringAndSize(item_str, &buf_data, &length); - /* read is multiple page wide */ + /* write is multiple page wide */ while (buf_size){ - mpn = get_memory_page_from_address(&self->vm_mngr, val); - if (!mpn){ - PyErr_SetString(PyExc_RuntimeError, "cannot find address"); - return 0; - } - l = MIN(buf_size, mpn->size - (val-mpn->ad)); - memcpy(mpn->ad_hp + (val-mpn->ad), buf_data, l); - buf_data += l; - val += l; - buf_size -= l; + MEM_WRITE_08(&self->vm_mngr, val, (char) *(buf_data)); + buf_data += 1; + val += 1; + buf_size -= 1; } return PyLong_FromUnsignedLongLong((uint64_t)ret); -- cgit 1.4.1