about summary refs log tree commit diff stats
path: root/miasm2/analysis/binary.py
diff options
context:
space:
mode:
authorFabrice Desclaux <fabrice.desclaux@cea.fr>2014-12-03 11:09:36 +0100
committerFabrice Desclaux <fabrice.desclaux@cea.fr>2014-12-03 11:26:45 +0100
commit05a333fe41516fa6a2976bbdd84fc05b9bca0f4f (patch)
tree908155c127bb6fec850846dd31547ce57afd1d1c /miasm2/analysis/binary.py
parentab7ef5529441320f2483872bb0c35cf22615aaa2 (diff)
downloadfocaccia-miasm-05a333fe41516fa6a2976bbdd84fc05b9bca0f4f.tar.gz
focaccia-miasm-05a333fe41516fa6a2976bbdd84fc05b9bca0f4f.zip
Jitter: update API
Diffstat (limited to 'miasm2/analysis/binary.py')
-rw-r--r--miasm2/analysis/binary.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/miasm2/analysis/binary.py b/miasm2/analysis/binary.py
index bc662265..a46a252c 100644
--- a/miasm2/analysis/binary.py
+++ b/miasm2/analysis/binary.py
@@ -1,8 +1,6 @@
 import logging
 
 from miasm2.core.bin_stream import *
-from elfesteem import pe_init, elf_init
-from miasm2.jitter.jitload import vm_load_pe, vm_load_elf
 from miasm2.jitter.csts import PAGE_READ
 
 
@@ -112,7 +110,11 @@ class Container(object):
 class ContainerPE(Container):
     "Container abstraction for PE"
 
+
     def parse(self, data, vm=None):
+        from miasm2.jitter.loader.pe import vm_load_pe, preload_pe
+        from elfesteem import pe_init
+
         # Parse signature
         if not data.startswith('MZ'):
             raise ContainerSignatureException()
@@ -144,6 +146,9 @@ class ContainerELF(Container):
     "Container abstraction for ELF"
 
     def parse(self, data, vm=None):
+        from miasm2.jitter.loader.elf import vm_load_elf, preload_elf
+        from elfesteem import elf_init
+
         # Parse signature
         if not data.startswith('\x7fELF'):
             raise ContainerSignatureException()