BinStream: Unify BinStreams location

2 files changed, 33 insertions, 36 deletions

diff --git a/miasm2/core/bin_stream.py b/miasm2/core/bin_stream.py
index 6dafecfd..48471b2f 100644
--- a/miasm2/core/bin_stream.py
+++ b/miasm2/core/bin_stream.py
@@ -171,3 +171,35 @@ class bin_stream_pe(bin_stream):
 
 class bin_stream_elf(bin_stream_pe):
     pass
+
+
+class bin_stream_vm(bin_stream):
+
+    def __init__(self, vm, offset=0L, base_offset=0L):
+        self.offset = offset
+        self.base_offset = base_offset
+        self.vm = vm
+
+    def getlen(self):
+        return 0xFFFFFFFFFFFFFFFF
+
+    def getbytes(self, start, l=1):
+        try:
+            s = self.vm.get_mem(start + self.base_offset, l)
+        except:
+            raise IOError('cannot get mem ad', hex(start))
+        return s
+
+    def readbs(self, l=1):
+        try:
+            s = self.vm.get_mem(self.offset + self.base_offset, l)
+        except:
+            raise IOError('cannot get mem ad', hex(self.offset))
+        self.offset += l
+        return s
+
+    def writebs(self, l=1):
+        raise ValueError('writebs unsupported')
+
+    def setoffset(self, val):
+        self.offset = val
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py
index 2135f40e..c297ba50 100644
--- a/miasm2/jitter/jitload.py
+++ b/miasm2/jitter/jitload.py
@@ -5,7 +5,7 @@ from miasm2.core import asmbloc
 
 from miasm2.jitter.csts import *
 from miasm2.core.utils import *
-from miasm2.core.bin_stream import bin_stream
+from miasm2.core.bin_stream import bin_stream_vm
 from miasm2.ir.ir2C import init_arch_C
 
 import logging
@@ -32,41 +32,6 @@ except ImportError:
     log.error('cannot import jit python')
 
 
-class bin_stream_vm(bin_stream):
-
-    def __init__(self, vm, offset=0L, base_offset=0L):
-        self.offset = offset
-        self.base_offset = base_offset
-        self.vm = vm
-
-    def getlen(self):
-        return 0xFFFFFFFFFFFFFFFF
-
-    def getbytes(self, start, l=1):
-        try:
-            s = self.vm.get_mem(start + self.base_offset, l)
-        except:
-            raise IOError('cannot get mem ad', hex(start))
-        return s
-
-    def readbs(self, l=1):
-        try:
-            s = self.vm.get_mem(self.offset + self.base_offset, l)
-        except:
-            raise IOError('cannot get mem ad', hex(self.offset))
-        self.offset += l
-        return s
-
-    def writebs(self, l=1):
-        raise ValueError('writebs unsupported')
-
-    def setoffset(self, val):
-        self.offset = val
-
-
-
-
-
 class CallbackHandler(object):
 
     "Handle a list of callback"