summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/boot/limine/memorymap.c1
-rw-r--r--arch/x86_64/device/processor.c10
-rw-r--r--arch/x86_64/elf.c2
-rw-r--r--arch/x86_64/init.c129
-rw-r--r--arch/x86_64/lib/object.c1
-rw-r--r--arch/x86_64/memory/pml4.c2
-rw-r--r--arch/x86_64/tasking/tcb.c35
-rw-r--r--arch/x86_64/usermode.c7
8 files changed, 176 insertions, 11 deletions
diff --git a/arch/x86_64/boot/limine/memorymap.c b/arch/x86_64/boot/limine/memorymap.c
index 43aecf7..a09acab 100644
--- a/arch/x86_64/boot/limine/memorymap.c
+++ b/arch/x86_64/boot/limine/memorymap.c
@@ -3,6 +3,7 @@
#include "object.h"
#include "print.h"
#include "jove.h"
+#include "init.h"
#include "arch/x86_64/page.h"
static struct jove_ObjectDirectory s_untyped_dir = {
diff --git a/arch/x86_64/device/processor.c b/arch/x86_64/device/processor.c
index f7e5cac..ff920c8 100644
--- a/arch/x86_64/device/processor.c
+++ b/arch/x86_64/device/processor.c
@@ -1,8 +1,6 @@
#include "device/processor.h"
-#include "arch/x86_64/tables.h"
#include "include/arch/x86_64/idt.h"
-#include "include/arch/x86_64/object.h"
-#include "jove.h"
+#include "init.h"
processor_t s_bsp = {
.odir = &_initDirectory
@@ -133,3 +131,9 @@ processor_current(void)
rdmsr(MSR_GS_BASE, (uint32_t*)&r, ((uint32_t*)&r) + 1);
return (void*)r;
}
+
+objdir_t*
+processor_get_objdir(void *processor)
+{
+ return ((processor_t*)processor)->odir;
+}
diff --git a/arch/x86_64/elf.c b/arch/x86_64/elf.c
index 696b7a7..ae0fa71 100644
--- a/arch/x86_64/elf.c
+++ b/arch/x86_64/elf.c
@@ -1,4 +1,5 @@
#include "elf.h"
+#include "init.h"
#include <stddef.h>
int
@@ -23,5 +24,6 @@ elf64_loadexec(Elf64_Ehdr *ehdr)
if(!elf64_ehdr_valid(ehdr)) return NULL;
void *entry = (void*)ehdr->e_entry;
+
return entry;
}
diff --git a/arch/x86_64/init.c b/arch/x86_64/init.c
index 4ec7718..7a2f67d 100644
--- a/arch/x86_64/init.c
+++ b/arch/x86_64/init.c
@@ -1,6 +1,12 @@
#include "init.h"
+#include "bootargs.h"
+#include "device/initrd.h"
#include "arch/x86_64/page.h"
+#include "arch/x86_64/processor.h"
#include "device/processor.h"
+#include "print.h"
+#include "elf.h"
+#include "string.h"
uintptr_t
init_alloc_pageframe()
@@ -11,7 +17,7 @@ init_alloc_pageframe()
/*Seek to the last member of untyped directory.*/
uint8_t lastmembi = 1;
for(; untyped_dir->entries[lastmembi].type == KO_MEMORY_UNTYPED; lastmembi++);
- objdir_entry_t *lastmemb = &untyped_dir->entries[lastmembi];
+ objdir_entry_t *lastmemb = &untyped_dir->entries[lastmembi-1];
objdir_entry_t pageframe;
ko_untyped_split(lastmemb, &pageframe, 0x1000);
@@ -19,7 +25,7 @@ init_alloc_pageframe()
}
void
-init_map_pageframe(uintptr_t pptr, uintptr_t vptr, uint8_t pflags)
+init_map_pageframe(uintptr_t pptr, uintptr_t vptr, uint64_t pflags)
{
uint64_t pathval;
uint16_t *path = (uint16_t*)&pathval;
@@ -51,13 +57,128 @@ init_ensure_page(uintptr_t vptr, uint8_t pflags)
processor_t *proc = processor_current();
pmle_t *pml4 = pptr_tovirt_ident(proc->pdir);
- pmle_t *pmld = pml4, *pmle;
+ pmle_t *pmld = pml4, *pmle = NULL;
for(uint8_t d = 0; d < 4; d++) {
uint16_t pmli = path[d];
pmle = &pmld[pmli];
if(!pmle->p) {
- pmle->value = init_alloc_pageframe() | (d == 3 ? pflags : PAGE_PRESENT | PAGE_RW | PAGE_US);
+ physptr_t frame = init_alloc_pageframe();
+ pmle->value = frame | (d == 3 ? pflags : (PAGE_PRESENT | PAGE_RW | PAGE_US));
+ if(d != 3) memset(pptr_tovirt_ident(frame), 0, 0x1000);
+ pmle->p = 1;
}
pmld = pptr_tovirt_ident(pmle->paddr << 12);
}
+ __asm__ volatile("invlpg (%0)":: "r"(vptr): "memory");
+}
+
+void
+init_reperm_page(uintptr_t vptr, uint64_t pflags)
+{
+ uint64_t pathval;
+ uint16_t *path = (uint16_t*)&pathval;
+ pml4_get_path(vptr, 4, path);
+
+ processor_t *proc = processor_current();
+ pmle_t *pml4 = pptr_tovirt_ident(proc->pdir);
+
+ pmle_t *pmld = pml4, *pmle = NULL;
+ for(uint8_t d = 0; d < 4; d++) {
+ uint16_t pmli = path[d];
+ pmle = &pmld[pmli];
+ if(!pmle->p) {
+ return;
+ }
+ pmld = pptr_tovirt_ident(pmle->paddr << 12);
+ }
+ pmle->rw = pflags & PAGE_RW ? 1 : 0;
+ pmle->xd = pflags & PAGE_XD ? 1 : 0;
+ __asm__ volatile("invlpg (%0)":: "r"(vptr): "memory");
+}
+
+void
+init_ensure_range(uintptr_t base, size_t width, uint64_t pflags)
+{
+ if(width & 0xFFF) width = (width | 0xFFF) + 1;
+ width >>= 12;
+ for(size_t i = 0; i < width; i++) {
+ init_ensure_page(base + (i << 12), pflags);
+ }
+}
+
+void
+init_reperm_range(uintptr_t base, size_t width, uint64_t pflags)
+{
+ if(width & 0xFFF) width = (width | 0xFFF) + 1;
+ width >>= 12;
+ for(size_t i = 0; i < width; i++) {
+ init_reperm_page(base + (i << 12), pflags);
+ }
+}
+
+void
+init_load(void)
+{
+ char *init_arg = bootargs_getarg("init");
+ if(init_arg == NULL) {
+ klogf("init not specified in bootargs!\n");
+ return;
+ }
+ tar_header_t *init_file = initrd_find_file(init_arg);
+ if(init_file == NULL) {
+ klogf("init not found in initrd! (filename %s)\n", init_arg);
+ return;
+ }
+ uint8_t *init_data = (uint8_t*)&((tar_block_t*)init_file)[1];
+ Elf64_Ehdr *init_ehdr = (Elf64_Ehdr*)init_data;
+ if(!elf64_ehdr_valid(init_ehdr)) {
+ klogf("init is not a proper ELF executable!\n");
+ return;
+ }
+
+ uintptr_t program_end = 0;
+ for(size_t phdri = 0; phdri < init_ehdr->e_phnum; phdri++) {
+ Elf64_Phdr *phdr = &((Elf64_Phdr*)(init_data + init_ehdr->e_phoff))[phdri];
+ if(phdr->p_type == PT_LOAD) {
+ uintptr_t section_base = phdr->p_vaddr;
+ size_t section_size = phdr->p_memsz;
+ size_t section_cpysize = phdr->p_filesz;
+
+ if(section_base + section_size > program_end) {
+ program_end = section_base + section_size;
+ if(program_end & 0xFFF) program_end = ((program_end >> 12) + 1) << 12;
+ }
+ klogf("ELF LOAD %p %p %p %x\n", section_base, section_size, section_cpysize, phdr->p_flags);
+
+ init_ensure_range(section_base, section_size, PAGE_PRESENT | PAGE_US | PAGE_RW);
+
+ memcpy((void*)section_base, init_data + phdr->p_offset, section_cpysize);
+ memset((void*)(section_base + section_cpysize), 0, (section_size - section_cpysize));
+
+ init_reperm_range(section_base, section_size, (phdr->p_flags & PF_W ? PAGE_RW : 0) |
+ (!(phdr->p_flags & PF_X) ? PAGE_XD : 0));
+ }
+ }
+
+ //Allocate usermode stack.
+ uintptr_t usermode_stack_base = 0x00007FFFFFFFE000;
+ init_ensure_range(usermode_stack_base, 0x2000, PAGE_PRESENT | PAGE_RW | PAGE_US | PAGE_XD);
+
+ uintptr_t *usermode_sp = (uintptr_t*)(usermode_stack_base + 0x1FF8);
+
+ //Allocate syscall message.
+ uintptr_t message_frame = init_alloc_pageframe();
+ init_map_pageframe(message_frame, program_end, PAGE_PRESENT | PAGE_RW | PAGE_US | PAGE_XD);
+
+ _initDirectory.entries[INIT_OBJECT_MESSAGE] = (objdir_entry_t) {
+ .type = KO_MESSAGE,
+ .extra = KODE_EX_MESSAGE_MAPPED,
+ .data = program_end
+ };
+ *(--usermode_sp) = program_end;
+
+ extern tcb_t *_init_tcb;
+ _init_tcb->sp = (uintptr_t)usermode_sp;
+
+ usermode((void*)init_ehdr->e_entry, usermode_sp);
}
diff --git a/arch/x86_64/lib/object.c b/arch/x86_64/lib/object.c
index 4ab8f06..43d490f 100644
--- a/arch/x86_64/lib/object.c
+++ b/arch/x86_64/lib/object.c
@@ -1,6 +1,7 @@
#include "object.h"
#include "error.h"
#include "device/processor.h"
+#include "arch/x86_64/processor.h"
#include "arch/x86_64/page.h"
#include "arch/x86_64/page-mapping.h"
diff --git a/arch/x86_64/memory/pml4.c b/arch/x86_64/memory/pml4.c
index fcfc897..b22bcfb 100644
--- a/arch/x86_64/memory/pml4.c
+++ b/arch/x86_64/memory/pml4.c
@@ -1,8 +1,10 @@
#include "arch/x86_64/page.h"
+#include "arch/x86_64/processor.h"
#include "device/processor.h"
#include "memory.h"
#include "boot.h"
#include "object.h"
+#include "init.h"
#include "string.h"
#include "jove.h"
#include "error.h"
diff --git a/arch/x86_64/tasking/tcb.c b/arch/x86_64/tasking/tcb.c
new file mode 100644
index 0000000..9877455
--- /dev/null
+++ b/arch/x86_64/tasking/tcb.c
@@ -0,0 +1,35 @@
+#include "arch/x86_64/tcb.h"
+#include "arch/x86_64/processor.h"
+#include "arch/x86_64/page.h"
+#include "device/processor.h"
+#include "object.h"
+#include "init.h"
+#include "string.h"
+
+#define INIT_TCB_BYTES (0x1000 + KERNEL_STACK_MINSIZE)
+uint8_t _init_tcb_bytes[INIT_TCB_BYTES];
+tcb_t *_init_tcb = (tcb_t*)&_init_tcb_bytes;
+
+void
+tcb_init(void *task_main)
+{
+ memset(_init_tcb, 0, INIT_TCB_BYTES);
+ _init_tcb->size = INIT_TCB_BYTES;
+ size_t kstack_bytes = (size_t)(INIT_TCB_BYTES - sizeof(tcb_t));
+
+ _init_tcb->ksp = (uintptr_t)_init_tcb->kstack + kstack_bytes - sizeof(intmax_t);
+ _init_tcb->pml4 = ko_entry_data(&_initDirectory.entries[INIT_OBJECT_PAGEMAP]);
+
+ _initDirectory.entries[INIT_OBJECT_TCB] = (objdir_entry_t) {
+ .type = KO_TCB,
+ .data = vptr_tophys_koff((uintptr_t)_init_tcb)
+ };
+
+ ((processor_t*)processor_current())->tcb = _init_tcb;
+
+ __asm__ volatile("\
+ movq %0, %%rsp; \
+ movq $0, %%rbp; \
+ jmpq %1"::
+ "r"(_init_tcb->ksp), "r"(task_main));
+}
diff --git a/arch/x86_64/usermode.c b/arch/x86_64/usermode.c
index 8975993..24a31a1 100644
--- a/arch/x86_64/usermode.c
+++ b/arch/x86_64/usermode.c
@@ -1,8 +1,7 @@
-
+#include "jove.h"
__attribute__((noreturn))
-static void
-s_enter_usermode(void *ip, void *sp)
+void usermode(void *ip, void *sp)
{
__asm__ volatile("mov %0, %%rsp; \
movq %1, %%rcx; \
@@ -11,5 +10,5 @@ s_enter_usermode(void *ip, void *sp)
swapgs; \
sysretq"::
"r"(sp), "r"(ip): "memory");
- for(;;);
+ hcf();
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-09-16 09:12:46 +0000