X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=blobdiff_plain;f=boot%2Fx86%2Fstage3%2Floader.s;h=87598f4b0c93a6d95cbb1aa21dcf6a87723ff1da;hb=da4e7bf5dd2b9448b638255a20ee503b0641e495;hp=2967c6ee7b1d9f00c1d9fb1ef732f02a10c3847e;hpb=e643590fbf5d867cc6f7fb597718a980aa8f72b4;p=nameless-os.git

diff --git a/boot/x86/stage3/loader.s b/boot/x86/stage3/loader.s
index 2967c6e..87598f4 100644
--- a/boot/x86/stage3/loader.s
+++ b/boot/x86/stage3/loader.s
@@ -1,7 +1,9 @@
 bits 16
 cpu 686
-org 0x1800
 
+extern run_kernel
+
+section .text
 %include "../fat32/fat32-structs.s"
 
 %macro print 1
@@ -11,7 +13,11 @@ org 0x1800
 	pop si
 %endmacro
 
+extern __STACK_BOTTOM__
+
+global _start
 _start:
+	mov sp, __STACK_BOTTOM__
 	mov [BOOT_DRIVE], dl
 	call enable_unreal
 	print begin
@@ -55,15 +61,24 @@ _start:
 	pop si
 	pop cx
 	print kernel_found
+	mov eax, [es:di+dir_entry.filesize]
+	mov [KERNEL_SIZE], eax
 	mov ax, [es:di+dir_entry.firstclushi]
 	shl eax, 16
-	mov ax, [es:di+(dir_entry.firstcluslo)]
+	mov ax, [es:di+dir_entry.firstcluslo]
 	call print_dword
 	mov edi, 0x100000
 	print kernel_loading
 	call read_clus_chain_unreal ; load kernel
 	print kernel_loaded
 	
+	call get_e820_map
+	mov ebx, ecx
+	mov eax, 24
+	mul ecx
+	add eax, 20
+	sub sp, ax
+
 	cli
 	lgdt [gdt]
 	mov eax, cr0
@@ -145,15 +160,16 @@ memcpy:
 	pop esi
 	ret
 
-
 %include "unreal.s"
 %include "a20.s"
 %include "../fat32/fat32.s"
 %include "gdt.s"
 %include "print.s"
+%include "e820.s"
 
-in_protected:
 bits 32
+section .text
+in_protected:
 	mov ax, 0x10
 	mov ds, ax
 	mov es, ax
@@ -161,14 +177,18 @@ bits 32
 	mov fs, ax
 	mov gs, ax
 
-	call load_paging_structs
-	call enable_paging
+	push dword [KERNEL_SIZE]
+	push 0x100000
+	push ebx
+	push edi
+	call run_kernel
 
-	call 0xc0000000
-	hlt
-	jmp $-1
+section .bss
+KERNEL_SIZE: resd 1
+
+section .rodata
 
-kernel_name: db "KERNEL  BIN"
+kernel_name: db "KERNEL  ELF"
 begin: db "Nameless Bootloader revision ", GIT_REVISION, 0xd, 0xa, 0
 a20_enabled: db "A20 has been enabled", 0xd, 0xa, "Searching for kernel...", 0xd, 0xa, 0
 a20_fail: db "Failed to enable A20, giving up!", 0xd, 0xa, 0
@@ -176,7 +196,7 @@ crit_err: db "A critical error occurred, dumping registers now: ", 0xd, 0xa, 0
 kernel_found: db "Found kernel at cluster ", 0
 kernel_loading: db 0xd, 0xa, "Loading kernel...", 0xd, 0xa, 0
 kernel_loaded: db "Kernel successfully loaded.", 0xd, 0xa, "Setting up kernel environment and running kernel...", 0xd, 0xa, 0
-missing_kernel: db "Could not find KERNEL.BIN", 0xd, 0xa, 0
+missing_kernel: db "Could not find KERNEL.ELF", 0xd, 0xa, 0
 eax_s: db "EAX: ", 0
 ebx_s: db "EBX: ", 0
 ecx_s: db "ECX: ", 0
@@ -190,5 +210,3 @@ ss_s: db "SS: ", 0
 space: db " ", 0
 hex_delm: db "0x", 0
 newline: db 0xd, 0xa, 0
-
-%include "paging.s"