Added syscalls

3 files changed, 45 insertions, 6 deletions

diff --git a/src/features/load.c b/src/features/load.c
index 2cfa546..62da8b4 100644
--- a/src/features/load.c
+++ b/src/features/load.c
@@ -13,5 +13,5 @@ void bin_load(char *path, struct proc *proc)
 
 	proc->regs.ebp = stack;
 	proc->regs.esp = stack;
-	proc->regs.eip = (u32)&data;
+	proc->regs.eip = (u32)data;
 }
diff --git a/src/features/proc.c b/src/features/proc.c
index 92e17f1..fbf1b5a 100644
--- a/src/features/proc.c
+++ b/src/features/proc.c
@@ -14,15 +14,15 @@ struct proc *last;
 
 void scheduler(struct regs *regs)
 {
-	printf(".");
+	printf("%d", current->pid);
 	memcpy(&current->regs, regs, sizeof(struct regs));
 
 	timer_handler();
 
-	if (!current->next)
-		current = root;
-	else
+	if (current->next)
 		current = current->next;
+	else
+		current = root;
 
 	while (current->state == PROC_ASLEEP)
 		if (!current->next)
@@ -33,6 +33,18 @@ void scheduler(struct regs *regs)
 	memcpy(regs, &current->regs, sizeof(struct regs));
 }
 
+void proc_print()
+{
+	struct proc *proc = root;
+
+	while (proc) {
+		printf("Process %d [%s]\n", proc->pid,
+		       proc->state == PROC_RUNNING ? "running" : "sleeping");
+		proc = proc->next;
+	}
+	printf("\n");
+}
+
 void proc_attach(struct proc *proc)
 {
 	if (!last->next) {
@@ -47,7 +59,7 @@ void proc_attach(struct proc *proc)
 
 struct proc *proc_make()
 {
-	struct proc *proc = (struct proc *)malloc(sizeof(*proc));
+	struct proc *proc = malloc(sizeof(*proc));
 	proc->pid = pid++;
 	proc->state = PROC_RUNNING;
 	if (current)
@@ -61,4 +73,12 @@ void proc_init()
 	current = root = proc_make();
 	bin_load("/root", root);
 	irq_install_handler(0, scheduler);
+	proc_print();
+
+	// JUMP!
+	void (*entry)();
+	*(void **)(&entry) = (u32 *)root->regs.eip;
+	__asm__ volatile("movl %%eax, %%ebp" ::"a"(root->regs.ebp));
+	__asm__ volatile("movl %%eax, %%esp" ::"a"(root->regs.esp));
+	entry();
 }
diff --git a/src/features/syscall.c b/src/features/syscall.c
new file mode 100644
index 0000000..ab1849c
--- /dev/null
+++ b/src/features/syscall.c
@@ -0,0 +1,19 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <interrupts.h>
+#include <load.h>
+#include <print.h>
+#include <proc.h>
+
+void syscall_handler(struct regs *r)
+{
+	printf("[SYSCALL] %d\n", r->eax);
+
+	struct proc *a = proc_make();
+	bin_load("/a", a);
+}
+
+void syscall_install()
+{
+	isr_install_handler(0x80, syscall_handler);
+}