raphm/soaplin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

ugh

Browse source
This commit is contained in:
RaphProductions 2025-05-09 17:20:58 +02:00
parent f27e0a240c
commit 287a7fb312
3 changed files with 162 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/src/exec/elf.c
View file

@ -60,10 +60,10 @@ program_t *elf_load(char *data) {
uint64_t offset = phdr[i].p_offset;
uint64_t flags = VMM_PRESENT;
if (phdr[i].p_flags & PF_W)
//if (phdr[i].p_flags & PF_W)
flags |= VMM_WRITABLE;
if (!(phdr[i].p_flags & PF_X))
flags |= VMM_NX;
//if (!(phdr[i].p_flags & PF_X))
// flags |= VMM_NX;
flags |= VMM_USER;

54
kernel/src/mm/vmm.c
View file

@ -1,21 +1,21 @@
#include "mm/vmm.h"
#include "limine.h"
#include "mm/pmm.h"
#include "mm/memop.h"
#include "mm/pmm.h"
#include "sys/log.h"
#include "vmm.h"
#include <stddef.h>
__attribute__((used, section(".limine_requests")))
static volatile struct limine_paging_mode_request pmrq = {
.id = LIMINE_PAGING_MODE_REQUEST,
__attribute__((
used,
section(
".limine_requests"))) static volatile struct limine_paging_mode_request
pmrq = {.id = LIMINE_PAGING_MODE_REQUEST,
.revision = 3,
.mode = LIMINE_PAGING_MODE_X86_64_4LVL
};
.mode = LIMINE_PAGING_MODE_X86_64_4LVL};
__attribute__((used, section(".limine_requests")))
static volatile struct limine_executable_address_request karq = {
__attribute__((used, section(".limine_requests"))) static volatile struct
limine_executable_address_request karq = {
.id = LIMINE_EXECUTABLE_ADDRESS_REQUEST,
.revision = 0,
};
@ -28,7 +28,6 @@ pagemap_t *vmm_alloc_pm() {
pagemap_t *pm = (pagemap_t *)HIGHER_HALF((uint64_t)pmm_request_page());
memset(pm, 0, PMM_PAGE_SIZE);
/*if (vmm_kernel_pm_exists) {
pm->toplevel = (uint64_t*)HIGHER_HALF((uint64_t)pmm_request_page());
memset(pm->toplevel, 0, PMM_PAGE_SIZE);
@ -104,10 +103,10 @@ void vmm_init() {
uint64_t data_start = ALIGN_DOWN((uint64_t)data_start_ld, PMM_PAGE_SIZE);
uint64_t data_end = ALIGN_UP((uint64_t)data_end_ld, PMM_PAGE_SIZE);
log("vmm - mapping .requests section...\n");
for (uint64_t req = reqs_start; req < reqs_end; req += PMM_PAGE_SIZE) {
vmm_map(vmm_kernel_pm, req, req - kvirtaddr + kphysaddr, VMM_PRESENT | VMM_WRITABLE);
vmm_map(vmm_kernel_pm, req, req - kvirtaddr + kphysaddr,
VMM_PRESENT | VMM_WRITABLE);
}
log("vmm - mapping .text section...\n");
@ -116,7 +115,8 @@ void vmm_init() {
}
log("vmm - mapping .rodata section...\n");
for (uint64_t roData = rodata_start; roData < rodata_end; roData += PMM_PAGE_SIZE)
for (uint64_t roData = rodata_start; roData < rodata_end;
roData += PMM_PAGE_SIZE)
vmm_map(vmm_kernel_pm, roData, roData - kvirtaddr + kphysaddr,
VMM_PRESENT | VMM_NX);
@ -128,7 +128,8 @@ void vmm_init() {
log("vmm - mapping address from 0x0 to 0x100000000...\n");
for (uint64_t gb4 = 0; gb4 < 0x100000000; gb4 += PMM_PAGE_SIZE) {
vmm_map(vmm_kernel_pm, gb4, gb4, VMM_PRESENT | VMM_WRITABLE);
vmm_map(vmm_kernel_pm, (uint64_t)HIGHER_HALF(gb4), gb4, VMM_PRESENT | VMM_WRITABLE);
vmm_map(vmm_kernel_pm, (uint64_t)HIGHER_HALF(gb4), gb4,
VMM_PRESENT | VMM_WRITABLE);
}
vmm_load_pagemap(vmm_kernel_pm);
@ -148,13 +149,15 @@ void vmm_load_pagemap(pagemap_t *pm) {
__asm__ volatile("mov %0, %%cr3" : : "r"(PHYSICAL(pm->toplevel)) : "memory");
}
static uint64_t *__vmm_get_next_lvl(uint64_t *level, uint64_t entry, uint64_t flags) {
(void)flags;
static uint64_t *__vmm_get_next_lvl(uint64_t *level, uint64_t entry,
uint64_t flags) {
if (!(level[entry] & 1)) {
uint64_t *pml = HIGHER_HALF(pmm_request_page());
memset(pml, 0, PMM_PAGE_SIZE);
level[entry] = ((uint64_t)PHYSICAL(pml) & 0x000FFFFFFFFFF000ULL) | 0b111;
level[entry] = (uint64_t)PHYSICAL(pml);
}
level[entry] |= (flags & 0xFFF); // N'ajoute que les flags pertinents
return HIGHER_HALF(PTE_GET_ADDR(level[entry]));
}
@ -171,8 +174,7 @@ uint64_t vmm_get_flags(pagemap_t* pm, uint64_t vaddr) {
return pml1[pml1_entry] & 0x7000000000000FFF;
}
uint64_t virt_to_phys(pagemap_t *pagemap, uint64_t virt)
{
uint64_t virt_to_phys(pagemap_t *pagemap, uint64_t virt) {
uint64_t pml4_idx = (virt >> 39) & 0x1FF;
uint64_t pml3_idx = (virt >> 30) & 0x1FF;
uint64_t pml2_idx = (virt >> 21) & 0x1FF;
@ -182,7 +184,10 @@ uint64_t virt_to_phys(pagemap_t *pagemap, uint64_t virt)
uint64_t *pml2 = __vmm_get_next_lvl(pml3, pml3_idx, 0);
uint64_t *pml1 = __vmm_get_next_lvl(pml2, pml2_idx, 0);
uint64_t phys_addr = pml1[pml1_idx] & 0x000FFFFFFFFFF000; // Masque pour obtenir l'adresse physique (en retirant les bits de flags)
uint64_t phys_addr =
pml1[pml1_idx] &
0x000FFFFFFFFFF000; // Masque pour obtenir l'adresse physique (en retirant
// les bits de flags)
return phys_addr;
}
@ -206,11 +211,14 @@ void vmm_unmap(pagemap_t *pm, uint64_t vaddr) {
uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
uint64_t *pml3 = __vmm_get_next_lvl(pm->toplevel, pml4_entry, 0);
if (pml3 == NULL) return;
if (pml3 == NULL)
return;
uint64_t *pml2 = __vmm_get_next_lvl(pml3, pml3_entry, 0);
if (pml2 == NULL) return;
if (pml2 == NULL)
return;
uint64_t *pml1 = __vmm_get_next_lvl(pml2, pml2_entry, 0);
if (pml1 == NULL) return;
if (pml1 == NULL)
return;
pml1[pml1_entry] = 0;

4
kernel/src/sched/sched.c
View file

@ -150,5 +150,9 @@ void schedule(registers_t *regs)
memcpy(regs, &curr_proc->regs, sizeof(registers_t));
// Finally, load our pagemap
//if (memcmp(curr_proc->name, "Init", 4)== 0) {
vmm_load_pagemap(curr_proc->pm);
//asm("cli");
//while (1)
// asm("hlt");}
}