diff options
| author | Ajax <commial@gmail.com> | 2017-01-05 17:11:14 +0100 |
|---|---|---|
| committer | Ajax <commial@gmail.com> | 2017-01-05 17:11:14 +0100 |
| commit | a96b8db7df51a05081f6b8597f3c07f534494a78 (patch) | |
| tree | 78898eb80cff8c9b9c6a1cb3e3eb517d7cd1e20d | |
| parent | 67fec56ece194ec47a7100614d72b4412a26b67c (diff) | |
| download | miasm-a96b8db7df51a05081f6b8597f3c07f534494a78.tar.gz miasm-a96b8db7df51a05081f6b8597f3c07f534494a78.zip | |
LLVM: get rid of vm_mngr argument
| -rw-r--r-- | miasm2/jitter/Jitllvm.c | 8 | ||||
| -rw-r--r-- | miasm2/jitter/jitcore_llvm.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/miasm2/jitter/Jitllvm.c b/miasm2/jitter/Jitllvm.c index 979c4f3a..cf2e1324 100644 --- a/miasm2/jitter/Jitllvm.c +++ b/miasm2/jitter/Jitllvm.c @@ -13,7 +13,8 @@ PyObject* llvm_exec_bloc(PyObject* self, PyObject* args) { uint64_t (*func)(void*, void*, void*, uint8_t*); - uint64_t vm; + vm_cpu_t* cpu; + vm_mngr_t* vm; uint64_t ret; JitCpu* jitcpu; uint8_t status; @@ -23,9 +24,10 @@ PyObject* llvm_exec_bloc(PyObject* self, PyObject* args) PyObject* retaddr = NULL; - if (!PyArg_ParseTuple(args, "OOKOO", &retaddr, &jitcpu, &vm, &lbl2ptr, &breakpoints)) + if (!PyArg_ParseTuple(args, "OOOO", &retaddr, &jitcpu, &lbl2ptr, &breakpoints)) return NULL; - vm_cpu_t* cpu = jitcpu->cpu; + cpu = jitcpu->cpu; + vm = &(jitcpu->pyvm->vm_mngr); /* The loop will decref retaddr always once */ Py_INCREF(retaddr); diff --git a/miasm2/jitter/jitcore_llvm.py b/miasm2/jitter/jitcore_llvm.py index 6a5c2036..66e835ef 100644 --- a/miasm2/jitter/jitcore_llvm.py +++ b/miasm2/jitter/jitcore_llvm.py @@ -136,5 +136,5 @@ class JitCore_LLVM(jitcore.JitCore): @cpu: JitCpu instance @breakpoints: Dict instance of used breakpoints """ - return self.exec_wrapper(label, cpu, cpu.vmmngr.vmmngr, + return self.exec_wrapper(label, cpu, self.lbl2jitbloc.data, breakpoints) |