diff options
| -rw-r--r-- | miasm/arch/ia32_sem.py | 2 | ||||
| -rwxr-xr-x | miasm/tools/emul_helper.py | 4 | ||||
| -rw-r--r-- | miasm/tools/to_c_helper.py | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/miasm/arch/ia32_sem.py b/miasm/arch/ia32_sem.py index 012705eb..e28c1327 100644 --- a/miasm/arch/ia32_sem.py +++ b/miasm/arch/ia32_sem.py @@ -2405,7 +2405,7 @@ class ia32_rexpr: -def dict_to_Expr(d, modifs = {}, opmode = u32, admode = u32, segm_to_do = {}): +def dict_to_Expr(d, modifs = {}, opmode = u32, admode = u32, segm_to_do = set()): size = [x86_afs.u32, x86_afs.u08][modifs[w8]==True] #overwrite w8 if modifs[sd]!=None: diff --git a/miasm/tools/emul_helper.py b/miasm/tools/emul_helper.py index 41c6ba27..2c0a7364 100755 --- a/miasm/tools/emul_helper.py +++ b/miasm/tools/emul_helper.py @@ -189,7 +189,7 @@ def get_instr_expr_args(l, args, my_eip): #""" ###XXX for eval abs -def get_instr_expr(l, my_eip, args = None, segm_to_do = {}): +def get_instr_expr(l, my_eip, args = None, segm_to_do = set()): if args==None:args = [] for x in l.arg: args.append(dict_to_Expr(x, l.m.modifs, l.opmode, l.admode, segm_to_do)) @@ -620,7 +620,7 @@ def guess_func_destack(all_bloc): return False, a[x86_afs.imm] -def digest_allbloc_instr(all_bloc, segm_to_do = {}): +def digest_allbloc_instr(all_bloc, segm_to_do = set()): instrs = {} """ g = asmbloc.bloc2graph(all_bloc) diff --git a/miasm/tools/to_c_helper.py b/miasm/tools/to_c_helper.py index b24a1754..646aafbe 100644 --- a/miasm/tools/to_c_helper.py +++ b/miasm/tools/to_c_helper.py @@ -408,7 +408,7 @@ def Exp2C(exprs, l = None, addr2label = None, gen_exception_code = False): return out+out_eip, post_instr -def bloc2C(all_bloc, addr2label = None, gen_exception_code = False, dbg_instr = False, dbg_reg = False, dbg_lbl = False, filtered_ad = None, tick_dbg = None, segm_to_do = {}): +def bloc2C(all_bloc, addr2label = None, gen_exception_code = False, dbg_instr = False, dbg_reg = False, dbg_lbl = False, filtered_ad = None, tick_dbg = None, segm_to_do = set()): all_instrs = digest_allbloc_instr(all_bloc, segm_to_do) if not addr2label: @@ -505,7 +505,7 @@ def bloc2C(all_bloc, addr2label = None, gen_exception_code = False, dbg_instr = -def bloc_gen_C_func(all_bloc, funcname, addr2label = None, gen_exception_code = False, dbg_instr = False, dbg_reg = False, dbg_lbl = False, filtered_ad = None, tick_dbg = None, segm_to_do = {}): +def bloc_gen_C_func(all_bloc, funcname, addr2label = None, gen_exception_code = False, dbg_instr = False, dbg_reg = False, dbg_lbl = False, filtered_ad = None, tick_dbg = None, segm_to_do = set()): f_dec = 'uint64_t %s(void)'%funcname out = [] out+=[f_dec, @@ -726,7 +726,7 @@ def asm2C(f_name, known_mems, dyn_func, in_str, x86_mn, symbol_pool, func_to_dis return funcs_code, dyn_dispatcher -def gen_C_from_asmbloc(in_str, offset, symbol_pool, dont_dis = [], job_done = None, log_mn = False, log_reg = False, log_lbl = False, filtered_ad = [], tick_dbg = None, code_addr = [], all_bloc_funcs = [], segm_to_do = {}, **kargs): +def gen_C_from_asmbloc(in_str, offset, symbol_pool, dont_dis = [], job_done = None, log_mn = False, log_reg = False, log_lbl = False, filtered_ad = [], tick_dbg = None, code_addr = [], all_bloc_funcs = [], segm_to_do = set(), **kargs): if job_done == None: job_done = set() @@ -1016,7 +1016,7 @@ def updt_bloc_emul(known_blocs, in_str, my_eip, symbol_pool, code_blocs_mem_rang ''' ttt = 0 -def updt_bloc_emul(known_blocs, in_str, my_eip, symbol_pool, code_blocs_mem_range, dont_dis = [], job_done = None, log_mn = False, log_regs = False, segm_to_do = {}, **kargs): +def updt_bloc_emul(known_blocs, in_str, my_eip, symbol_pool, code_blocs_mem_range, dont_dis = [], job_done = None, log_mn = False, log_regs = False, segm_to_do = set(), **kargs): if job_done == None: job_done = set() fname, f_dec, funcs_code, cur_bloc = gen_C_from_asmbloc(in_str, my_eip, symbol_pool, dont_dis, job_done, log_mn, log_regs, segm_to_do = segm_to_do, **kargs) @@ -1212,10 +1212,10 @@ def load_pe_in_vm(fname_in, options, all_imp_dll = None, **kargs): segms['fs'] = 0x4 vm_set_segm(segms) vm_set_segm_base(segms['fs'], seh_helper.FS_0_AD) - segm_to_do = {x86_afs.reg_sg.index(x86_afs.r_fs)} + segm_to_do = set([x86_afs.reg_sg.index(x86_afs.r_fs)]) seh_helper.init_seh() else: - segm_to_do = {} + segm_to_do = set() symbol_pool = asmbloc.asm_symbol_pool() @@ -1284,7 +1284,7 @@ def manage_runtime_func(my_eip, api_modues, runtime_dll): def do_bloc_emul(known_blocs, in_str, my_eip, symbol_pool, code_blocs_mem_range, dont_dis = [], job_done = None, log_mn = False, log_regs = False, - segm_to_do = {}, dump_blocs = False, **kargs): + segm_to_do = set(), dump_blocs = False, **kargs): if not my_eip in known_blocs: updt_bloc_emul(known_blocs, in_str, my_eip, symbol_pool, code_blocs_mem_range, |