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 /example | |
| parent | 10b4c8a8b46b5e247768f6f55bf9a9f006fdd61c (diff) | |
| download | miasm-809d3738bb845d5b6d08e348e9a8a03e62536121.tar.gz 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 'example')
| -rw-r--r-- | example/test_jit_arm.py | 4 | ||||
| -rw-r--r-- | example/test_jit_mips32.py | 4 | ||||
| -rw-r--r-- | example/test_jit_msp430.py | 6 | ||||
| -rw-r--r-- | example/test_jit_x86_32.py | 4 | ||||
| -rw-r--r-- | example/unpack_upx.py | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/example/test_jit_arm.py b/example/test_jit_arm.py index df36ce16..2e54ee58 100644 --- a/example/test_jit_arm.py +++ b/example/test_jit_arm.py @@ -48,9 +48,9 @@ def jit_arm_binary(args): preload_elf(myjit.vm, elf, libs) myjit.add_lib_handler(libs) myjit.add_breakpoint(0x1337BEEF, lambda _: exit(0)) - regs = myjit.cpu.vm_get_gpreg() + regs = myjit.cpu.get_gpreg() regs['LR'] = 0x1337BEEF - myjit.cpu.vm_set_gpreg(regs) + myjit.cpu.set_gpreg(regs) myjit.init_run(entryp) diff --git a/example/test_jit_mips32.py b/example/test_jit_mips32.py index 5dd9175d..42188ab8 100644 --- a/example/test_jit_mips32.py +++ b/example/test_jit_mips32.py @@ -48,12 +48,12 @@ def jit_mips32_binary(args): myjit.jit.log_mn = args.log_mn myjit.jit.log_newbloc = args.log_newbloc - myjit.vm.vm_add_memory_page(0, PAGE_READ | PAGE_WRITE, open(filepath).read()) + myjit.vm.add_memory_page(0, PAGE_READ | PAGE_WRITE, open(filepath).read()) myjit.add_breakpoint(0x1337BEEF, code_sentinelle) # for stack - myjit.vm.vm_add_memory_page(0xF000, PAGE_READ | PAGE_WRITE, "\x00"*0x1000) + myjit.vm.add_memory_page(0xF000, PAGE_READ | PAGE_WRITE, "\x00"*0x1000) myjit.cpu.SP = 0xF800 diff --git a/example/test_jit_msp430.py b/example/test_jit_msp430.py index d725951a..00174eec 100644 --- a/example/test_jit_msp430.py +++ b/example/test_jit_msp430.py @@ -42,16 +42,16 @@ def jit_msp430_binary(args): myjit.jit.log_mn = args.log_mn myjit.jit.log_newbloc = args.log_newbloc - myjit.vm.vm_add_memory_page(0, PAGE_READ | PAGE_WRITE, open(filepath).read()) + myjit.vm.add_memory_page(0, PAGE_READ | PAGE_WRITE, open(filepath).read()) myjit.add_breakpoint(0x1337, lambda _: exit(0)) # for stack - myjit.vm.vm_add_memory_page(0xF000, PAGE_READ | PAGE_WRITE, "\x00"*0x1000) + myjit.vm.add_memory_page(0xF000, PAGE_READ | PAGE_WRITE, "\x00"*0x1000) myjit.cpu.SP = 0xF800 - myjit.vm_push_uint16_t(0x1337) + myjit.push_uint16_t(0x1337) myjit.init_run(entryp) diff --git a/example/test_jit_x86_32.py b/example/test_jit_x86_32.py index 44696c74..8ba39bb3 100644 --- a/example/test_jit_x86_32.py +++ b/example/test_jit_x86_32.py @@ -30,11 +30,11 @@ myjit.init_stack() data = open(args.filename).read() run_addr = 0x40000000 -myjit.vm.vm_add_memory_page(run_addr, PAGE_READ | PAGE_WRITE, data) +myjit.vm.add_memory_page(run_addr, PAGE_READ | PAGE_WRITE, data) myjit.jit.log_regs = True myjit.jit.log_mn = True -myjit.vm_push_uint32_t(0x1337beef) +myjit.push_uint32_t(0x1337beef) myjit.add_breakpoint(0x1337beef, code_sentinelle) diff --git a/example/unpack_upx.py b/example/unpack_upx.py index 70684097..3dcfdb33 100644 --- a/example/unpack_upx.py +++ b/example/unpack_upx.py @@ -48,7 +48,7 @@ else: logging.basicConfig(level=logging.WARNING) if options.verbose is True: - sb.jitter.vm.vm_dump_memory_page_pool() + sb.jitter.vm.dump_memory_page_pool() ep = sb.entry_point @@ -75,14 +75,14 @@ if options.graph is True: if options.verbose is True: - sb.jitter.vm.vm_dump_memory_page_pool() + sb.jitter.vm.dump_memory_page_pool() def update_binary(jitter): sb.pe.Opthdr.AddressOfEntryPoint = sb.pe.virt2rva(jitter.pc) logging.info('updating binary') for s in sb.pe.SHList: - sdata = sb.jitter.vm.vm_get_mem(sb.pe.rva2virt(s.addr), s.rawsize) + sdata = sb.jitter.vm.get_mem(sb.pe.rva2virt(s.addr), s.rawsize) sb.pe.virt[sb.pe.rva2virt(s.addr)] = sdata @@ -92,7 +92,7 @@ sb.jitter.add_breakpoint(end_label, update_binary) sb.run() -regs = sb.jitter.cpu.vm_get_gpreg() +regs = sb.jitter.cpu.get_gpreg() new_dll = [] # XXXXX |