nub31/nub-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mem cleanup

Browse Source
This commit is contained in:
nub31
2025-09-06 17:42:05 +02:00
parent 0ccb483047
commit 02f0ba9aad
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/arch/x86_64/mem/vmm.c
View File

@@ -26,7 +26,7 @@ static u64 create_pte(u64 physical_address)
return (physical_address & PTE_MASK) | PTE_PRESENT | PTE_WRITABLE | PTE_PS;
}
void vmm_map(u64 virtual_address, u64 physical_address)
void vmm_map(u64 physical_address, u64 virtual_address)
{
u64 pml4_idx = PML4_INDEX(virtual_address);
u64 pdpt_idx = PDPT_INDEX(virtual_address);
@@ -40,8 +40,8 @@ void vmm_map(u64 virtual_address, u64 physical_address)
panic("Failed to map virtual to physical page");
}
u64* pdpt_phys = (u64*)(pdpt & PTE_MASK);
u64 pd = pdpt_phys[pdpt_idx];
u64* pdpt_physical_address = (u64*)(pdpt & PTE_MASK);
u64 pd = pdpt_physical_address[pdpt_idx];
if (!(pd & PTE_PRESENT))
{
// todo(nub31): Dynamically create a pd table
@@ -49,8 +49,8 @@ void vmm_map(u64 virtual_address, u64 physical_address)
panic("Failed to map virtual to physical page");
}
u64* pd_phys = (u64*)(pd & PTE_MASK);
u64 entry = pd_phys[pd_idx];
u64* pd_physical_address = (u64*)(pd & PTE_MASK);
u64 entry = pd_physical_address[pd_idx];
if (entry & PTE_PRESENT)
{
@@ -58,7 +58,7 @@ void vmm_map(u64 virtual_address, u64 physical_address)
panic("Failed to map virtual to physical page");
}
pd_phys[pd_idx] = create_pte(physical_address);
pd_physical_address[pd_idx] = create_pte(physical_address);
}
u64 vmm_unmap(u64 virtual_address)
@@ -74,42 +74,43 @@ u64 vmm_unmap(u64 virtual_address)
panic("Failed to unmap virtual address");
}
u64* pdpt_phys = (u64*)(pdpt_entry & PTE_MASK);
u64 pd_entry = pdpt_phys[pdpt_idx];
u64* pdpt_physical_address = (u64*)(pdpt_entry & PTE_MASK);
u64 pd_entry = pdpt_physical_address[pdpt_idx];
if (!(pd_entry & PTE_PRESENT))
{
printf("PD not present at PDPT index %llu\n", pdpt_idx);
panic("Failed to unmap virtual address");
}
u64* pd_phys = (u64*)(pd_entry & PTE_MASK);
if (!(pd_phys[pd_idx] & PTE_PRESENT))
u64* pd_physical_address = (u64*)(pd_entry & PTE_MASK);
if (!(pd_physical_address[pd_idx] & PTE_PRESENT))
{
printf("Virtual address 0x%llx is not mapped\n", virtual_address);
panic("Failed to unmap virtual address");
}
u64 phys = pd_phys[pd_idx] & PTE_MASK;
pd_phys[pd_idx] = 0;
u64 physical_address = pd_physical_address[pd_idx] & PTE_MASK;
pd_physical_address[pd_idx] = 0;
__asm__ volatile("invlpg (%0)" : : "r"(virtual_address) : "memory");
return phys;
return physical_address;
}
void* vmm_alloc(u64 virtual_address)
{
u64 phys = pmm_alloc();
if (!phys)
u64 physical_address = pmm_alloc();
if (!physical_address)
{
panic("Out of physical memory");
}
vmm_map(virtual_address, phys);
vmm_map(physical_address, virtual_address);
return (void*)virtual_address;
}
void vmm_free(u64 virtual_address)
{
u64 phys = vmm_unmap(virtual_address);
pmm_free(phys);
u64 physical_address = vmm_unmap(virtual_address);
pmm_free(physical_address);
}