12 files changed, 282 insertions, 36 deletions

diff --git a/src/kernel/acpi/acpi.c b/src/kernel/acpi/acpi.c
index 57ecc58..e129a95 100644
--- a/src/kernel/acpi/acpi.c
+++ b/src/kernel/acpi/acpi.c
@@ -166,10 +166,10 @@ int acpi_install()
 			}
 			if (memcmp((unsigned int *)*ptr, "HPET", 4) == 0) {
 				hpet = (struct HPET *)*ptr;
-				serial_printf("%c%c%c%c", hpet->signature[0], hpet->signature[1],
-					      hpet->signature[2], hpet->signature[3]);
-				serial_printf("%d", hpet->legacy_replacement);
-				serial_printf("%d", hpet->address.address);
+				//serial_printf("%c%c%c%c", hpet->signature[0], hpet->signature[1],
+				//hpet->signature[2], hpet->signature[3]);
+				//serial_printf("%d", hpet->legacy_replacement);
+				//serial_printf("%d", hpet->address.address);
 			}
 			ptr++;
 		} // Else: no valid FADT present
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 06411ea..968a824 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -1,3 +1,15 @@
+%define ALIGN    1 ; Align loaded modules on page boundaries
+%define MEMINFO  2 ; Provide memory map
+%define FLAGS    3 ; Flags (ALIGN | MEMINFO)
+%define MAGIC    0x1BADB002
+%define CHECKSUM -(MAGIC + FLAGS)
+
+section .multiboot
+    align 4
+    dd MAGIC
+    dd FLAGS
+    dd CHECKSUM
+
 section .start_section
     dd _start
 
@@ -15,7 +27,9 @@ section .text
     global _start
     extern kernel_main
     _start:
-        push esp
+        mov esp, STACK_TOP
+        push ebx
+        push eax
         cli
         call kernel_main
         cli
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index b717e4f..49d31e1 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -13,8 +13,7 @@ void load_binaries()
 	userspace = (uint32_t)kmalloc(10000);
 	font = (struct font *)kmalloc(100000); // High quality shit
 
-	uint8_t boot_drive_id = (uint8_t)(*((uint8_t *)0x9000));
-	if (boot_drive_id != 0xE0) {
+	if (multiboot_header->boot_device != 0xE0FFFFFF) {
 		struct ata_interface *primary_master = new_ata(1, 0x1F0);
 		marfs_init(primary_master);
 		marfs_read_whole_file(4, (uint8_t *)userspace);
@@ -33,6 +32,11 @@ void load_binaries()
 			panic("Userspace binary not found!");
 		ATAPI_granular_read(1 + (user_e->length / 2048), user_e->lba, (uint8_t *)userspace);
 		kfree(user_e);
+
+		if (font->magic != 0xf0f0f0f0) {
+			serial_printf("0x%x: WRONG FONT MAGIC!", font->magic);
+			halt_loop();
+		}
 	}
 	vga_log("Successfully loaded binaries");
 }
\ No newline at end of file
diff --git a/src/kernel/fs/load.h b/src/kernel/fs/load.h
index 3730b0b..d4833ce 100644
--- a/src/kernel/fs/load.h
+++ b/src/kernel/fs/load.h
@@ -12,6 +12,7 @@ struct font {
 	uint16_t font_24[758][24];
 	uint8_t font_16[758][16];
 	uint16_t cursor[19];
+	uint32_t magic;
 };
 
 void load_binaries();
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 80439bc..d06ea4d 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -1,3 +1,4 @@
+#include <kernel/multiboot.h>
 #include <kernel/graphics/vesa.h>
 #include <kernel/gdt/gdt.h>
 #include <kernel/interrupts/interrupts.h>
@@ -15,20 +16,24 @@
 #include <kernel/fs/elf.h>
 #include <kernel/lib/stdio.h>
 
-void kernel_main(uint32_t initial_stack)
+void kernel_main(uint32_t magic, multiboot_info_t *grub_header)
 {
-	initial_esp = initial_stack;
+	if (magic != MULTIBOOT_BOOTLOADER_MAGIC) {
+		vga_log("Invalid boot magic!");
+		halt_loop();
+	}
 	vga_log("Installing basic features of Melvix...");
 
 	// Install features
-	memory_init();
 	gdt_install();
 	init_serial();
 	acpi_install();
 	idt_install();
 	isrs_install();
 	irq_install();
+	memory_init(grub_header);
 	paging_install();
+	memory_print();
 
 	load_binaries();
 	set_optimal_resolution();
@@ -49,6 +54,7 @@ void kernel_main(uint32_t initial_stack)
 
 	// Print total memory
 	info("Total memory found: %dMiB", (memory_get_all() >> 10) + 1);
+	serial_printf("Total memory found: %dMiB", (memory_get_all() >> 10) + 1);
 
 #ifdef INSTALL_MELVIX
 #include <kernel/fs/install.h>
@@ -57,12 +63,12 @@ void kernel_main(uint32_t initial_stack)
 		install_melvix();
 #endif
 
-	load_elf((char *)userspace);
+	// load_elf((char *)userspace);
 
 	// syscalls_install();
 	// exec(userspace);
 
-	panic("This should NOT happen!");
+	// panic("This should NOT happen!");
 
 	// asm ("div %0" :: "r"(0)); // Exception testing x/0
 }
\ No newline at end of file
diff --git a/src/kernel/lib/lib.h b/src/kernel/lib/lib.h
index b2b7056..ae8ee9c 100644
--- a/src/kernel/lib/lib.h
+++ b/src/kernel/lib/lib.h
@@ -3,6 +3,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <kernel/multiboot.h>
 
 /**
  * Copy n data from src to dest
@@ -31,7 +32,9 @@ void *memset(void *dest, char val, size_t count);
  */
 int memcmp(const void *a_ptr, const void *b_ptr, size_t size);
 
-void memory_init();
+void memory_init(multiboot_info_t *grub_header);
+
+void memory_print();
 
 uint32_t memory_get_all();
 
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c
index f9e0054..4763ca0 100644
--- a/src/kernel/lib/memory.c
+++ b/src/kernel/lib/memory.c
@@ -1,5 +1,9 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <kernel/system.h>
+#include <kernel/lib/stdio.h>
+#include <kernel/memory/paging.h>
+#include <kernel/multiboot.h>
 
 void *memcpy(void *dest, const void *src, size_t count)
 {
@@ -31,39 +35,29 @@ int memcmp(const void *a_ptr, const void *b_ptr, size_t size)
 	return 0;
 }
 
-uint32_t total_memory;
+multiboot_info_t *multiboot_header;
 
-struct memory_entry {
-	uint64_t base;
-	uint64_t length;
-	uint32_t type;
-} __attribute__((packed));
-
-struct memory_entry *memory_get_entries()
+void memory_print()
 {
-	return (struct memory_entry *)0xA000;
+	if (multiboot_header->flags & MULTIBOOT_INFO_MEMORY) {
+		serial_printf("Mem lower: 0x%x", multiboot_header->mem_lower);
+		serial_printf("Mem upper: 0x%x", multiboot_header->mem_upper);
+	} else {
+		serial_printf("No memory information available!");
+	}
 }
 
-void memory_init()
+void memory_init(multiboot_info_t *grub_header)
 {
-	uint64_t max_base = 0;
-	uint64_t max_length = 0;
-	for (struct memory_entry *i = memory_get_entries(); i->type; i++) {
-		if (i->type == 1 && i->base > max_base) {
-			max_base = i->base;
-			max_length = i->length;
-		}
-	}
-	total_memory = (uint32_t)(max_base + max_length);
-	total_memory /= 1024;
+	multiboot_header = grub_header;
 }
 
 uint32_t memory_get_free()
 {
-	return total_memory; // - paging_get_used_pages() * 4;
+	return multiboot_header->mem_upper - paging_get_used_pages() * 4;
 }
 
 uint32_t memory_get_all()
 {
-	return total_memory;
+	return multiboot_header->mem_upper;
 }
\ No newline at end of file
diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld
index 50edc46..ff04c17 100644
--- a/src/kernel/linker.ld
+++ b/src/kernel/linker.ld
@@ -4,6 +4,7 @@ SECTIONS {
 	. = 1M;
 
 	.text BLOCK(4K) : ALIGN(4K) {
+		*(.multiboot)
 		*(.start_section)
 		*(.text)
 	}
diff --git a/src/kernel/memory/paging.c b/src/kernel/memory/paging.c
index a29d7db..8b5de59 100644
--- a/src/kernel/memory/paging.c
+++ b/src/kernel/memory/paging.c
@@ -2,6 +2,7 @@
 #include <kernel/memory/paging.h>
 #include <kernel/system.h>
 #include <kernel/lib/lib.h>
+#include <kernel/io/io.h>
 
 int paging_enabled = 0;
 
@@ -40,7 +41,6 @@ void paging_install()
 	paging_set_used(0, ((uint32_t)ASM_KERNEL_END >> 12) + 1); // /4096
 
 	paging_enable();
-
 	vga_log("Installed paging");
 }
 
diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h
new file mode 100644
index 0000000..5a98a00
--- /dev/null
+++ b/src/kernel/multiboot.h
@@ -0,0 +1,216 @@
+/* multiboot.h - Multiboot header file. */
+/* Copyright (C) 1999,2003,2007,2008,2009  Free Software Foundation, Inc.
+  *
+  *  Permission is hereby granted, free of charge, to any person obtaining a copy
+  *  of this software and associated documentation files (the "Software"), to
+  *  deal in the Software without restriction, including without limitation the
+  *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  *  sell copies of the Software, and to permit persons to whom the Software is
+  *  furnished to do so, subject to the following conditions:
+  *
+  *  The above copyright notice and this permission notice shall be included in
+  *  all copies or substantial portions of the Software.
+  *
+  *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+  *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+  *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  */
+
+#ifndef MULTIBOOT_HEADER
+#define MULTIBOOT_HEADER 1
+
+/* How many bytes from the start of the file we search for the header. */
+#define MULTIBOOT_SEARCH 8192
+
+/* The magic field should contain this. */
+#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
+
+/* This should be in %eax. */
+#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
+
+/* The bits in the required part of flags field we don't support. */
+#define MULTIBOOT_UNSUPPORTED 0x0000fffc
+
+/* Alignment of multiboot modules. */
+#define MULTIBOOT_MOD_ALIGN 0x00001000
+
+/* Alignment of the multiboot info structure. */
+#define MULTIBOOT_INFO_ALIGN 0x00000004
+
+/* Flags set in the 'flags' member of the multiboot header. */
+
+/* Align all boot modules on i386 page (4KB) boundaries. */
+#define MULTIBOOT_PAGE_ALIGN 0x00000001
+
+/* Must pass memory information to OS. */
+#define MULTIBOOT_MEMORY_INFO 0x00000002
+
+/* Must pass video information to OS. */
+#define MULTIBOOT_VIDEO_MODE 0x00000004
+
+/* This flag indicates the use of the address fields in the header. */
+#define MULTIBOOT_AOUT_KLUDGE 0x00010000
+
+/* Flags to be set in the 'flags' member of the multiboot info structure. */
+
+/* is there basic lower/upper memory information? */
+#define MULTIBOOT_INFO_MEMORY 0x00000001
+/* is there a boot device set? */
+#define MULTIBOOT_INFO_BOOTDEV 0x00000002
+/* is the command-line defined? */
+#define MULTIBOOT_INFO_CMDLINE 0x00000004
+/* are there modules to do something with? */
+#define MULTIBOOT_INFO_MODS 0x00000008
+
+/* These next two are mutually exclusive */
+
+/* is there a symbol table loaded? */
+#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010
+/* is there an ELF section header table? */
+#define MULTIBOOT_INFO_ELF_SHDR 0X00000020
+
+/* is there a full memory map? */
+#define MULTIBOOT_INFO_MEM_MAP 0x00000040
+
+/* Is there drive info? */
+#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080
+
+/* Is there a config table? */
+#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100
+
+/* Is there a boot loader name? */
+#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200
+
+/* Is there a APM table? */
+#define MULTIBOOT_INFO_APM_TABLE 0x00000400
+
+/* Is there video information? */
+#define MULTIBOOT_INFO_VIDEO_INFO 0x00000800
+
+#ifndef ASM_FILE
+
+typedef unsigned short multiboot_uint16_t;
+typedef unsigned int multiboot_uint32_t;
+typedef unsigned long long multiboot_uint64_t;
+
+struct multiboot_header {
+	/* Must be MULTIBOOT_MAGIC - see above. */
+	multiboot_uint32_t magic;
+
+	/* Feature flags. */
+	multiboot_uint32_t flags;
+
+	/* The above fields plus this one must equal 0 mod 2^32. */
+	multiboot_uint32_t checksum;
+
+	/* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
+	multiboot_uint32_t header_addr;
+	multiboot_uint32_t load_addr;
+	multiboot_uint32_t load_end_addr;
+	multiboot_uint32_t bss_end_addr;
+	multiboot_uint32_t entry_addr;
+
+	/* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
+	multiboot_uint32_t mode_type;
+	multiboot_uint32_t width;
+	multiboot_uint32_t height;
+	multiboot_uint32_t depth;
+};
+
+/* The symbol table for a.out. */
+struct multiboot_aout_symbol_table {
+	multiboot_uint32_t tabsize;
+	multiboot_uint32_t strsize;
+	multiboot_uint32_t addr;
+	multiboot_uint32_t reserved;
+};
+typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
+
+/* The section header table for ELF. */
+struct multiboot_elf_section_header_table {
+	multiboot_uint32_t num;
+	multiboot_uint32_t size;
+	multiboot_uint32_t addr;
+	multiboot_uint32_t shndx;
+};
+typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
+
+struct multiboot_info {
+	/* Multiboot info version number */
+	multiboot_uint32_t flags;
+
+	/* Available memory from BIOS */
+	multiboot_uint32_t mem_lower;
+	multiboot_uint32_t mem_upper;
+
+	/* "root" partition */
+	multiboot_uint32_t boot_device;
+
+	/* Kernel command line */
+	multiboot_uint32_t cmdline;
+
+	/* Boot-Module list */
+	multiboot_uint32_t mods_count;
+	multiboot_uint32_t mods_addr;
+
+	union {
+		multiboot_aout_symbol_table_t aout_sym;
+		multiboot_elf_section_header_table_t elf_sec;
+	} u;
+
+	/* Memory Mapping buffer */
+	multiboot_uint32_t mmap_length;
+	multiboot_uint32_t mmap_addr;
+
+	/* Drive Info buffer */
+	multiboot_uint32_t drives_length;
+	multiboot_uint32_t drives_addr;
+
+	/* ROM configuration table */
+	multiboot_uint32_t config_table;
+
+	/* Boot Loader Name */
+	multiboot_uint32_t boot_loader_name;
+
+	/* APM table */
+	multiboot_uint32_t apm_table;
+
+	/* Video */
+	multiboot_uint32_t vbe_control_info;
+	multiboot_uint32_t vbe_mode_info;
+	multiboot_uint16_t vbe_mode;
+	multiboot_uint16_t vbe_interface_seg;
+	multiboot_uint16_t vbe_interface_off;
+	multiboot_uint16_t vbe_interface_len;
+};
+typedef struct multiboot_info multiboot_info_t;
+
+struct multiboot_mmap_entry {
+	multiboot_uint32_t size;
+	multiboot_uint64_t addr;
+	multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE 1
+#define MULTIBOOT_MEMORY_RESERVED 2
+	multiboot_uint32_t type;
+} __attribute__((packed));
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+struct multiboot_mod_list {
+	/* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
+	multiboot_uint32_t mod_start;
+	multiboot_uint32_t mod_end;
+
+	/* Module command line */
+	multiboot_uint32_t cmdline;
+
+	/* padding to take it to 16 bytes (must be zero) */
+	multiboot_uint32_t pad;
+};
+typedef struct multiboot_mod_list multiboot_module_t;
+
+#endif /* ! ASM_FILE */
+
+#endif /* ! MULTIBOOT_HEADER */
\ No newline at end of file
diff --git a/src/kernel/system.c b/src/kernel/system.c
index b58472b..c58949e 100644
--- a/src/kernel/system.c
+++ b/src/kernel/system.c
@@ -28,6 +28,7 @@ void vga_log(char *msg)
 	uint16_t *terminal_buffer = (uint16_t *)0xB8000;
 	for (size_t i = 0; i < strlen(msg); i++)
 		terminal_buffer[line * 80 + i] = (uint16_t)msg[i] | (uint16_t)0x700;
+	serial_printf(msg);
 	char string[80];
 	strcpy(string, "[");
 	strcat(string, itoa((int)get_time()));
diff --git a/src/kernel/system.h b/src/kernel/system.h
index 687649f..90535f6 100644
--- a/src/kernel/system.h
+++ b/src/kernel/system.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <kernel/multiboot.h>
 
 /**
  * The kernel end
@@ -15,6 +16,11 @@ extern void ASM_KERNEL_END();
 uint32_t initial_esp;
 
 /**
+ * Multiboot structure pointer by grub
+ */
+multiboot_info_t *multiboot_header;
+
+/**
  * Initialize the basic features of the OS
  */
 void init();