Some things here and some things there

5 files changed, 33 insertions, 16 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index e781141..e119933 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -20,9 +20,9 @@ AS = nasm
 # Flags to make the binary smaller TODO: Remove after indirect pointer support!
 CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
 
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel
+CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel
 
-ASFLAGS = -f elf32 -O3
+ASFLAGS = -f elf32
 
 all: compile bootloader
 
diff --git a/kernel/features/event.c b/kernel/features/event.c
index 02f5f1d..8fafb05 100644
--- a/kernel/features/event.c
+++ b/kernel/features/event.c
@@ -52,7 +52,7 @@ u32 event_trigger(enum event id, u32 *data)
 
 	struct node *iterator = ((struct list *)event_table[id])->head;
 
-	if (!iterator->data) {
+	if (memcmp(event_table[id], 0, sizeof(struct list)) == 0) {
 		printf("Event %d not mapped!\n", id);
 		return 1;
 	}
@@ -65,7 +65,5 @@ u32 event_trigger(enum event id, u32 *data)
 			break;
 	}
 
-	// TODO: Execute event function in ring3 with process stack, ...
-	/* location(data); */
 	return 0;
 }
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index b43b800..7eb6832 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -42,7 +42,7 @@ void scheduler(struct regs *regs)
 
 	if (current->event) {
 		// TODO: Modify and backup EIP
-		printf("Event %d for %d\n", current->event, current->pid);
+		printf("Event %d for pid %d\n", current->event, current->pid);
 		// TODO: Clear bit after resolve
 		current->event = 0;
 	}
@@ -89,8 +89,9 @@ void proc_attach(struct proc *proc)
 	}
 }
 
-void proc_exit()
+void proc_exit(int status)
 {
+	printf("Process %d exited with status %d\n", current->pid, status);
 	current->state = PROC_ASLEEP;
 }
 
@@ -121,7 +122,14 @@ void proc_init()
 
 	_eip = root->regs.eip;
 	_esp = root->regs.esp;
-	((u32 *)_esp)[1] = (u32)boot_passed->vbe; // First argument
+
+	char *args[] = { "init", (char *)boot_passed->vbe, NULL };
+
+	((u32 *)_esp)[0] = 2; // First argument (argc)
+	((u32 *)_esp)[1] = (u32)args; // Second argument (argv)
 
 	proc_jump_userspace();
+	printf("Returned!\n");
+	while (1) {
+	};
 }
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 9d5ac82..02b17e5 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -15,53 +15,64 @@ void syscall_handler(struct regs *r)
 {
 	enum sys num = r->eax;
 	r->eax = 0;
-	printf("[SYSCALL] %d\n", num);
+	printf("[SYSCALL] %d: ", num);
 
 	switch (num) {
 	case SYS_LOOP: {
+		printf("loop\n");
 		loop();
 		break;
 	}
 	case SYS_MALLOC: {
+		printf("malloc\n");
 		r->eax = (u32)malloc(r->eax);
 		break;
 	}
 	case SYS_FREE: {
+		printf("free\n");
 		free(r->eax);
 		break;
 	}
 	case SYS_READ: {
+		printf("read\n");
 		r->eax = (u32)read_file((char *)r->ebx);
 		break;
 	}
 	case SYS_WRITE: {
+		printf("write\n");
 		// TODO: Write ext2 support
 		break;
 	}
 	case SYS_EXEC: {
+		printf("exec\n");
 		char *path = (char *)r->ebx;
 		struct proc *proc = proc_make();
-		((u32 *)proc->regs.esp)[0] = r->ecx;
-		((u32 *)proc->regs.esp)[1] = r->edx;
-		((u32 *)proc->regs.esp)[2] = r->esi;
-		((u32 *)proc->regs.esp)[3] = r->edi;
+
 		r->eax = bin_load(path, proc);
+		((u32 *)proc->regs.useresp)[0] = 42;
+		((char *)proc->regs.useresp)[1] = r->ecx;
+		((char *)proc->regs.useresp)[2] = r->edx;
+		((char *)proc->regs.useresp)[3] = r->esi;
+		((char *)proc->regs.useresp)[4] = r->edi;
 		break;
 	}
 	case SYS_EXIT: {
-		proc_exit();
+		printf("exit\n");
+		proc_exit(r->ebx);
 		break;
 	}
 	case SYS_MAP: {
+		printf("map\n");
 		event_map(r->ebx, (u32 *)r->ecx);
 		break;
 	}
 	case SYS_UNMAP: {
+		printf("unmap\n");
 		event_unmap(r->ebx, (u32 *)r->ecx);
 		break;
 	}
 	default: {
-		printf("Unknown syscall!\n");
+		printf("unknown\n");
 		loop();
 		break;
 	}
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index 1ed5df2..4c6ffaf 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -26,7 +26,7 @@ struct proc {
 void proc_init();
 void proc_print();
 struct proc *proc_current();
-void proc_exit();
+void proc_exit(int status);
 struct proc *proc_make();
 
 #endif