Added basic exec calls for init and started libc

4 files changed, 24 insertions, 12 deletions

diff --git a/src/kernel/syscall/actions/sys_exec.c b/src/kernel/syscall/actions/sys_exec.c
new file mode 100644
index 0000000..dc1e9c6
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_exec.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <kernel/tasks/process.h>
+
+uint32_t sys_exec(char *path)
+{
+	return uexec(path);
+}
diff --git a/src/kernel/syscall/actions/sys_getch.c b/src/kernel/syscall/actions/sys_getch.c
index f1e4dfb..91ccda7 100644
--- a/src/kernel/syscall/actions/sys_getch.c
+++ b/src/kernel/syscall/actions/sys_getch.c
@@ -1,10 +1,11 @@
 #include <stdint.h>
 #include <kernel/lib/stdio.h>
-#include <kernel/input/input.h>
-#include <kernel/lib/lib.h>
-#include <kernel/lib/string.h>
+#include <kernel/io/io.h>
 
 uint32_t sys_getch()
 {
-	return (uint32_t)getch();
-}
\ No newline at end of file
+	sti();
+	uint32_t key = getch();
+	cli();
+	return key;
+}
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index ca12118..d0b2b96 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -8,14 +8,15 @@
 typedef uint32_t (*syscall_func)(uint32_t, ...);
 
 uint32_t (*syscalls[])() = { [0] = (uint32_t(*)())halt_loop, // DEBUG!
-			     [1] = (uint32_t(*)())sys_putch,
-			     [2] = sys_getch,
-			     [3] = sys_malloc,
-			     [4] = sys_free };
+			     [1] = sys_exec,
+			     [2] = (uint32_t(*)())sys_putch,
+			     [3] = sys_getch,
+			     [4] = sys_malloc,
+			     [5] = sys_free };
 
 void syscall_handler(struct regs *r)
 {
-	sti();
+	cli();
 	log("Received syscall!");
 
 	if (r->eax >= sizeof(syscalls) / sizeof(*syscalls))
@@ -29,9 +30,10 @@ void syscall_handler(struct regs *r)
 	    r->edx, r->esi, r->edi);
 
 	r->eax = location(r->ebx, r->ecx, r->edx, r->esi, r->edi);
+	sti();
 }
 
 void syscalls_install()
 {
 	isr_install_handler(0x80, syscall_handler);
-}
\ No newline at end of file
+}
diff --git a/src/kernel/syscall/syscall.h b/src/kernel/syscall/syscall.h
index b2bdc6d..5c21d58 100644
--- a/src/kernel/syscall/syscall.h
+++ b/src/kernel/syscall/syscall.h
@@ -7,6 +7,8 @@ extern void idt_syscall();
 
 void syscalls_install();
 
+uint32_t sys_exec(char *path);
+
 uint32_t sys_putch(char ch);
 
 uint32_t sys_getch();
@@ -15,4 +17,4 @@ uint32_t sys_malloc(uint32_t count);
 
 uint32_t sys_free(uint32_t ptr);
 
-#endif
\ No newline at end of file
+#endif