Additional housekeeping

Author: elicn

qiling/extensions/coverage/formats/drcov_exact.py

@@ -19,5 +19,4 @@ class QlDrCoverageExact(QlDrCoverage):
 
     def activate(self) -> None:
         # We treat every instruction as a block on its own.
-        self.bb_callback = self.ql.hook_code(self.block_callback, user_data=self)
-        
+        self.bb_callback = self.ql.hook_code(self.block_callback)

qiling/extensions/coverage/formats/ezcov.py

@@ -4,9 +4,9 @@
 #
 
 from __future__ import annotations
-from collections import namedtuple
-from os.path import basename
-from typing import TYPE_CHECKING, List
+
+import os
+from typing import Any, TYPE_CHECKING, List, NamedTuple
 
 from .base import QlBaseCoverage
 
@@ -16,10 +16,15 @@
 
 
 # Adapted from https://github.com/nccgroup/Cartographer/blob/main/EZCOV.md#coverage-data
-class bb_entry(namedtuple('bb_entry', 'offset size mod_id')):
-    def csvline(self):
-        offset = '0x{:08x}'.format(self.offset)
+class bb_entry(NamedTuple):
+    offset: int
+    size: int
+    mod_id: Any
+
+    def as_csv(self) -> str:
+        offset = f'{self.offset:#010x}'
         mod_id = f"[ {self.mod_id if self.mod_id is not None else ''} ]"
+
         return f"{offset},{self.size},{mod_id}\n"
 
 class QlEzCoverage(QlBaseCoverage):
@@ -42,6 +47,10 @@ def __init__(self, ql: Qiling):
         self.bb_callback = None
 
     def block_callback(self, ql: Qiling, address: int, size: int):
+        img = ql.loader.find_containing_image(address)
+
+        if img is not None:
+            self.basic_blocks.append(bb_entry(address - img.base, size, os.path.basename(img.path)))
 
     def activate(self) -> None:
         self.bb_callback = self.ql.hook_block(self.block_callback)
@@ -54,5 +63,5 @@ def dump_coverage(self, coverage_file: str) -> None:
         with open(coverage_file, "w") as cov:
             cov.write(f"EZCOV VERSION: {self.ezcov_version}\n")
             cov.write("# Qiling EZCOV exporter tool\n")
-            for bb in self.basic_blocks:
-                cov.write(bb.csvline())
+
+            cov.writelines(bb.as_csv() for bb in self.basic_blocks)