Have blob loader contain an image

Author: elicn

qiling/loader/blob.py

@@ -4,9 +4,10 @@
 #
 
 from qiling import Qiling
-from qiling.loader.loader import QlLoader
+from qiling.loader.loader import QlLoader, Image
 from qiling.os.memory import QlMemoryHeap
 
+
 class QlLoaderBLOB(QlLoader):
     def __init__(self, ql: Qiling):
         super().__init__(ql)
@@ -16,13 +17,19 @@ def __init__(self, ql: Qiling):
     def run(self):
         self.load_address = self.ql.os.entry_point      # for consistency
 
-        self.ql.mem.map(self.ql.os.entry_point, self.ql.os.code_ram_size, info="[code]")
-        self.ql.mem.write(self.ql.os.entry_point, self.ql.code)
+        code_begins = self.load_address
+        code_size = self.ql.os.code_ram_size
+        code_ends = code_begins + code_size
 
-        heap_address = self.ql.os.entry_point + self.ql.os.code_ram_size
-        heap_size = int(self.ql.os.profile.get("CODE", "heap_size"), 16)
-        self.ql.os.heap = QlMemoryHeap(self.ql, heap_address, heap_address + heap_size)
+        self.ql.mem.map(code_begins, code_size, info="[code]")
+        self.ql.mem.write(code_begins, self.ql.code)
 
-        self.ql.arch.regs.arch_sp = heap_address - 0x1000
+        # allow image-related functionalities
+        self.images.append(Image(code_begins, code_ends, 'blob_code'))
+
+        # FIXME: heap starts above end of ram??
+        heap_base = code_ends
+        heap_size = int(self.ql.os.profile.get("CODE", "heap_size"), 16)
+        self.ql.os.heap = QlMemoryHeap(self.ql, heap_base, heap_base + heap_size)
 
-        return
+        self.ql.arch.regs.arch_sp = code_ends - 0x1000