Fixes :)

kernel/kernel/SSP.cpp

@@ -9,10 +9,14 @@
 #endif
  
 uintptr_t __stack_chk_guard = STACK_CHK_GUARD;
- 
+
+__BEGIN_DECLS
+
 __attribute__((noreturn))
 void __stack_chk_fail(void)
 {
 	printf("Stack smashing detected\n");
 	abort();
-}
+}
+
+__END_DECLS

kernel/kernel/kernel.cpp

@@ -1,60 +1,43 @@
 #include <kernel/GDT.h>
 #include <kernel/kmalloc.h>
+#include <kernel/multiboot.h>
 #include <kernel/panic.h>
 #include <kernel/tty.h>
+#include <kernel/kprint.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #define DISABLE_INTERRUPTS() asm volatile("cli")
 #define ENABLE_INTERRUPTS() asm volatile("sti")
 
-// https://www.gnu.org/software/grub/manual/multiboot/multiboot.html#Boot-information-format
-struct multiboot_info_t
-{
-	uint32_t flags;
-	uint32_t mem_lower;
-	uint32_t mem_upper;
-	uint32_t boot_device;
-	uint32_t cmdline;
-	uint32_t mods_count;
-	uint32_t mods_addr;
-	uint32_t syms[4];
-	uint32_t mmap_length;
-	uint32_t mmap_addr;
-	uint32_t drives_length;
-	uint32_t drives_addr;
-	uint32_t config_table;
-	uint32_t boot_loader_name;
-	uint32_t apm_table;
-	uint32_t vbe_control_info;
-	uint32_t vbe_mode_info;
-	uint16_t vbe_mode;
-	uint16_t vbe_interface_seg;
-	uint16_t vbe_interface_off;
-	uint16_t vbe_interface_len;
-	uint8_t framebuffer[22];
-#if 1
-	uint8_t  color_info[6];
-#endif
-} __attribute__((packed));
+multiboot_info_t* s_multiboot_info;
 
 extern "C"
 void kernel_main(multiboot_info_t* mbi, uint32_t magic)
 {
 	DISABLE_INTERRUPTS();
 
+	s_multiboot_info = mbi;
+
 	terminal_initialize();
 
 	if (magic != 0x2BADB002)
 		Kernel::panic("Invalid magic in multiboot");
-	if (mbi->flags & 0b00100000)
+
+	if (!(mbi->flags & (1 << 6)))
+		Kernel::panic("Bootloader did not provide memory map");
+
+	for (uint32_t i = 0; i < mbi->mmap_length;)
 	{
-		printf("mmap_length: %d\n", mbi->mmap_length);
-		printf("mmap_addr:   %p\n", mbi->mmap_addr);
+		multiboot_memory_map_t* mmmt = (multiboot_memory_map_t*)(mbi->mmap_addr + i);
+		if (mmmt->type == 1)
+			kprint("Size: {}, Addr: {}, Length: {}, Type: {}\n", mmmt->size, (void*)mmmt->base_addr, (void*)mmmt->length, mmmt->type);
+
+		i += mmmt->size + sizeof(uint32_t);
 	}
 
 	printf("Hello from the kernel!\n");
 
+	kprint("Hello from the kernel!\n");
 }

kernel/kernel/panic.cpp

@@ -1,5 +1,5 @@
 #include <kernel/panic.h>
-#include <kernel/tty.h>
+#include <kernel/kprint.h>
 
 namespace Kernel
 {
@@ -7,8 +7,7 @@ namespace Kernel
 	__attribute__((__noreturn__))
 	void panic(const char* message)
 	{
-		terminal_writestring("Kernel panic: ");
-		terminal_writestring(message);
+		kprint("Kernel panic: {}", message);
 		asm volatile("hlt");
 		__builtin_unreachable();
 	}