darkkirb/old-DasOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adds initialization of PMM with multiboot structure. Adds allocation test.

Browse source
This commit is contained in:
Felix Queißner 2016-05-04 17:42:09 +02:00
parent 732301b0c1
commit 0b7b656b01
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
prototypes/base/init.cpp
View file

@ -8,6 +8,7 @@
#include "compat.h" #include "compat.h"
using namespace multiboot; using namespace multiboot;
using namespace console_tools;
extern "C" void init(Structure const & data) extern "C" void init(Structure const & data)
{ {
@ -28,21 +29,31 @@ extern "C" void init(Structure const & data)
} }
Console::main Console::main
<< "mmap: " << "mmap: "
<< (uint32_t)mmap.base << "+" << (uint32_t)mmap.length << "start: " << hex(mmap.base) << ", length: " << hex(mmap.length)
<< ", " << mmap.entry_size << ", " << mmap.entry_size
<< ", " << sizeof(mmap) << ", " << sizeof(mmap)
<< ", free:" << mmap.isFree() << ", free:" << mmap.isFree()
<< "\n"; << "\n";
if(mmap.base > 0xFFFFFFFF) {
Console::main << "mmap out of 4 gigabyte range." << "\n";
continue;
}
if(mmap.isFree()) {
// Mark all free memory free...
uintptr_t lower = (mmap.base + 0x0FFF) & 0xFFFFF000; // align at upper 4096
uintptr_t upper = (mmap.base + mmap.length) & 0xFFFFF000; // align at lower 4096
while (lower < upper) {
PMM::markFree(physical_t(lower));
lower += 0x1000;
}
}
} }
/*
PMM::markOccupied(physical_t(0x1500));
for(int i = 0; i < 10; i++) { for(int i = 0; i < 10; i++) {
bool success; bool success;
physical_t page(PMM::alloc(success)); physical_t page = PMM::alloc(success);
Console::main << "allocated page " << i << " [" << success << "]: 0x" << page.data() << "\n"; Console::main << "allocated page " << i << " [" << success << "]: " << page << "\n";
} }
*/
} }
static_assert(sizeof(void*) == 4, "Target platform is not 32 bit."); static_assert(sizeof(void*) == 4, "Target platform is not 32 bit.");