From f700ba6668dbdb91a03b2c5aa387eb4cabae8fcd Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 21 Aug 2020 20:39:48 +0200
Subject: Some things here and some things there

---
 kernel/features/proc.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'kernel/features/proc.c')

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) {
+	};
 }
-- 
cgit v1.2.3