diff options
Diffstat (limited to 'kernel/features/syscall.c')
| -rw-r--r-- | kernel/features/syscall.c | 101 |
1 files changed, 51 insertions, 50 deletions
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index 9efb849..93355db 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -1,7 +1,7 @@ // MIT License, Copyright (c) 2020 Marvin Borner #include <drivers/cpu.h> -#include <drivers/interrupts.h> +#include <drivers/int.h> #include <drivers/timer.h> #include <errno.h> #include <fs.h> @@ -15,103 +15,106 @@ #include <sys.h> #include <syscall.h> -static void syscall_handler(struct regs *r) +static u32 syscall_handler(u32 esp) { - enum sys num = r->eax; + struct int_frame_user *frame = (struct int_frame_user *)esp; + enum sys num = frame->eax; - /* printf("[SYSCALL] %d from %s\n", num, proc_current()->name); */ +#if DEBUG_SYSCALLS + printf("[SYSCALL] %d from %s\n", num, proc_current()->name); +#endif switch (num) { // Memory operations case SYS_ALLOC: { - r->eax = memory_sys_alloc(proc_current()->page_dir, r->ebx, (u32 *)r->ecx, - (u32 *)r->edx, (u8)r->esi); + frame->eax = memory_sys_alloc(proc_current()->page_dir, frame->ebx, + (u32 *)frame->ecx, (u32 *)frame->edx, (u8)frame->esi); break; } case SYS_FREE: { - r->eax = memory_sys_free(proc_current()->page_dir, r->ebx); + frame->eax = memory_sys_free(proc_current()->page_dir, frame->ebx); break; } case SYS_SHACCESS: { - r->eax = memory_sys_shaccess(proc_current()->page_dir, r->ebx, (u32 *)r->ecx, - (u32 *)r->edx); + frame->eax = memory_sys_shaccess(proc_current()->page_dir, frame->ebx, + (u32 *)frame->ecx, (u32 *)frame->edx); break; } // File operations case SYS_STAT: { - r->eax = vfs_stat((char *)r->ebx, (struct stat *)r->ecx); + frame->eax = vfs_stat((char *)frame->ebx, (struct stat *)frame->ecx); break; } case SYS_READ: { - r->eax = vfs_read((char *)r->ebx, (void *)r->ecx, r->edx, r->esi); + frame->eax = + vfs_read((char *)frame->ebx, (void *)frame->ecx, frame->edx, frame->esi); break; } case SYS_WRITE: { - r->eax = vfs_write((char *)r->ebx, (void *)r->ecx, r->edx, r->esi); + frame->eax = + vfs_write((char *)frame->ebx, (void *)frame->ecx, frame->edx, frame->esi); break; } // I/O operations case SYS_IOPOLL: { - r->eax = io_poll((void *)r->ebx); + frame->eax = io_poll((void *)frame->ebx); break; } case SYS_IOREAD: { - res ready = io_ready(r->ebx); + res ready = io_ready(frame->ebx); if (ready == -EAGAIN) { - io_block(r->ebx, proc_current()); + io_block(frame->ebx, proc_current()); } else if (ready != EOK) { - r->eax = ready; + frame->eax = ready; break; } - r->eax = io_read(r->ebx, (void *)r->ecx, r->edx, r->esi); + frame->eax = io_read(frame->ebx, (void *)frame->ecx, frame->edx, frame->esi); break; } case SYS_IOWRITE: { - r->eax = io_write(r->ebx, (void *)r->ecx, r->edx, r->esi); + frame->eax = io_write(frame->ebx, (void *)frame->ecx, frame->edx, frame->esi); break; } case SYS_IOCONTROL: { - r->eax = io_control(r->ebx, r->ecx, (void *)r->edx, (void *)r->esi, (void *)r->edi); + frame->eax = io_control(frame->ebx, frame->ecx, (void *)frame->edx, + (void *)frame->esi, (void *)frame->edi); break; } // Process operations case SYS_EXEC: { - char *path = (char *)r->ebx; + char *path = (char *)frame->ebx; struct proc *proc = proc_make(PROC_PRIV_NONE); - r->eax = (u32)elf_load(path, proc); - if (r->eax != EOK) { - proc_exit(proc, r, -r->eax); - } else { - // TODO: Reimplement argc,argv - proc_stack_push(proc, 0); - proc_yield_regs(r); - } + frame->eax = (u32)elf_load(path, proc); + if (frame->eax != EOK) + proc_exit(proc, -frame->eax); + else + proc_yield(); break; } case SYS_EXIT: { - r->eax = EOK; - proc_exit(proc_current(), r, (s32)r->ebx); + frame->eax = EOK; + proc_exit(proc_current(), (s32)frame->ebx); break; } case SYS_YIELD: { - r->eax = EOK; - proc_yield_regs(r); + frame->eax = EOK; + proc_yield(); break; } // System operations case SYS_BOOT: { // TODO: Move - if (r->ebx != SYS_BOOT_MAGIC) { - r->eax = -EINVAL; + if (frame->ebx != SYS_BOOT_MAGIC) { + frame->eax = -EINVAL; break; } if (!proc_super()) { - r->eax = -EACCES; + frame->eax = -EACCES; } - switch (r->ecx) { + switch (frame->ecx) { case SYS_BOOT_REBOOT: print("Rebooting...\n"); outb(0x64, 0xfe); @@ -126,38 +129,36 @@ static void syscall_handler(struct regs *r) __asm__ volatile("cli\nud2"); break; default: - r->eax = -EINVAL; + frame->eax = -EINVAL; } break; } case SYS_MIN: case SYS_MAX: - r->eax = -EINVAL; + frame->eax = -EINVAL; break; - // TODO: Reimplement network functions using VFS default: { - r->eax = -EINVAL; + frame->eax = -EINVAL; printf("Unknown syscall %d!\n", num); break; } } + + return esp; } -// For kernel syscalls (internal) -static void syscall_special_handler(struct regs *r) +// Internal scheduler (=> yield) call +static u32 syscall_special_handler(u32 esp) { - if (RING(r) != 0) - return; - - scheduler(r); + if (proc_current()) + proc_reset_quantum(proc_current()); + return scheduler(esp); } CLEAR void syscall_init(void) { - idt_set_gate(0x7f, (u32)isr127, 0x08, 0x8e); - idt_set_gate(0x80, (u32)isr128, 0x08, 0xee); - isr_install_handler(0x7f, syscall_special_handler); - isr_install_handler(0x80, syscall_handler); + int_special_handler_add(0, syscall_handler); + int_special_handler_add(1, syscall_special_handler); } |