Skip to content

Commit 158f627

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-rv64-heap-pagetable
# Conflicts: # awkernel_lib/src/arch/rv64/vm.rs
2 parents b52a912 + 12482b9 commit 158f627

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

  • awkernel_lib/src/arch/rv64

awkernel_lib/src/arch/rv64/vm.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,19 @@ impl MemorySet {
260260
None,
261261
);
262262

263+
unsafe {
264+
unsafe_puts("Mapping physical memory...\r\n");
265+
}
266+
memory_set.push(
267+
MapArea::new(
268+
VirtAddr::from_usize(ekernel as *const () as usize),
269+
VirtAddr::from_usize(super::address::MEMORY_END as usize),
270+
MapType::Identical,
271+
MapPermission::R | MapPermission::W,
272+
),
273+
None,
274+
);
275+
263276
// Note: Heap mapping is created separately in calculate_dynamic_heap_size()
264277
memory_set
265278
}

0 commit comments

Comments
 (0)