diff options
| author | Camille Mougey <commial@gmail.com> | 2016-10-03 12:22:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 12:22:17 +0200 |
| commit | 9bc007e7350851d1d97e426f4d1ae369facdb721 (patch) | |
| tree | f6dc9da62785e7af07ba5e7df7ab478d2d21e2f1 /test/arch/x86/qemu/testqemu.py | |
| parent | eefe15ed5b70bcea4bd5cb6eeefd458439e4eef8 (diff) | |
| parent | 26c837627db7eb0a2e5e9e4c349c9b85bd386545 (diff) | |
| download | miasm-9bc007e7350851d1d97e426f4d1ae369facdb721.tar.gz miasm-9bc007e7350851d1d97e426f4d1ae369facdb721.zip | |
Merge pull request #433 from serpilliere/fix_api_str
Os_dep: fix get/set str
Diffstat (limited to 'test/arch/x86/qemu/testqemu.py')
| -rw-r--r-- | test/arch/x86/qemu/testqemu.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/arch/x86/qemu/testqemu.py b/test/arch/x86/qemu/testqemu.py index 65d5825a..5f26d6f3 100644 --- a/test/arch/x86/qemu/testqemu.py +++ b/test/arch/x86/qemu/testqemu.py @@ -7,7 +7,7 @@ from pdb import pm from miasm2.analysis.sandbox import Sandbox_Linux_x86_32 from miasm2.jitter.jitload import log_func from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE -from miasm2.os_dep.win_api_x86_32 import get_str_ansi, upck32 +from miasm2.core.utils import upck32 # Utils def parse_fmt(s): @@ -43,7 +43,7 @@ def xxx___printf_chk(jitter): ret_ad, args = jitter.func_args_cdecl(["out", "format"]) if args.out != 1: raise RuntimeError("Not implemented") - fmt = get_str_ansi(jitter, args.format) + fmt = jitter.get_str_ansi(args.format) # Manage llx fmt = fmt.replace("llx", "lx") fmt = fmt.replace("%016lx", "%016z") @@ -56,7 +56,7 @@ def xxx___printf_chk(jitter): for x in fmt_a: a = upck32(jitter.vm.get_mem(esp + 8 + 4*i, 4)) if x == "s": - a = get_str_ansi(jitter, a) + a = jitter.get_str_ansi(a) elif x.lower() in ("x", 'd'): pass elif x.lower() in ("f", "l"): |