os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Bug with heap ?

This commit is contained in:
Adrien Bourmault 2020-01-10 13:36:33 +01:00
parent 0fa7d46511
commit 36ce243b8c
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kaleid/kernel/init/init.c
View File

@ -63,13 +63,15 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg)
// Memory
MmInitMemoryMap();
MmInitGdt();
MmInitHeap();
MmInitPaging();
// IDT
// Interrupts
KeSetupIDT();
KeEnableIRQs();
// Memory (2)
MmInitHeap();
MmInitPaging();
// Interrupt handlers
MmActivatePageHandler();
KeEnableRTC();

1
kaleid/kernel/ke/idt.c
View File

@ -26,7 +26,6 @@
#include <init/boot.h>
#include <ke/idt.h>
#include <io/vga.h>
#include <mm/mm.h>
#include <io/spkr.h>
IdtEntry_t idt[256] = { 0 };

37
kaleid/kernel/mm/paging.c
View File

@ -11,7 +11,8 @@
//-----------
volatile pml4_t MmPageMapLevel4[512] __attribute__((__aligned__(KPAGESIZE)));
static pml4_t MmPageMapLevel4[512] __attribute__((__aligned__(KPAGESIZE)));
static ulong *MmPhysicalPageTable;
extern ulong _text;
extern ulong _text_end;
@ -51,6 +52,7 @@ void MmInitPaging(void)
ulong lastKernelAddr = (ulong)(_heap_start + _heap_max);
ulong firstDirectoryAddr = 0;
ulong lastDirectoryAddr = 0;
ulong phDirSize = 0;
// Maximum PHYSICAL address in memory
ulong phRamSize = memoryMap.freeRamSize + memoryMap.nonfreeRamSize;
@ -64,6 +66,10 @@ void MmInitPaging(void)
//DebugLog("\tPaging gap : %u MB (%p)\n\tLast virtual address %p\n", diffKernUsr / MB, diffKernUsr, MmVirtLastAddress);
memzero((void *)&MmPageMapLevel4[0], sizeof(MmPageMapLevel4));
phDirSize = (phRamSize / KPAGESIZE)*sizeof(ulong);
//MmPhysicalPageTable = (ulong*)malloc((phRamSize / KPAGESIZE)*sizeof(ulong));
DebugLog("\t\tRam %u MB, pagesize %u KB, size %u MB\n", phRamSize / MB, KPAGESIZE / KB, phDirSize / MB);
for (ulong curAddrPML4 = 0;
curAddrPML4 < MmVirtLastAddress;
@ -157,6 +163,7 @@ void MmInitPaging(void)
// While we're inside the userspace pages
else if ((ulong)curAddrPT >= USERSPACE) {
MmPT[index] = ((ulong)curAddrPT - diffKernUsr) | PRESENT; // Not present for instance
//MmPhysicalPageTable[(ulong)curAddrPT - diffKernUsr] = curAddrPT;
if ((ulong)curAddrPT == USERSPACE) {
DebugLog("\tUserspace at %p:%p\n", curAddrPT, curAddrPT - diffKernUsr);
@ -174,9 +181,9 @@ void MmInitPaging(void)
lastDirectoryAddr = (ulong)MmPT;
MmLoadPML4((void *)MmPageMapLevel4);
MmEnableWriteProtect();
DebugLog("\tPage table size : %u MB\n", (lastDirectoryAddr - firstDirectoryAddr)/MB);
DebugLog("\tPage table size : %u MB\n", (lastDirectoryAddr - firstDirectoryAddr + phDirSize)/MB);
}
//
@ -221,7 +228,7 @@ void *MmTransVirtToPhyAddr(void* virtualAddr)
void *MmTransPhyToVirtAddr(void* physicalAddr)
{
return (void*)0;
return (void*)MmPhysicalPageTable[(ulong)physicalAddr];
}
//
@ -272,6 +279,28 @@ void MmUnmapPage(void* virtualAddr)
KeFlushTlbSingle(*page);
}
//
// Kernel Page allocator
//
void *MmKAllocPageBlock(void *start) {
pte_t *startPage = MmGetPageDescriptorFromVirtual(start);
//for (ulong curPage = 0; curPage < )
return NULL;
}
//
// User page allocator
//
void *MmUAllocPageBlock(void *start) {
pte_t *startPage = MmGetPageDescriptorFromVirtual(start);
//for (ulong curPage = 0; curPage < )
return NULL;
}
//-----------
//