tool: Handle unaligned PD segments

Correctly handle PD segments whose start vaddrs do not lie on page boundaries. Signed-off-by: Nick Spinale <[email protected]>
seL4 · Oct 25, 2023 · d6b52d9 · d6b52d9
1 parent 95a4ab3
commit d6b52d9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tool/microkit/__main__.py b/tool/microkit/__main__.py
@@ -992,7 +992,8 @@ def build_system(
             if not segment.loadable:
                 continue
 
-            regions.append(Region(f"PD-ELF {pd.name}-{seg_idx}", phys_addr_next, segment.data))
+            segment_phys_addr = phys_addr_next + (segment.virt_addr % kernel_config.minimum_page_size)
+            regions.append(Region(f"PD-ELF {pd.name}-{seg_idx}", segment_phys_addr, segment.data))
 
             perms = ""
             if segment.is_readable: