mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix more glitches with the pmm

Browse Source
This commit is contained in:
Matheus
2022-07-23 21:11:34 -03:00
parent 2d7dca8b8a
commit ecf639e30a
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/mm/pmm.c
+17 -8
View File
@@ -32,9 +32,8 @@ void* pmm_usabletop;
int lock = 0; int lock = 0;
static int getstate(void* addr){ static int getstate(void* addr){
if(addr > bitmaptop) return STATE_USED;
if(addr >= limine_hhdm_offset) addr -= limine_hhdm_offset; if(addr >= limine_hhdm_offset) addr -= limine_hhdm_offset;
if(addr > bitmaptop) return STATE_USED;
size_t page = (size_t)addr / PAGE_SIZE; size_t page = (size_t)addr / PAGE_SIZE;
@@ -50,9 +49,9 @@ static int getstate(void* addr){
} }
static void setstate(void* addr, size_t state){ static void setstate(void* addr, size_t state){
if(addr > bitmaptop) return;
if(addr >= limine_hhdm_offset) addr -= limine_hhdm_offset; if(addr >= limine_hhdm_offset) addr -= limine_hhdm_offset;
if(addr > bitmaptop) return;
size_t page = (size_t)addr / PAGE_SIZE; size_t page = (size_t)addr / PAGE_SIZE;
// find the exact size_t sized chunk that the entry resides in // find the exact size_t sized chunk that the entry resides in
@@ -99,6 +98,8 @@ void* pmm_alloc(size_t count){
void* addr = lastfree; void* addr = lastfree;
for(; addr < bitmaptop; addr += PAGE_SIZE){ for(; addr < bitmaptop; addr += PAGE_SIZE){
if(getstate(addr) == STATE_USED) if(getstate(addr) == STATE_USED)
@@ -114,15 +115,21 @@ void* pmm_alloc(size_t count){
if(getstate(base) == STATE_FREE) if(getstate(base) == STATE_FREE)
break; break;
// nope, skip the entire thing // nope, skip the entire thing
addr = base; addr = base;
} }
if(addr >= bitmaptop) addr = NULL; if(addr >= bitmaptop){
spinlock_release(&lock);
return NULL;
}
if(addr) for(size_t i = 0; i < count; ++i) setstate(addr + i * PAGE_SIZE, STATE_USED); for(size_t i = 0; i < count; ++i) setstate(addr + i * PAGE_SIZE, STATE_USED);
spinlock_release(&lock); spinlock_release(&lock);
@@ -205,7 +212,9 @@ void pmm_init(){
_panic("No available memory for bitmap", 0); _panic("No available memory for bitmap", 0);
printf("Bitmap at %p\n", bitmap); printf("Bitmap at %p\n", bitmap);
memset(bitmap, 0, bitmapsize);
// mark needed entries as used now // mark needed entries as used now
printf("Ranges: \n"); printf("Ranges: \n");
@@ -235,7 +244,7 @@ void pmm_init(){
bitmappages = (size_t)bitmaptop / PAGE_SIZE + 1; bitmappages = (size_t)bitmaptop / PAGE_SIZE + 1;
pmm_setused(bitmap, bitmappages); pmm_setused(bitmap, bitmapsize / 4096);
pmm_usabletop = bitmaptop; pmm_usabletop = bitmaptop;