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

Working on page allocator #67

This commit is contained in:
Adrien Bourmault 2020-01-12 17:21:12 +01:00
parent 3676254417
commit d056bc2fb6
6 changed files with 96 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ProjectTree
View File

@ -70,9 +70,11 @@
│   │   ├── buf.h │   │   ├── buf.h
│   │   └── list.h │   │   └── list.h
│   ├── mm │   ├── mm
│   │   ├── gdt.h
│   │   ├── heap.h │   │   ├── heap.h
│   │   ├── malloc.h │   │   ├── malloc.h
│   │   └── mm.h │   │   ├── map.h
│   │   └── paging.h
│   ├── po │   ├── po
│   │   └── shtdwn.h │   │   └── shtdwn.h
│   ├── sh │   ├── sh
@ -155,4 +157,4 @@
├── ProjectTree ├── ProjectTree
└── README.md └── README.md
28 directories, 102 files 28 directories, 104 files

1
include/mm/paging.h
View File

@ -33,6 +33,7 @@
#define KPAGESIZE (4 * KB) #define KPAGESIZE (4 * KB)
#define UPAGESIZE (4 * KB) #define UPAGESIZE (4 * KB)
#define USERSPACE 0x80000000
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//

38
include/mm/palloc.h Normal file
View File

@ -0,0 +1,38 @@
//----------------------------------------------------------------------------//
// GNU GPL OS/K //
// //
// Desc: Page allocator related functions //
// //
// //
// Copyright © 2018-2019 The OS/K Team //
// //
// This file is part of OS/K. //
// //
// OS/K is free software: you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation, either version 3 of the License, or //
// any later version. //
// //
// OS/K is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY//without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with OS/K. If not, see <https://www.gnu.org/licenses/>. //
//----------------------------------------------------------------------------//
#ifndef _KERNEL_H
#include <kernel.h>
#endif
#ifndef _MM_PALLOC_H
#define _MM_PALLOC_H
//----------------------------------------------------------------------------//
//----------------------------------------------------------------------------//
#endif

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

@ -20,20 +20,18 @@
// // // //
// You should have received a copy of the GNU General Public License // // You should have received a copy of the GNU General Public License //
// along with OS/K. If not, see <https://www.gnu.org/licenses/>. // // along with OS/K. If not, see <https://www.gnu.org/licenses/>. //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------//
#include <kernel.h> #include <kernel.h>
#include <init/boot.h> #include <init/boot.h>
#include <ke/idt.h>
#include <ex/malloc.h> #include <ex/malloc.h>
#include <mm/heap.h> #include <mm/heap.h>
#include <mm/paging.h> #include <mm/paging.h>
#include <mm/map.h> #include <mm/map.h>
#include <ke/idt.h>
#include <lib/buf.h> #include <lib/buf.h>
#include <io/vga.h> #include <io/vga.h>
#define USERSPACE 0x80000000
//----------- //-----------
pml4_t MmPageMapLevel4[512] __attribute__((__aligned__(KPAGESIZE))); pml4_t MmPageMapLevel4[512] __attribute__((__aligned__(KPAGESIZE)));
@ -194,16 +192,16 @@ void MmInitPaging(void)
//DebugLog("\tLast page of kernel at %p\n", curAddrPT); //DebugLog("\tLast page of kernel at %p\n", curAddrPT);
} }
} }
// While we're inside the userspace pages /* // While we're inside the userspace pages */
else if ((ulong)curAddrPT >= USERSPACE) { /* else if ((ulong)curAddrPT >= USERSPACE) { */
MmPT[index] = ((ulong)curAddrPT - diffKernUsr) | PRESENT; // Not present for instance /* MmPT[index] = ((ulong)curAddrPT - diffKernUsr) | PRESENT; // Not present for instance */
xedni = (((ulong)curAddrPT - diffKernUsr) / ((ulong)KPAGESIZE)); /* xedni = (((ulong)curAddrPT - diffKernUsr) / ((ulong)KPAGESIZE)); */
//MmPhysicalPageTable[xedni] = (ulong)curAddrPT; /* //MmPhysicalPageTable[xedni] = (ulong)curAddrPT; */
if ((ulong)curAddrPT == USERSPACE) { /* if ((ulong)curAddrPT == USERSPACE) { */
DebugLog("\tUserspace at %p:%p\n", curAddrPT, curAddrPT - diffKernUsr); /* DebugLog("\tUserspace at %p:%p\n", curAddrPT, curAddrPT - diffKernUsr); */
} /* } */
} /* } */
else { else {
MmPT[index] = 0; MmPT[index] = 0;
} }

38
kaleid/kernel/mm/palloc.c Normal file
View File

@ -0,0 +1,38 @@
//----------------------------------------------------------------------------//
// GNU GPL OS/K //
// //
// Desc: Page allocator related functions //
// //
// //
// Copyright © 2018-2019 The OS/K Team //
// //
// This file is part of OS/K. //
// //
// OS/K is free software: you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation, either version 3 of the License, or //
// any later version. //
// //
// OS/K is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY//without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with OS/K. If not, see <https://www.gnu.org/licenses/>. //
//----------------------------------------------------------------------------//
#include <kernel.h>
#include <init/boot.h>
#include <ex/malloc.h>
#include <mm/paging.h>
#include <mm/palloc.h>
#include <io/vga.h>
//---------
//---------

8
kaleid/kernel/sh/testcmds.c
View File

@ -263,13 +263,13 @@ error_t CmdPageBlock(int argc, char **argv, char *cmdline)
error_t CmdPF(int argc, char **argv, char *cmdline) error_t CmdPF(int argc, char **argv, char *cmdline)
{ {
ulong *address = (ulong*)(ulong)strtoul(argv[1], NULL, 16); register ulong *address = (ulong*)(ulong)strtoul(argv[1], NULL, 16);
KernLog("Provoking Page Fault at %#x\n", address); KernLog("Test provoking a fault at %p\n", address);
KernLog("It contained %#x\n", *address); KernLog("It contained %p\n", *address);
*address = 1; *address = 1;
KernLog("Now it contains %#x\n", *address); KernLog("Now it contains %p\n", *address);
KernLog("No page fault : address was valid/present\n"); KernLog("No page fault : address was valid/present\n");