diff options
| -rw-r--r-- | apps/a.c | 3 | ||||
| -rw-r--r-- | apps/init.c | 6 | ||||
| -rw-r--r-- | kernel/features/syscall.c | 27 | ||||
| -rw-r--r-- | lib/Makefile | 3 | ||||
| -rw-r--r-- | lib/cpu.c | 6 | ||||
| -rw-r--r-- | lib/inc/cpu.h | 1 | ||||
| -rw-r--r-- | lib/inc/sys.h | 16 | ||||
| -rw-r--r-- | lib/print.c | 2 | ||||
| -rw-r--r-- | lib/serial.c | 2 | ||||
| -rw-r--r-- | lib/sys.c | 57 |
10 files changed, 114 insertions, 9 deletions
@@ -2,9 +2,12 @@ #include <def.h> #include <print.h> +#include <sys.h> void main() { + print("\nA loaded!\n"); + sys0(SYS_HALT); while (1) { print("a"); } diff --git a/apps/init.c b/apps/init.c index 91f5083..2851e8e 100644 --- a/apps/init.c +++ b/apps/init.c @@ -2,12 +2,12 @@ #include <def.h> #include <print.h> -#include <str.h> +#include <sys.h> void main() { - print("Init loaded\n"); - __asm__ volatile("int $0x80"); + print("Init loaded.\n"); + sys1(SYS_EXEC, (int)"/a"); while (1) { print("b"); }; diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index 3d012cf..1a43b9e 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -6,16 +6,33 @@ #include <print.h> #include <proc.h> #include <str.h> +#include <sys.h> int i = 0; void syscall_handler(struct regs *r) { - printf("[SYSCALL] %d\n", r->eax); + enum sys num = r->eax; + printf("[SYSCALL] %d\n", num); - struct proc *a = proc_make(); - bin_load(++i ? "/a" : "/b", a); - strcpy(a->name, "a"); - proc_print(); + switch (num) { + case SYS_HALT: { + loop(); + break; + } + case SYS_EXEC: { + char *path = (char *)r->ebx; + struct proc *proc = proc_make(); + bin_load(path, proc); + strcpy(proc->name, path); + proc_print(); + break; + } + default: { + printf("Unknown syscall!\n"); + loop(); + break; + } + } } void syscall_init() diff --git a/lib/Makefile b/lib/Makefile index 4190ec8..730ed6d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -7,7 +7,8 @@ COBJS = str.o \ conv.o \ print.o \ serial.o \ - cpu.o + cpu.o \ + sys.o CC = ../cross/opt/bin/i686-elf-gcc LD = ../cross/opt/bin/i686-elf-ld OC = ../cross/opt/bin/i686-elf-ar @@ -67,3 +67,9 @@ void idle() while (1) hlt(); } + +void loop() +{ + cli(); + idle(); +} diff --git a/lib/inc/cpu.h b/lib/inc/cpu.h index eb09291..2d367cb 100644 --- a/lib/inc/cpu.h +++ b/lib/inc/cpu.h @@ -17,6 +17,7 @@ void cli(); void sti(); void hlt(); void idle(); +void loop(); static inline void spinlock(int *ptr) { diff --git a/lib/inc/sys.h b/lib/inc/sys.h new file mode 100644 index 0000000..aaeb6ca --- /dev/null +++ b/lib/inc/sys.h @@ -0,0 +1,16 @@ +// MIT License, Copyright (c) 2020 Marvin Borner +// Syscall implementation + +#ifndef SYS_H +#define SYS_H + +enum sys { SYS_HALT, SYS_EXEC }; + +int sys0(enum sys num); +int sys1(enum sys num, int d1); +int sys2(enum sys num, int d1, int d2); +int sys3(enum sys num, int d1, int d2, int d3); +int sys4(enum sys num, int d1, int d2, int d3, int d4); +int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5); + +#endif diff --git a/lib/print.c b/lib/print.c index 1cbed69..84c4975 100644 --- a/lib/print.c +++ b/lib/print.c @@ -1,3 +1,5 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + #include <arg.h> #include <conv.h> #include <def.h> diff --git a/lib/serial.c b/lib/serial.c index dcee4dd..28de140 100644 --- a/lib/serial.c +++ b/lib/serial.c @@ -1,3 +1,5 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + #include <cpu.h> #include <def.h> #include <str.h> diff --git a/lib/sys.c b/lib/sys.c new file mode 100644 index 0000000..d676445 --- /dev/null +++ b/lib/sys.c @@ -0,0 +1,57 @@ +// MIT License, Copyright (c) 2020 Marvin Borner +// Syscall implementation + +#include <sys.h> + +/** + * Definitions + */ + +int sys0(enum sys num) +{ + int a; + __asm__ volatile("int $0x80" : "=a"(a) : "0"(num)); + return a; +} + +int sys1(enum sys num, int d1) +{ + int a; + __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1)); + return a; +} + +int sys2(enum sys num, int d1, int d2) +{ + int a; + __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1), "c"((int)d2)); + return a; +} + +int sys3(enum sys num, int d1, int d2, int d3) +{ + int a; + __asm__ volatile("int $0x80" + : "=a"(a) + : "0"(num), "b"((int)d1), "c"((int)d2), "d"((int)d3)); + return a; +} + +int sys4(enum sys num, int d1, int d2, int d3, int d4) +{ + int a; + __asm__ volatile("int $0x80" + : "=a"(a) + : "0"(num), "b"((int)d1), "c"((int)d2), "d"((int)d3), "S"((int)d4)); + return a; +} + +int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5) +{ + int a; + __asm__ volatile("int $0x80" + : "=a"(a) + : "0"(num), "b"((int)d1), "c"((int)d2), "d"((int)d3), "S"((int)d4), + "D"((int)d5)); + return a; +} |