summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/hal/idt.c1
-rw-r--r--arch/x86_64/hal/obj.c6
-rw-r--r--arch/x86_64/hal/paging.c8
-rw-r--r--arch/x86_64/hal/process.c77
-rw-r--r--arch/x86_64/hal/smp.c15
-rw-r--r--arch/x86_64/hal/smp.h4
-rw-r--r--arch/x86_64/main.c4
-rw-r--r--arch/x86_64/panic/panic.c45
-rw-r--r--arch/x86_64/proc/init.c (renamed from arch/x86_64/sys/init.c)10
-rw-r--r--arch/x86_64/proc/process.c64
-rw-r--r--arch/x86_64/proc/process.h (renamed from arch/x86_64/hal/process.h)6
-rw-r--r--arch/x86_64/sys/syscall.c2
12 files changed, 137 insertions, 105 deletions
diff --git a/arch/x86_64/hal/idt.c b/arch/x86_64/hal/idt.c
index 235d8c6..ff7a8a0 100644
--- a/arch/x86_64/hal/idt.c
+++ b/arch/x86_64/hal/idt.c
@@ -4,6 +4,7 @@
#include "jove.h"
#include "lib/printf.h"
#include "lib/string.h"
+#include "panic/panic.h"
ALIGN(8)
static struct idt_entry s_idt[IDT_ENTRIES];
diff --git a/arch/x86_64/hal/obj.c b/arch/x86_64/hal/obj.c
index 9844a54..103b53d 100644
--- a/arch/x86_64/hal/obj.c
+++ b/arch/x86_64/hal/obj.c
@@ -97,9 +97,6 @@ objdir_getlocal(
jove_owned_obj_t *objdir_obj,
uint16_t entry)
{
- while(obj_gettype(objdir_obj) == JOVE_OBJ_LINK) {
- objdir_obj = link_deref(objdir_obj);
- }
if(obj_gettype(objdir_obj) != JOVE_OBJ_OBJDIR) {
reterr(EBADOBJ);
}
@@ -116,9 +113,6 @@ objdir_trygetlocal(
jove_owned_obj_t *objdir_obj,
uint16_t entry)
{
- while(obj_gettype(objdir_obj) == JOVE_OBJ_LINK) {
- objdir_obj = link_deref(objdir_obj);
- }
if(obj_gettype(objdir_obj) != JOVE_OBJ_OBJDIR) {
reterr(EBADOBJ);
}
diff --git a/arch/x86_64/hal/paging.c b/arch/x86_64/hal/paging.c
index 2fbf26c..770cdff 100644
--- a/arch/x86_64/hal/paging.c
+++ b/arch/x86_64/hal/paging.c
@@ -7,7 +7,7 @@
#include "hal/obj.h"
#include "lib/string.h"
#include "lib/printf.h"
-#include "lib/panic.h"
+#include "panic/panic.h"
#include "idt.h"
#include "api/syscall.h"
@@ -69,11 +69,7 @@ s_int_handle_pf_early(struct int_stackframe *frame)
uintptr_t cr2 = 0;
__asm__ volatile("movq %%cr2, %0": "=r"(cr2));
- kprintf("Faulting address: %p\n", cr2);
- kprintf("RIP: %p | RSP: %p\n", frame->int_rip, frame->int_rsp);
- print_state(&frame->state);
-
- hcf();
+ kpanic_istate(frame, "Faulting address: %p\n", cr2);
}
static page_t*
diff --git a/arch/x86_64/hal/process.c b/arch/x86_64/hal/process.c
deleted file mode 100644
index aa51f45..0000000
--- a/arch/x86_64/hal/process.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "process.h"
-#include "arch/x86_64/hal/obj.h"
-#include "hal/obj.h"
-#include "hal/process.h"
-#include "hal/smp.h"
-#include "lib/string.h"
-#include "init.h"
-#include "smp.h"
-#include "paging.h"
-#include "jove.h"
-
-PAGEALIGN uint8_t s_init_iopb[0x2000];
-PAGEALIGN char s_init_pcb_bytes[0x1000] = { 0 };
-static pcb_t *s_init_pcb = (pcb_t*)&s_init_pcb_bytes;
-
-jove_owned_obj_t*
-process_current(void)
-{
- return obj_take(((processor_t*)processor_current())->pcb_obj);
-}
-
-pcb_t*
-pcb_from_obj(jove_owned_obj_t *obj)
-{
- if(obj_gettype(obj) != JOVE_OBJ_PCB) {
- reterr(EBADOBJ);
- }
- return obj_deref(obj);
-}
-
-pid_t
-pcb_pid(pcb_t *pcb)
-{
- return pcb->pid;
-}
-
-jove_obj_t*
-pcb_rootdir(pcb_t *pcb)
-{
- return pcb->rootdir;
-}
-
-void
-processing_setup(void (*process_main))
-{
- memset(s_init_iopb, 0xFF, 0x2000);
- uintptr_t ksp = ((uintptr_t)&s_init_pcb_bytes) + 0xFF8;
-
- s_init_pcb->pid = 1;
- s_init_pcb->ksp = (void*)ksp;
- s_init_pcb->pml4 = paging_get_pml4();
- s_init_pcb->rootdir = _rootdir_obj;
-
- jove_owned_obj_t *iopb_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_IOPB_I);
- obj_settype(iopb_obj, JOVE_OBJ_IOPB);
- obj_setvalue(iopb_obj, (uintptr_t)s_init_iopb);
- s_init_pcb->iopb = iopb_obj;
-
- processor_t *proc = processor_current();
- proc->tss.rsp[0] = (uintptr_t)s_init_pcb->ksp;
- memcpy(proc->iopb, s_init_iopb, 0x2000);
-
- {
- jove_owned_obj_t *process_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_PCB_I);
- obj_settype(process_obj, JOVE_OBJ_PCB);
- obj_setvalue(process_obj, (uintptr_t)s_init_pcb);
-
- proc->pcb_obj = obj_release(process_obj);
- proc->pcb = s_init_pcb;
- }
-
- __asm__ volatile("\
- movq %0, %%rsp; \
- movq $0, %%rbp; \
- jmpq %1"::
- "r"(s_init_pcb->ksp), "r"(process_main));
-}
diff --git a/arch/x86_64/hal/smp.c b/arch/x86_64/hal/smp.c
index f67ce0b..4c79d79 100644
--- a/arch/x86_64/hal/smp.c
+++ b/arch/x86_64/hal/smp.c
@@ -1,13 +1,13 @@
#include "smp.h"
-#include "hal/process.h"
#include "init.h"
-#include "hal/obj.h"
#include "config.h"
#include "jove.h"
-#include "lib/printf.h"
-#include "lib/string.h"
#include "paging.h"
#include "msr.h"
+#include "hal/obj.h"
+#include "proc/process.h"
+#include "lib/printf.h"
+#include "lib/string.h"
processor_t s_processors[SMP_PROCESSORS_MAX];
@@ -54,7 +54,7 @@ smp_init_bsp(void)
obj_release(processor_objdir_obj);
}
- //idt_init();
+ idt_init();
paging_pml4_init();
}
@@ -62,3 +62,8 @@ processor_t *processor_current(void)
{
return (processor_t*)msr_get_gs_base();
}
+
+jove_owned_obj_t *processor_pcb(processor_t *processor)
+{
+ return processor->pcb_obj;
+}
diff --git a/arch/x86_64/hal/smp.h b/arch/x86_64/hal/smp.h
index b208e92..b26d4ac 100644
--- a/arch/x86_64/hal/smp.h
+++ b/arch/x86_64/hal/smp.h
@@ -1,8 +1,8 @@
#ifndef _JOVE_x86_64_HAL_SMP_H
#define _JOVE_x86_64_HAL_SMP_H 1
+#include "arch/x86_64/proc/process.h"
#include "gdt.h"
-#include "process.h"
#include "hal/obj.h"
#include "hal/smp.h"
@@ -12,7 +12,7 @@ typedef struct processor
struct tss tss;
uint8_t iopb[0x2000];
- jove_obj_t *pcb_obj;
+ jove_owned_obj_t *pcb_obj;
pcb_t *pcb;
} processor_t;
diff --git a/arch/x86_64/main.c b/arch/x86_64/main.c
index 644f154..f5a9d39 100644
--- a/arch/x86_64/main.c
+++ b/arch/x86_64/main.c
@@ -4,14 +4,14 @@
#include "lib/string.h"
#include "lib/printf.h"
#include "lib/virtterm.h"
-#include "lib/panic.h"
+#include "panic/panic.h"
#include "../../hal/obj.h"
#include "hal/msr.h"
#include "hal/serial_com.h"
#include "hal/smp.h"
#include "hal/memory.h"
#include "hal/framebuffer.h"
-#include "hal/process.h"
+#include "proc/process.h"
#include "boot/initrd.h"
#include "boot/cmdline.h"
diff --git a/arch/x86_64/panic/panic.c b/arch/x86_64/panic/panic.c
new file mode 100644
index 0000000..a19f807
--- /dev/null
+++ b/arch/x86_64/panic/panic.c
@@ -0,0 +1,45 @@
+#include "panic/panic.h"
+#include "arch/x86_64/hal/idt.h"
+#include "arch/x86_64/x86_64.h"
+#include "arch/x86_64/hal/paging.h"
+#include "lib/printf.h"
+
+__attribute__((naked))
+void*
+__panic_get_bp(void)
+{
+ asm("movq %%rbp, %%rax; \
+ retq"::: "memory");
+}
+
+void*
+__panic_print_istate(void *state)
+{
+ struct int_stackframe *int_state = state;
+ kprintf("RIP: %p | RSP: %p\n", int_state->int_rip, int_state->int_rsp);
+
+ print_state(&int_state->state);
+ return (void*)int_state->state.rbp;
+}
+
+void
+__panic_stack_trace(void *bp)
+{
+ uintmax_t *rbp = (uintmax_t*)bp;
+ kprintf("\nStack trace:\n");
+
+ while(rbp) {
+ kprintf("%p:\n", rbp[1]);
+ uintmax_t *next = (uintmax_t*)rbp[0];
+ ptrdiff_t dist = (next - rbp);
+
+ if((uintptr_t)next < IDENT_VIRT_BASE) break;
+ if(dist > 0) {
+ for(size_t i = 0; i < dist; i++) {
+ kprintf(" %p\n", rbp[i]);
+ }
+ }
+
+ rbp = next;
+ }
+}
diff --git a/arch/x86_64/sys/init.c b/arch/x86_64/proc/init.c
index b411fd7..4c86038 100644
--- a/arch/x86_64/sys/init.c
+++ b/arch/x86_64/proc/init.c
@@ -1,18 +1,18 @@
#include "init.h"
#include "arch/x86_64/hal/msr.h"
#include "config.h"
-#include "hal/process.h"
+#include "proc/process.h"
#include "jove.h"
#include "hal/obj.h"
#include "lib/string.h"
-#include "lib/panic.h"
+#include "panic/panic.h"
#include "lib/printf.h"
#include "arch/x86_64/lib/elf.h"
#include "arch/x86_64/hal/paging.h"
#include "boot/cmdline.h"
#include "boot/initrd.h"
-PAGEALIGN static uint8_t s_init_program_pages[INIT_PROGRAM_PAGES_MAX + 3][0x1000];
+PAGEALIGN static uint8_t s_init_program_pages[INIT_PROGRAM_PAGES_MAX][0x1000];
PAGEALIGN static uint8_t s_init_stack_pages[INIT_STACK_PAGES + 3][0x1000];
PAGEALIGN static uint8_t s_init_message_page[0x1000];
@@ -93,8 +93,8 @@ init_setup(void)
for(size_t i = 0; i < pages; i++) {
uintptr_t page_virt = page_base + (i << 12);
- if(last_page > INIT_PROGRAM_PAGES_MAX) {
- kpanic("init: Program exceeds maximum program pages in the same hugepage frame!\n");
+ if(last_page >= INIT_PROGRAM_PAGES_MAX) {
+ kpanic("Program exceeds size limit! (%i > %i)\n", last_page, INIT_PROGRAM_PAGES_MAX);
}
int tblres = 0;
diff --git a/arch/x86_64/proc/process.c b/arch/x86_64/proc/process.c
new file mode 100644
index 0000000..55af85a
--- /dev/null
+++ b/arch/x86_64/proc/process.c
@@ -0,0 +1,64 @@
+#include "process.h"
+#include "proc/process.h"
+#include "arch/x86_64/hal/obj.h"
+#include "arch/x86_64/hal/smp.h"
+#include "arch/x86_64/hal/paging.h"
+#include "hal/obj.h"
+#include "hal/smp.h"
+#include "lib/string.h"
+#include "init.h"
+#include "jove.h"
+
+PAGEALIGN uint8_t s_init_iopb[0x2000];
+PAGEALIGN char _init_pcb_bytes[0x1000] = { 0 };
+pcb_t *_init_pcb = (pcb_t*)&_init_pcb_bytes;
+
+pid_t
+pcb_pid(pcb_t *pcb)
+{
+ return pcb->pid;
+}
+
+jove_obj_t*
+pcb_rootdir(pcb_t *pcb)
+{
+ return pcb->rootdir;
+}
+
+void
+processing_setup(void (*process_main))
+{
+ memset(s_init_iopb, 0xFF, 0x2000);
+ uintptr_t ksp = ((uintptr_t)&_init_pcb_bytes) + 0xFF8;
+
+ _init_pcb->tree_node.get_key = (void*)pcb_pid;
+
+ _init_pcb->pid = 1;
+ _init_pcb->ksp = (void*)ksp;
+ _init_pcb->pml4 = paging_get_pml4();
+ _init_pcb->rootdir = _rootdir_obj;
+
+ jove_owned_obj_t *iopb_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_IOPB_I);
+ obj_settype(iopb_obj, JOVE_OBJ_IOPB);
+ obj_setvalue(iopb_obj, (uintptr_t)s_init_iopb);
+ _init_pcb->iopb = iopb_obj;
+
+ processor_t *proc = processor_current();
+ proc->tss.rsp[0] = (uintptr_t)_init_pcb->ksp;
+ memcpy(proc->iopb, s_init_iopb, 0x2000);
+
+ {
+ jove_owned_obj_t *process_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_PCB_I);
+ obj_settype(process_obj, JOVE_OBJ_PCB);
+ obj_setvalue(process_obj, (uintptr_t)_init_pcb);
+
+ proc->pcb_obj = process_obj;
+ proc->pcb = _init_pcb;
+ }
+
+ __asm__ volatile("\
+ movq %0, %%rsp; \
+ xorq %%rbp, %%rbp; \
+ jmpq %1"::
+ "r"(_init_pcb->ksp), "r"(process_main));
+}
diff --git a/arch/x86_64/hal/process.h b/arch/x86_64/proc/process.h
index f903153..cf4d8a8 100644
--- a/arch/x86_64/hal/process.h
+++ b/arch/x86_64/proc/process.h
@@ -1,11 +1,15 @@
#ifndef _JOVE_x86_64_HAL_PROCESS_H
#define _JOVE_x86_64_HAL_PROCESS_H 1
-#include "hal/process.h"
+#include "proc/process.h"
#include "arch/x86_64/x86_64.h"
+#include "lib/rbtree.h"
typedef struct process_control_block
{
+ struct rbtree_node tree_node;
+ struct process_control_block *sched_next;
+
pid_t pid;
jove_obj_t *rootdir;
jove_owned_obj_t *iopb;
diff --git a/arch/x86_64/sys/syscall.c b/arch/x86_64/sys/syscall.c
index 7c5727f..e3fa81b 100644
--- a/arch/x86_64/sys/syscall.c
+++ b/arch/x86_64/sys/syscall.c
@@ -1,5 +1,5 @@
#include "arch/x86_64/hal/obj.h"
-#include "arch/x86_64/hal/process.h"
+#include "arch/x86_64/proc/process.h"
#include "arch/x86_64/hal/smp.h"
#include "lib/printf.h"
generated by cgit v1.2.3 (git 2.46.0) at 2026-10-18 11:12:40 +0000