diff options
Diffstat (limited to 'miasm2/analysis')
| -rw-r--r-- | miasm2/analysis/binary.py | 6 | ||||
| -rw-r--r-- | miasm2/analysis/debugging.py | 14 | ||||
| -rw-r--r-- | miasm2/analysis/gdbserver.py | 4 | ||||
| -rw-r--r-- | miasm2/analysis/sandbox.py | 16 |
4 files changed, 20 insertions, 20 deletions
diff --git a/miasm2/analysis/binary.py b/miasm2/analysis/binary.py index c14078e3..77f1610d 100644 --- a/miasm2/analysis/binary.py +++ b/miasm2/analysis/binary.py @@ -41,8 +41,8 @@ class Container(object): if vm is not None: if addr is None: raise ValueError('set load addr') - vm.vm_add_memory_page(addr, - PAGE_READ, - data) + vm.add_memory_page(addr, + PAGE_READ, + data) self.e, self.bs, self.ep = e, bs, ep diff --git a/miasm2/analysis/debugging.py b/miasm2/analysis/debugging.py index 82710b6a..bc422954 100644 --- a/miasm2/analysis/debugging.py +++ b/miasm2/analysis/debugging.py @@ -85,7 +85,7 @@ class Debugguer(object): write=write) dbm = DebugBreakpointMemory(addr, size, access_type) self.hw_bp_list.append(dbm) - self.myjit.vm.vm_add_memory_breakpoint(addr, size, access_type) + self.myjit.vm.add_memory_breakpoint(addr, size, access_type) def remove_breakpoint(self, dbs): "remove the DebugBreakpointSoft instance" @@ -100,7 +100,7 @@ class Debugguer(object): def remove_memory_breakpoint(self, dbm): "remove the DebugBreakpointMemory instance" self.hw_bp_list.remove(dbm) - self.myjit.vm.vm_remove_memory_breakpoint(dbm.addr, dbm.access_type) + self.myjit.vm.remove_memory_breakpoint(dbm.addr, dbm.access_type) def remove_memory_breakpoint_by_addr_access(self, addr, read=False, write=False): @@ -140,8 +140,8 @@ class Debugguer(object): print "Memory breakpoint reached!" # Remove flag - except_flag = self.myjit.vm.vm_get_exception() - self.myjit.vm.vm_set_exception(except_flag ^ res.except_flag) + except_flag = self.myjit.vm.get_exception() + self.myjit.vm.set_exception(except_flag ^ res.except_flag) else: raise NotImplementedError("Unknown Except") @@ -170,11 +170,11 @@ class Debugguer(object): def get_mem(self, addr, size=0xF): "hexdump @addr, size" - hexdump(self.myjit.vm.vm_get_mem(addr, size)) + hexdump(self.myjit.vm.get_mem(addr, size)) def get_mem_raw(self, addr, size=0xF): "hexdump @addr, size" - return self.myjit.vm.vm_get_mem(addr, size) + return self.myjit.vm.get_mem(addr, size) def watch_mem(self, addr, size=0xF): self.mem_watched.append((addr, size)) @@ -197,7 +197,7 @@ class Debugguer(object): def get_gpreg_all(self): "Return general purposes registers" - return self.myjit.cpu.vm_get_gpreg() + return self.myjit.cpu.get_gpreg() class DebugCmd(cmd.Cmd, object): diff --git a/miasm2/analysis/gdbserver.py b/miasm2/analysis/gdbserver.py index 507b2f67..73757a63 100644 --- a/miasm2/analysis/gdbserver.py +++ b/miasm2/analysis/gdbserver.py @@ -311,11 +311,11 @@ class GdbServer(object): return self.dbg.get_reg_value(reg_name) def read_memory(self, addr, size): - except_flag_vm = self.dbg.myjit.vm.vm_get_exception() + except_flag_vm = self.dbg.myjit.vm.get_exception() try: return self.dbg.get_mem_raw(addr, size).encode("hex") except RuntimeError: - self.dbg.myjit.vm.vm_set_exception(except_flag_vm) + self.dbg.myjit.vm.set_exception(except_flag_vm) return "00" * size diff --git a/miasm2/analysis/sandbox.py b/miasm2/analysis/sandbox.py index 598f40a0..2e569e61 100644 --- a/miasm2/analysis/sandbox.py +++ b/miasm2/analysis/sandbox.py @@ -257,10 +257,10 @@ class Sandbox_Win_x86_32(Sandbox, Arch_x86_32, OS_Win): Sandbox.__init__(self, *args, **kwargs) # Pre-stack some arguments - self.jitter.vm_push_uint32_t(2) - self.jitter.vm_push_uint32_t(1) - self.jitter.vm_push_uint32_t(0) - self.jitter.vm_push_uint32_t(0x1337beef) + self.jitter.push_uint32_t(2) + self.jitter.push_uint32_t(1) + self.jitter.push_uint32_t(0) + self.jitter.push_uint32_t(0x1337beef) # Set the runtime guard self.jitter.add_breakpoint(0x1337beef, self.__class__.code_sentinelle) @@ -287,10 +287,10 @@ class Sandbox_Linux_x86_32(Sandbox, Arch_x86_32, OS_Linux): Sandbox.__init__(self, *args, **kwargs) # Pre-stack some arguments - self.jitter.vm_push_uint32_t(2) - self.jitter.vm_push_uint32_t(1) - self.jitter.vm_push_uint32_t(0) - self.jitter.vm_push_uint32_t(0x1337beef) + self.jitter.push_uint32_t(2) + self.jitter.push_uint32_t(1) + self.jitter.push_uint32_t(0) + self.jitter.push_uint32_t(0x1337beef) # Set the runtime guard self.jitter.add_breakpoint(0x1337beef, self.__class__.code_sentinelle) |