Merge remote-tracking branch 'origin/main' into fix-rv64-heap-pagetable

# Conflicts:
#	awkernel_lib/src/arch/rv64/vm.rs

Author: PeterWrighten

awkernel_lib/src/arch/rv64/vm.rs

@@ -260,6 +260,19 @@ impl MemorySet {
             None,
         );
 
+        unsafe {
+            unsafe_puts("Mapping physical memory...\r\n");
+        }
+        memory_set.push(
+            MapArea::new(
+                VirtAddr::from_usize(ekernel as *const () as usize),
+                VirtAddr::from_usize(super::address::MEMORY_END as usize),
+                MapType::Identical,
+                MapPermission::R | MapPermission::W,
+            ),
+            None,
+        );
+
         // Note: Heap mapping is created separately in calculate_dynamic_heap_size()
         memory_set
     }

kernel/src/arch/rv64/kernel_main.rs

@@ -156,7 +156,7 @@ unsafe fn init_heap_allocation() {
         fn ekernel();
     }
 
-    let heap_start = (ekernel as usize + 0xfff) & !0xfff; // Align to 4K
+    let heap_start = (ekernel as *const () as usize + 0xfff) & !0xfff; // Align to 4K
     let backup_size = BACKUP_HEAP_SIZE;
     let total_heap_size = awkernel_lib::arch::rv64::get_heap_size();