diff options
Diffstat (limited to 'miasm2/jitter')
| -rw-r--r-- | miasm2/jitter/jitload.py | 16 | ||||
| -rw-r--r-- | miasm2/jitter/loader/pe.py | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py index 312dcb2e..05a8575e 100644 --- a/miasm2/jitter/jitload.py +++ b/miasm2/jitter/jitload.py @@ -21,7 +21,6 @@ log_func.addHandler(hnd) log_func.setLevel(logging.CRITICAL) - try: from miasm2.jitter.jitcore_tcc import JitCore_Tcc except ImportError: @@ -60,10 +59,11 @@ def named_arguments(func): arg_vals = namedtuple("args", args)(*arg_vals) # func_name(arguments) return address log_func.info('%s(%s) ret addr: %s', - get_caller_name(1), - ', '.join("%s=0x%x" % (field, value) - for field, value in arg_vals._asdict().iteritems()), - hex(ret_ad)) + get_caller_name(1), + ', '.join("%s=0x%x" % (field, value) + for field, value in arg_vals._asdict( + ).iteritems()), + hex(ret_ad)) return ret_ad, namedtuple("args", args)(*arg_vals) else: ret_ad, arg_vals = func(self, args) @@ -233,7 +233,6 @@ class jitter: self.stack_size = 0x10000 self.stack_base = 0x1230000 - # Init callback handler self.breakpoints_handler = CallbackHandler() self.exceptions_handler = CallbackHandlerBitflag() @@ -270,7 +269,6 @@ class jitter: self.jit.addr_mod = interval([(addr, addr)]) self.jit.updt_automod_code(self.vm) - def set_breakpoint(self, addr, *args): """Set callbacks associated with addr. @addr: breakpoint address @@ -383,7 +381,7 @@ class jitter: l = 0 tmp = addr while ((max_char is None or l < max_char) and - self.vm.get_mem(tmp, 1) != "\x00"): + self.vm.get_mem(tmp, 1) != "\x00"): tmp += 1 l += 1 return self.vm.get_mem(addr, l) @@ -395,7 +393,7 @@ class jitter: l = 0 tmp = addr while ((max_char is None or l < max_char) and - self.vm.get_mem(tmp, 2) != "\x00\x00"): + self.vm.get_mem(tmp, 2) != "\x00\x00"): tmp += 2 l += 2 s = self.vm.get_mem(addr, l) diff --git a/miasm2/jitter/loader/pe.py b/miasm2/jitter/loader/pe.py index c40e8e38..2d80c8df 100644 --- a/miasm2/jitter/loader/pe.py +++ b/miasm2/jitter/loader/pe.py @@ -485,7 +485,8 @@ def vm_load_pe_and_dependencies(vm, fname, name2module, runtime_lib, try: with open(fname) as fstream: log.info('Loading module name %r', fname) - pe_obj = vm_load_pe(vm, fstream.read(), name=fname, **kwargs) + pe_obj = vm_load_pe( + vm, fstream.read(), name=fname, **kwargs) except IOError: log.error('Cannot open %s' % fname) name2module[name] = None |