kamkow1/my-os-project2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C userspace programs

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-09-04 23:20:30 +02:00
parent afa4d383e0
commit 90266f044b
51 changed files with 259 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/proc/proc.c
View File

@ -155,7 +155,7 @@ Proc *proc_spawnuser(char *mountpoint, char *path) {
ElfAuxval aux = proc_load_elf_segs(proc, data);
proc->platformdata.trapframe.ss = 0x20 | 0x3;
proc->platformdata.trapframe.rsp = (uint64_t)VIRT(sp);
proc->platformdata.trapframe.rsp = (uint64_t)sp;
proc->platformdata.trapframe.rflags = 0x202;
proc->platformdata.trapframe.cs = 0x18 | 0x3;
proc->platformdata.trapframe.rip = aux.entry;
@ -231,13 +231,10 @@ void proc_sched(void *cpustate) {
IntrStackFrame *frame = cpustate;
PROCS.current->platformdata.trapframe = *frame;
PROCS.current->platformdata.fsbase = hal_cpu_rdmsr(HAL_CPU_FSBASE);
PROCS.current = proc_nextready();
PROCS.current->state = PROC_RUNNING;
hal_cpu_wrmsr(HAL_CPU_FSBASE, PROCS.current->platformdata.fsbase);
HAL_CPUS[0].syscall_kstack = VIRT(PROCS.current->platformdata.kstack);
hal_switchproc(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
}
@ -282,8 +279,8 @@ void proc_init(void) {
proc_register(idle);
PROCS.current = idle;
proc_register(proc_spawnkern(&proc_status, "status"));
proc_register(proc_spawnuser("base", "/bin/hello"));
/* proc_register(proc_spawnkern(&proc_status, "status")); */
proc_register(proc_spawnuser("base", "/bin/init"));
hal_switchproc(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
}

1
kernel/proc/proc.h
View File

@ -14,7 +14,6 @@
#define PROC_MAX 0x100 // max amount of processes
typedef struct {
uint64_t fsbase;
IntrStackFrame trapframe;
uint8_t *kstack;
PgTable *cr3;