From 257d7899e59efca2e876ac666a5c973707751708 Mon Sep 17 00:00:00 2001 From: Fabrice Desclaux Date: Wed, 7 Sep 2016 22:02:55 +0200 Subject: Loader/pe: add cname infos --- miasm2/jitter/loader/pe.py | 2 +- miasm2/jitter/loader/utils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/miasm2/jitter/loader/pe.py b/miasm2/jitter/loader/pe.py index e8dacb55..5c523c6c 100644 --- a/miasm2/jitter/loader/pe.py +++ b/miasm2/jitter/loader/pe.py @@ -397,11 +397,11 @@ class libimp_pe(libimp): ad = self.lib_imp2ad[libad_tmp][exp_fname] self.lib_imp2ad[libad][imp_ord_or_name] = ad - name_inv = dict([(x[1], x[0]) for x in self.name2off.items()]) c_name = canon_libname_libfunc( name_inv[libad], imp_ord_or_name) self.fad2cname[ad] = c_name + self.cname2addr[c_name] = ad log.debug("Add func %s %s", hex(ad), c_name) self.fad2info[ad] = libad, imp_ord_or_name diff --git a/miasm2/jitter/loader/utils.py b/miasm2/jitter/loader/utils.py index 83d1a796..434e5f7e 100644 --- a/miasm2/jitter/loader/utils.py +++ b/miasm2/jitter/loader/utils.py @@ -24,6 +24,7 @@ class libimp(object): self.lib_imp2ad = {} self.lib_imp2dstad = {} self.fad2cname = {} + self.cname2addr = {} self.fad2info = {} self.all_exported_lib = [] self.fake_libs = set() @@ -72,6 +73,7 @@ class libimp(object): name_inv = dict([(x[1], x[0]) for x in self.name2off.items()]) c_name = canon_libname_libfunc(name_inv[libad], imp_ord_or_name) self.fad2cname[ad] = c_name + self.cname2addr[c_name] = ad self.fad2info[ad] = libad, imp_ord_or_name return ad -- cgit 1.4.1