diff options
| author | Camille Mougey <commial@gmail.com> | 2016-05-31 12:05:18 +0200 |
|---|---|---|
| committer | Camille Mougey <commial@gmail.com> | 2016-05-31 12:05:18 +0200 |
| commit | d21cac6384e9b9bec08d5e9a797384b1868db0be (patch) | |
| tree | c420d67d09caaa26d8a693510e5376761349fba8 | |
| parent | 9815a1c01745143cceda9125e04b8d1d7b1d39fc (diff) | |
| parent | 1ca15c6f38fbc509f826ea2961fd079bc764729a (diff) | |
| download | miasm-d21cac6384e9b9bec08d5e9a797384b1868db0be.tar.gz miasm-d21cac6384e9b9bec08d5e9a797384b1868db0be.zip | |
Merge pull request #372 from serpilliere/fix_jitter_func_cast
Jitter: fix function cast
| -rw-r--r-- | miasm2/jitter/Jitgcc.c | 3 | ||||
| -rw-r--r-- | miasm2/jitter/Jittcc.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/miasm2/jitter/Jitgcc.c b/miasm2/jitter/Jitgcc.c index 3e7225cb..8b789f70 100644 --- a/miasm2/jitter/Jitgcc.c +++ b/miasm2/jitter/Jitgcc.c @@ -35,7 +35,7 @@ PyObject* gcc_exec_bloc(PyObject* self, PyObject* args) // Get the expected jitted function address func_py = PyDict_GetItem(lbl2ptr, retaddr); if (func_py) - func = (jitted_func) PyInt_AsLong((PyObject*) func_py); + func = (jitted_func) PyLong_AsVoidPtr((PyObject*) func_py); else { if (BlockDst.is_local == 1) { fprintf(stderr, "return on local label!\n"); @@ -44,7 +44,6 @@ PyObject* gcc_exec_bloc(PyObject* self, PyObject* args) // retaddr is not jitted yet return retaddr; } - // Execute it status = func(&BlockDst, jitcpu); Py_DECREF(retaddr); diff --git a/miasm2/jitter/Jittcc.c b/miasm2/jitter/Jittcc.c index 201f9b7f..1acbd56f 100644 --- a/miasm2/jitter/Jittcc.c +++ b/miasm2/jitter/Jittcc.c @@ -154,7 +154,7 @@ PyObject* tcc_exec_bloc(PyObject* self, PyObject* args) // Get the expected jitted function address func_py = PyDict_GetItem(lbl2ptr, retaddr); if (func_py) - func = (jitted_func) PyInt_AsLong((PyObject*) func_py); + func = (jitted_func) PyLong_AsVoidPtr((PyObject*) func_py); else { if (BlockDst.is_local == 1) { fprintf(stderr, "return on local label!\n"); |