diff options
| author | Raghuram Subramani <raghus2247@gmail.com> | 2025-02-03 23:12:20 +0530 |
|---|---|---|
| committer | Raghuram Subramani <raghus2247@gmail.com> | 2025-02-03 23:19:04 +0530 |
| commit | 1ac479c99f2d4548285893e76df4e0ffe9ce42cc (patch) | |
| tree | 46bce112e0860cb9150d1d9d6eaca58061245ada /kernel/mm/virtual_mm | |
| parent | a5b61bbfc0111f5de1817d58d882692bb8eed760 (diff) | |
mm: virtual_mm: Fix the PTE_FRAME() macro
Diffstat (limited to 'kernel/mm/virtual_mm')
| -rw-r--r-- | kernel/mm/virtual_mm/pages.cc | 1 | ||||
| -rw-r--r-- | kernel/mm/virtual_mm/virtual_mm.cc | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/kernel/mm/virtual_mm/pages.cc b/kernel/mm/virtual_mm/pages.cc index 1cf5ded..55b3e91 100644 --- a/kernel/mm/virtual_mm/pages.cc +++ b/kernel/mm/virtual_mm/pages.cc @@ -29,7 +29,6 @@ namespace VirtualMM void * alloc_pages(uint32_t n_pages) { - printk("virtual_mm", "Allocating 0x%x pages", n_pages); uint32_t starting_address = (uint32_t) find_free_addresses(n_pages); if (!starting_address) return NULL; diff --git a/kernel/mm/virtual_mm/virtual_mm.cc b/kernel/mm/virtual_mm/virtual_mm.cc index 30dabbc..12066f6 100644 --- a/kernel/mm/virtual_mm/virtual_mm.cc +++ b/kernel/mm/virtual_mm/virtual_mm.cc @@ -78,12 +78,13 @@ initialize(void) /* Identity map the first 4MiB, excluding the 4th MiB * (maps 4KiB 1024 times) */ for (uint32_t i = 0; i < 1024; i++) - l_fourMiB_page_table[i] = PTE_FRAME(i) | PTE_PRESENT(1) | PTE_WRITABLE(1); + l_fourMiB_page_table[i] + = PTE_FRAME(i << 12) | PTE_PRESENT(1) | PTE_WRITABLE(1); /* Identity map the next 4MiB */ for (uint32_t i = 0; i < 1024; i++) l_eightMiB_page_table[i] - = PTE_FRAME(i + 1024) | PTE_PRESENT(1) | PTE_WRITABLE(1); + = PTE_FRAME((i + 1024) << 12) | PTE_PRESENT(1) | PTE_WRITABLE(1); /* Set up the page directory entries */ uint32_t *fourMiB_pd_entry = &l_page_directory[0]; @@ -142,10 +143,9 @@ map_page(void *physical_address, void *virtual_address) uint32_t *table = get_or_make_table(pd_entry); uint32_t *pt_entry = &table[GET_PT_INDEX(virtual_address)]; - if (PTE_IS_PRESENT(pt_entry)) { - printk("debug", "Mapping previously mapped memory: 0x%x", pt_entry); + if (PTE_IS_PRESENT(pt_entry)) + /* Mapping previously mapped memory */ ASSERT_NOT_REACHED(); - } *pt_entry = PTE_FRAME((uint32_t) physical_address) | PTE_PRESENT(1) | PTE_WRITABLE(1); |