PoliEcho/kern
1
0
Fork 0
forked from PoliEcho-holding-org/kern
Code Pull Requests Activity

Changed camelCase to snake_case

Browse Source
This commit is contained in:
Tom-on
2025-04-27 19:18:33 +02:00
parent 7b5efc1837
commit 1bc758f3c1
24 changed files with 272 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/src/vmm.c
+16 -18
View File
@@ -5,8 +5,6 @@
#include <vmm.h>
#include <string.h>
bitmap_t vmm_bitmap;
int vmm_init(void) {
@@ -14,18 +12,18 @@ int vmm_init(void) {
vmm_bitmap.membase = KERNEL_HEAP_BASE;
vmm_bitmap.blocks = dceil(KERNEL_HEAP_SIZE, BLOCK_SIZE);
vmm_bitmap.bytes = dceil(vmm_bitmap.blocks, 8);
uint32_t bitmaploc = 0xC6000000;
uint32_t bitmap_loc = 0xC6000000;
size_t pagecount = dceil(vmm_bitmap.bytes, PAGE_SIZE);
for (size_t i = 0; i < pagecount; i++) {
void* fr = pmm_allocPage();
size_t page_count = dceil(vmm_bitmap.bytes, PAGE_SIZE);
for (size_t i = 0; i < page_count; i++) {
void* fr = pmm_alloc();
if (fr == NULL) return 1;
pag_mapPage(bitmaploc + i * PAGE_SIZE, (uint32_t)fr, 0);
pag_map(bitmap_loc + i * PAGE_SIZE, (uint32_t)fr, 0);
}
// Set all pages as
vmm_bitmap.map = (void*)bitmaploc;
bmap_setall(&vmm_bitmap, 0);
vmm_bitmap.map = (void*)bitmap_loc;
bmap_set_all(&vmm_bitmap, 0);
bmap_set(&vmm_bitmap, 0, 1);
bmap_set(&vmm_bitmap, 8, 1);
@@ -36,7 +34,7 @@ int vmm_init(void) {
"\tBitmap is at 0x%08x in virtual memory\n"
"\tBitmap is %d bytes over %d pages\n",
vmm_bitmap.blocks, vmm_bitmap.map,
vmm_bitmap.bytes, pagecount
vmm_bitmap.bytes, page_count
);
vmm_bitmap.ready = 1;
@@ -44,16 +42,16 @@ int vmm_init(void) {
}
void* vmm_alloc(size_t pages) {
size_t idx = bmap_findarea(&vmm_bitmap, pages, 0);
size_t idx = bmap_get_area(&vmm_bitmap, pages, 0);
if (idx == BMAP_NOT_FOUND) return NULL;
void* ptr = bmap_ptr(&vmm_bitmap, idx);
bmap_setarea(&vmm_bitmap, idx * BLOCK_SIZE, pages * PAGE_SIZE, 1);
bmap_set_area(&vmm_bitmap, idx * BLOCK_SIZE, pages * PAGE_SIZE, 1);
for (size_t i = 0; i < pages; i++) {
void* fr = pmm_allocPage();
void* fr = pmm_alloc();
if (fr == NULL) return NULL;
pag_mapPage((uint32_t)ptr + i * PAGE_SIZE, (uint32_t)fr, 0);
pag_map((uint32_t)ptr + i * PAGE_SIZE, (uint32_t)fr, 0);
}
return ptr;
@@ -62,13 +60,13 @@ void* vmm_alloc(size_t pages) {
void vmm_free(void* ptr, size_t pages) {
for (size_t i = 0; i < pages; i++) {
uint32_t vaddr = (uint32_t)ptr + i * PAGE_SIZE;
uint32_t paddr = (uint32_t)pag_virtToPhys((uint32_t)ptr);
uint32_t paddr = (uint32_t)pag_virt_to_phys((uint32_t)ptr);
pmm_freePage((void*)paddr);
pag_umapPage(vaddr);
pmm_free((void*)paddr);
pag_umap(vaddr);
}
size_t base = ((size_t)ptr - KERNEL_BASE) / BLOCK_SIZE;
bmap_setarea(&vmm_bitmap, base, pages, 0);
bmap_set_area(&vmm_bitmap, base, pages, 0);
}