diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2014-10-07 17:44:50 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2014-10-07 17:44:50 +0200 |
| commit | 809d3738bb845d5b6d08e348e9a8a03e62536121 (patch) | |
| tree | 8591cb2d9675bc5710ab8bdfe1111f0b93cdd5d5 /miasm2/jitter/jitcore_python.py | |
| parent | 10b4c8a8b46b5e247768f6f55bf9a9f006fdd61c (diff) | |
| download | focaccia-miasm-809d3738bb845d5b6d08e348e9a8a03e62536121.tar.gz focaccia-miasm-809d3738bb845d5b6d08e348e9a8a03e62536121.zip | |
Remove vm_ prefix /!\ API MODIF
The jitter cpu/vm modules used an unecessary vm_ prefix for various api. jitter.cpu.vm_get_gpreg() => jitter.cpu.get_gpreg() jitter.vm.vm_get_mem... => jitter.vm.get_mem...
Diffstat (limited to 'miasm2/jitter/jitcore_python.py')
| -rw-r--r-- | miasm2/jitter/jitcore_python.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/miasm2/jitter/jitcore_python.py b/miasm2/jitter/jitcore_python.py index b71bd138..0df9f615 100644 --- a/miasm2/jitter/jitcore_python.py +++ b/miasm2/jitter/jitcore_python.py @@ -71,7 +71,7 @@ class JitCore_Python(jitcore.JitCore): addr = expr_mem.arg.arg.arg size = expr_mem.size / 8 - value = self.vmmngr.vm_get_mem(addr, size) + value = self.vmmngr.get_mem(addr, size) return m2_expr.ExprInt_fromsize(expr_mem.size, int(value[::-1].encode("hex"), 16)) @@ -97,7 +97,7 @@ class JitCore_Python(jitcore.JitCore): content = content.decode("hex")[::-1] # Write in VmMngr context - self.vmmngr.vm_set_mem(addr, content) + self.vmmngr.set_mem(addr, content) def jitirblocs(self, label, irblocs): """Create a python function corresponding to an irblocs' group. @@ -147,14 +147,14 @@ class JitCore_Python(jitcore.JitCore): # Log registers values if self.log_regs: update_cpu_from_engine(cpu, exec_engine) - cpu.vm_dump_gpregs() + cpu.dump_gpregs() # Log instruction if self.log_mn: print "%08x %s" % (line.offset, line) # Check for memory exception - if (vmmngr.vm_get_exception() != 0): + if (vmmngr.get_exception() != 0): update_cpu_from_engine(cpu, exec_engine) return line.offset @@ -162,7 +162,7 @@ class JitCore_Python(jitcore.JitCore): exec_engine.eval_ir(ir) # Check for memory exception which do not update PC - if (vmmngr.vm_get_exception() & csts.EXCEPT_DO_NOT_UPDATE_PC != 0): + if (vmmngr.get_exception() & csts.EXCEPT_DO_NOT_UPDATE_PC != 0): update_cpu_from_engine(cpu, exec_engine) return line.offset |