Added some debugging features

I've tried to track down the bugs with kvm and q35 but I didn't manage
to do it - yet!
I'll probably look into it soon.

6 files changed, 15 insertions, 8 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index f629b3d..5e5b752 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -20,7 +20,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld
 OC = ccache ../cross/opt/bin/i686-elf-objcopy
 AS = ccache nasm
 
-CFLAGS = $(CFLAGS_DEFAULT) -Wno-address-of-packed-member -ffreestanding -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(DEBUG)
+CFLAGS = $(CFLAGS_DEFAULT) -Wno-address-of-packed-member -ffreestanding -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel
 ASFLAGS = -f elf32
 
 all: compile
diff --git a/kernel/drivers/interrupts.c b/kernel/drivers/interrupts.c
index 268bff5..fa455d7 100644
--- a/kernel/drivers/interrupts.c
+++ b/kernel/drivers/interrupts.c
@@ -173,12 +173,15 @@ void isr_handler(struct regs *r);
 void isr_handler(struct regs *r)
 {
 	if (r->int_no <= 32) {
-		printf("%s Exception, exiting!\n", isr_exceptions[r->int_no]);
 		struct proc *proc = proc_current();
-		if (proc)
+		printf("%s Exception at 0x%x, exiting!\n", isr_exceptions[r->int_no], r->eip);
+		if (proc) {
+			printf("\t-> Exception occurred in %s at addr 0x%x\n", proc->name,
+			       r->eip - proc->entry);
 			proc_exit(proc, 1);
-		else
+		} else {
 			__asm__ volatile("cli\nhlt");
+		}
 		proc_yield(r);
 	} else {
 		// Execute fault handler if exists
diff --git a/kernel/features/load.c b/kernel/features/load.c
index f79e6b4..9024c82 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -12,6 +12,7 @@ void proc_load(struct proc *proc, void *data)
 	proc->regs.ebp = (u32)stack;
 	proc->regs.useresp = (u32)stack;
 	proc->regs.eip = (u32)data;
+	proc->entry = (u32)data;
 }
 
 int bin_load(const char *path, struct proc *proc)
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 48bde72..35c0fa7 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -162,6 +162,8 @@ void proc_yield(struct regs *r)
 void proc_enable_waiting(u32 id, enum proc_wait_type type)
 {
 	struct proc *proc_bak = proc_current();
+	if (!proc_bak)
+		return;
 
 	struct node *iterator = proc_list->head;
 	while (iterator) {
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index a232f46..272a3ac 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -46,6 +46,7 @@ struct stream {
 
 struct proc {
 	u32 pid;
+	u32 entry;
 	u8 super;
 	char name[32];
 	struct stream streams[4];
diff --git a/kernel/main.c b/kernel/main.c
index 5e236a7..2112541 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -21,15 +21,15 @@ struct vid_info *boot_passed;
 void kernel_main(struct vid_info *vid_info); // Decl
 void kernel_main(struct vid_info *vid_info)
 {
-	heap_init(0x00f00000 + rand());
-
-	boot_passed = vid_info;
-
 	// Serial connection
 	serial_install();
 	serial_print("\nKernel was compiled at " __TIME__ " on " __DATE__ "\n");
 	serial_print("Serial connected.\n");
 
+	heap_init(0x00f00000 + rand());
+
+	boot_passed = vid_info;
+
 	cpu_enable_features();
 	cpu_print();