diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2015-12-13 13:38:54 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2015-12-16 15:55:55 +0100 |
| commit | 8ebdbffdc6c86e9b832869046dfc6e11a8fb21be (patch) | |
| tree | bde0bed0794fd7e52130c00c954212dbc9bed7f3 /miasm2/jitter | |
| parent | b998b1a8b2814585692e885e656c48357fbbb9b8 (diff) | |
| download | miasm-8ebdbffdc6c86e9b832869046dfc6e11a8fb21be.tar.gz miasm-8ebdbffdc6c86e9b832869046dfc6e11a8fb21be.zip | |
Update api according to Elfesteem
Diffstat (limited to '')
| -rw-r--r-- | miasm2/jitter/loader/elf.py | 6 | ||||
| -rw-r--r-- | miasm2/jitter/loader/pe.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/jitter/loader/elf.py b/miasm2/jitter/loader/elf.py index b3946000..12670977 100644 --- a/miasm2/jitter/loader/elf.py +++ b/miasm2/jitter/loader/elf.py @@ -57,10 +57,10 @@ def vm_load_elf(vm, fdata, **kargs): i = interval() all_data = {} for p in e.ph.phlist: - if p.ph.type != 1: + if p.ph.type != elf_csts.PT_LOAD: continue - log.debug('0x%x 0x%x 0x%x 0x%x', p.ph.vaddr, p.ph.memsz, p.ph.offset, - p.ph.filesz) + log.debug('0x%x 0x%x 0x%x 0x%x 0x%x', p.ph.vaddr, p.ph.memsz, p.ph.offset, + p.ph.filesz, p.ph.type) data_o = e._content[p.ph.offset:p.ph.offset + p.ph.filesz] addr_o = p.ph.vaddr a_addr = addr_o & ~0xFFF diff --git a/miasm2/jitter/loader/pe.py b/miasm2/jitter/loader/pe.py index 32d92164..168a5e7d 100644 --- a/miasm2/jitter/loader/pe.py +++ b/miasm2/jitter/loader/pe.py @@ -70,7 +70,7 @@ def is_redirected_export(e, ad): # test is ad points to code or dll name out = '' for i in xrange(0x200): - c = e.virt(ad + i) + c = e.virt.get(ad + i) if c == "\x00": break out += c |