6 files changed, 63 insertions, 64 deletions

diff --git a/src/kernel/fs/elf.h b/src/kernel/fs/elf.h
index 5a412fb..5088962 100644
--- a/src/kernel/fs/elf.h
+++ b/src/kernel/fs/elf.h
@@ -8,44 +8,44 @@ typedef struct {
 } elf_priv_data;
 
 typedef struct {
-	unsigned char e_ident[16];
-	uint16_t e_type;
-	uint16_t e_machine;
-	uint32_t e_version;
-	uint32_t e_entry;
-	uint32_t e_phoff;
-	uint32_t e_shoff;
-	uint32_t e_flags;
-	uint16_t e_ehsize;
-	uint16_t e_phentsize;
-	uint16_t e_phnum;
-	uint16_t e_shentsize;
-	uint16_t e_shnum;
-	uint16_t e_shstrndx;
+	uint8_t ident[16];
+	uint16_t type;
+	uint16_t machine;
+	uint32_t version;
+	uint32_t entry;
+	uint32_t phoff;
+	uint32_t shoff;
+	uint32_t flags;
+	uint16_t ehsize;
+	uint16_t phentsize;
+	uint16_t phnum;
+	uint16_t shentsize;
+	uint16_t shnum;
+	uint16_t shstrndx;
 } elf_header_t;
 
 typedef struct {
-	uint32_t sh_name;
-	uint32_t sh_type;
-	uint32_t sh_flags;
-	uint32_t sh_addr;
-	uint32_t sh_offset;
-	uint32_t sh_size;
-	uint32_t sh_link;
-	uint32_t sh_info;
-	uint32_t sh_addralign;
-	uint32_t sh_entsize;
+	uint32_t name;
+	uint32_t type;
+	uint32_t flags;
+	uint32_t addr;
+	uint32_t offset;
+	uint32_t size;
+	uint32_t link;
+	uint32_t info;
+	uint32_t addralign;
+	uint32_t entsize;
 } elf_section_header_t;
 
 typedef struct {
-	uint32_t p_type;
-	uint32_t p_offset;
-	uint32_t p_vaddr;
-	uint32_t p_paddr;
-	uint32_t p_filesz;
-	uint32_t p_memsz;
-	uint32_t p_flags;
-	uint32_t p_align;
+	uint32_t type;
+	uint32_t offset;
+	uint32_t vaddr;
+	uint32_t paddr;
+	uint32_t filesz;
+	uint32_t memsz;
+	uint32_t flags;
+	uint32_t align;
 } elf_program_header_t;
 
 void elf_init();
diff --git a/src/kernel/fs/elfloader.c b/src/kernel/fs/elfloader.c
index 8b80553..118a882 100644
--- a/src/kernel/fs/elfloader.c
+++ b/src/kernel/fs/elfloader.c
@@ -1,3 +1,4 @@
+#include <kernel/system.h>
 #include <kernel/fs/elf.h>
 #include <kernel/lib/stdio.h>
 #include <kernel/memory/alloc.h>
@@ -5,15 +6,13 @@
 #include <kernel/memory/paging.h>
 #include "load.h"
 
-elf_priv_data *elf_probe(uint8_t *buf)
+int elf_probe(uint8_t *buf)
 {
 	elf_header_t *header = (elf_header_t *)buf;
-	/* The first four bytes are 0x7f and 'ELF' */
-	if (header->e_ident[0] == 0x7f && header->e_ident[1] == 'E' && header->e_ident[2] == 'L' &&
-	    header->e_ident[3] == 'F') {
-		/* Valid ELF! */
+	if (header->ident[0] == 0x7f && header->ident[1] == 'E' && header->ident[2] == 'L' &&
+	    header->ident[3] == 'F') {
 		serial_printf("Buffer is valid ELF file!");
-		return (void *)1;
+		return 1;
 	}
 	return 0;
 }
@@ -21,36 +20,35 @@ elf_priv_data *elf_probe(uint8_t *buf)
 uint8_t elf_start(uint8_t *buf)
 {
 	elf_header_t *header = (elf_header_t *)buf;
-	serial_printf("Type: %s%s%s", header->e_ident[4] == 1 ? "32bit " : "64 bit",
-		      header->e_ident[5] == 1 ? "Little Endian " : "Big endian ",
-		      header->e_ident[6] == 1 ? "True ELF " : "buggy ELF ");
-	if (header->e_type != 2) {
+	serial_printf("Type: %s%s%s", header->ident[4] == 1 ? "32bit " : "64 bit",
+		      header->ident[5] == 1 ? "Little Endian " : "Big endian ",
+		      header->ident[6] == 1 ? "True ELF " : "buggy ELF ");
+	if (header->type != 2) {
 		serial_printf("File is not executable!");
 		return 0;
 	}
-	/* Map the virtual space */
+
 	uint32_t phys_loc = loader_get_unused_load_location();
-	uint32_t cr3 = kmalloc(4096);
-	/* Find first program header and loop through them */
-	elf_program_header_t *ph = (elf_program_header_t *)(buf + header->e_phoff);
-	for (int i = 0; i < header->e_phnum; i++, ph++) {
-		switch (ph->p_type) {
-		case 0: /* NULL */
+	elf_program_header_t *ph = (elf_program_header_t *)(buf + header->phoff);
+	for (int i = 0; i < header->phnum; i++, ph++) {
+		switch (ph->type) {
+		case 0:
 			break;
-		case 1: /* LOAD */
+		case 1:
 			serial_printf(
 				"LOAD: offset 0x%x vaddr 0x%x paddr 0x%x filesz 0x%x memsz 0x%x",
-				ph->p_offset, ph->p_vaddr, ph->p_paddr, ph->p_filesz, ph->p_memsz);
-			paging_map(phys_loc, ph->p_vaddr, PT_PRESENT | PT_RW | PT_USED);
-			memcpy(ph->p_vaddr, buf + ph->p_offset, ph->p_filesz);
+				ph->offset, ph->vaddr, ph->paddr, ph->filesz, ph->memsz);
+			paging_map(phys_loc, ph->vaddr, PT_PRESENT | PT_RW | PT_USED);
+			halt_loop();
+			memcpy((void *)ph->vaddr, buf + ph->offset, ph->filesz);
 			break;
-		default: /* @TODO add more */
-			serial_printf("Unsupported p_type! Bail out!");
+		default:
+			serial_printf("Unsupported type! Bail out!");
 			return 0;
 		}
 	}
 
-	return 0; //START("elf32", header->e_entry);
+	return 0;
 }
 
 void elf_init()
@@ -60,5 +58,4 @@ void elf_init()
 	elfloader->probe = (void *)elf_probe;
 	elfloader->start = (void *)elf_start;
 	register_loader(elfloader);
-	// _kill();
-}
\ No newline at end of file
+}
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index 7227f9b..9eaa556 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -50,7 +50,6 @@ void loader_init()
 	serial_printf("Setting up loader");
 	loaders = (loader_t **)kmalloc(MAX_LOADERS * sizeof(uint32_t));
 	memset(loaders, 0, MAX_LOADERS * sizeof(uint32_t));
-	// _kill();
 }
 
 void register_loader(loader_t *load)
@@ -81,4 +80,4 @@ uint8_t exec_start(uint8_t *buf)
 		}
 	}
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index da57da1..45a68d9 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -181,8 +181,9 @@ void set_optimal_resolution()
 		// Everything else failed :(
 		if (highest == 0)
 			switch_to_vga();
-	} else
+	} else {
 		vga_log("Mode detection succeeded");
+	}
 
 	vbe_set_mode(highest);
 
@@ -193,7 +194,6 @@ void set_optimal_resolution()
 		paging_map((uint32_t)cursor_buffer + z, (uint32_t)cursor_buffer + z,
 			   PT_PRESENT | PT_RW | PT_USED);
 	}
-	serial_printf("0x%x", fb);
 
 	if (vbe_height > 1440)
 		vesa_set_font(32);
@@ -375,4 +375,4 @@ void vesa_set_color(uint32_t color)
 {
 	vesa_convert_color(terminal_color, color);
 	vesa_convert_color(terminal_background, default_background_color);
-}
\ No newline at end of file
+}
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c
index f9e0054..9ffd330 100644
--- a/src/kernel/lib/memory.c
+++ b/src/kernel/lib/memory.c
@@ -66,4 +66,4 @@ uint32_t memory_get_free()
 uint32_t memory_get_all()
 {
 	return total_memory;
-}
\ No newline at end of file
+}
diff --git a/src/kernel/system.h b/src/kernel/system.h
index 4fc820f..062a880 100644
--- a/src/kernel/system.h
+++ b/src/kernel/system.h
@@ -1,6 +1,9 @@
 #ifndef MELVIX_SYSTEM_H
 #define MELVIX_SYSTEM_H
 
+#include <stdint.h>
+#include <stddef.h>
+
 /**
  * The kernel end
  */