diff options
| author | Miguel <m.i@gmx.at> | 2018-09-10 00:54:35 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-10 00:54:35 +0200 |
| commit | 88c5873713a4eda47d299abd9cecaa49221ec9fe (patch) | |
| tree | 0eeb21f69824ddbef5e3076704fc099d65848244 /kernel/vmem.c | |
| parent | 074490c63dd09fc941b1162f62af1985ee9576d3 (diff) | |
physical memory manager review et al.
Diffstat (limited to 'kernel/vmem.c')
| -rw-r--r-- | kernel/vmem.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/vmem.c b/kernel/vmem.c index 3b5be30..ffe9a8e 100644 --- a/kernel/vmem.c +++ b/kernel/vmem.c @@ -138,7 +138,7 @@ void pd_entry_enable_global (pd_entry e) uint8_t vmmngr_alloc_page (pt_entry* e) { // allocate a free physical frame - void* p = pmmngr_alloc_block (); + void* p = mem_alloc_block (); if (!p) return 0; // map it to the page @@ -151,7 +151,7 @@ uint8_t vmmngr_alloc_page (pt_entry* e) void vmmngr_free_page (pt_entry* e) { void* p = (void*)pt_entry_pfn (*e); - if (p) pmmngr_free_block (p); + if (p) mem_free_block (p); pt_entry_del_attrib (e, I86_PTE_PRESENT); } @@ -186,10 +186,10 @@ void vmem_free_dir(pdirectory *dir) for (int i=0, virt=virt_addr; i<1024; i++, virt+=4096) { pt_entry pte=&table->m_entries [PAGE_TABLE_INDEX (virt) ]; - pmmngr_free_block(pt_entry_get_frame(pte)); // get free space from the memory manager + mem_free_block(pt_entry_get_frame(pte)); // get free space from the memory manager } - pmmngr_free_block(pd_entry_get_frame (entry)); + mem_free_block(pd_entry_get_frame (entry)); virt_addr+=1024*4096; } @@ -205,14 +205,14 @@ void vmem_free_dir(pdirectory *dir) for (int i=0, virt=virt_addr; i<1024; i++, virt+=4096) { pt_entry pte=&table->m_entries [PAGE_TABLE_INDEX (virt) ]; - pmmngr_free_block(pt_entry_get_frame(pte)); // get free space from the memory manager + mem_free_block(pt_entry_get_frame(pte)); // get free space from the memory manager } - pmmngr_free_block(pd_entry_get_frame (entry)); + mem_free_block(pd_entry_get_frame (entry)); virt_addr+=1024*4096; } - pmmngr_free_block(dir); + mem_free_block(dir); x86_paging_enable(); } @@ -484,7 +484,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only) for (int i=0, virt=virt_addr; i<1024; i++, virt+=4096) { //klog("i = %d",i); - phys_addr=pmmngr_alloc_block(); // get free space from the memory manager + phys_addr=mem_alloc_block(); // get free space from the memory manager if (!phys_addr)kpanic("unable to alloc spce for frame"); // if this is not init , copy contents from current space! @@ -540,7 +540,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only) for (int i=0, virt=virt_addr; i<1024; i++, virt+=4096) { - phys_addr=pmmngr_alloc_block(); // get free space from the memory manager + phys_addr=mem_alloc_block(); // get free space from the memory manager if (!phys_addr)kpanic("unable to alloc spce for frame"); // if this is not init , copy contents from current space! |