diff options
| author | Marvin Borner | 2020-04-25 23:53:19 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-25 23:53:19 +0200 |
| commit | 69d08dcb4580f8e544464bf54432ab07a7f58fc6 (patch) | |
| tree | 878d35b5d3e3fac8f1c8e2a043519658d440f350 /src/kernel/boot.asm | |
| parent | f2175ab40a977d15526e7ebc3ad327e3ef825069 (diff) | |
Small cleanup and formatting
Diffstat (limited to 'src/kernel/boot.asm')
| -rw-r--r-- | src/kernel/boot.asm | 115 |
1 files changed, 41 insertions, 74 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index d15bce4..363f76a 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -1,85 +1,52 @@ section .multiboot - header_start: - dd 0xe85250d6 - dd 0 - dd header_end - header_start - dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start)) - - ; Information tag - align 8 - dw 1 - dw 1 - dd 24 - dd 2 ; bootloader name - dd 4 ; meminfo - dd 6 ; mmap - dd 13 ; smbios - - ; Empty tag - align 8 - dw 0 - dw 0 - dd 8 - header_end: + header_start: + dd 0xe85250d6 + dd 0 + dd header_end - header_start + dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start)) + + ; Information tag + align 8 + dw 1 + dw 1 + dd 24 + dd 2 ; bootloader name + dd 4 ; meminfo + dd 6 ; mmap + dd 13 ; smbios + + ; Empty tag + align 8 + dw 0 + dw 0 + dd 8 + header_end: section .start_section - dd _start + dd _start ; Initialize stack section .bss - align 16 - global STACK_BOTTOM - global STACK_TOP + align 16 + global STACK_BOTTOM + global STACK_TOP - STACK_BOTTOM: - resb 0x4000 - STACK_TOP: + STACK_BOTTOM: + resb 0x4000 + STACK_TOP: section .text - global _start - extern kernel_main - _start: - mov esp, STACK_TOP - push ebx - push eax - cli - call kernel_main - cli - jmp $ - - global jump_userspace - jump_userspace: - cli - push ebp - mov ebp, esp - mov edx, dword [esp + 0xC] - mov esp, edx - push 0xABCDEF - - mov ax, 0x23 - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - - mov eax, esp - push 0x23 - push eax - pushf - - ; Enable interrupts - pop eax - or eax, 0x200 - push eax - - push 0x1B - push dword [ebp + 8] - iret - - pop ebp - ret + global _start + extern kernel_main + _start: + mov esp, STACK_TOP + push ebx + push eax + cli + call kernel_main + ; cli + jmp $ section .end_section - global ASM_KERNEL_END - ASM_KERNEL_END: - ; Kernel size detection
\ No newline at end of file + global ASM_KERNEL_END + ASM_KERNEL_END:
\ No newline at end of file |