diff options
| author | Elizabeth Alexander Hunt <me@liz.coffee> | 2026-10-11 14:22:26 -0700 |
|---|---|---|
| committer | Elizabeth Alexander Hunt <me@liz.coffee> | 2026-10-11 14:27:23 -0700 |
| commit | 7c870e6eabd53f7a8cb0c9b5ecb477797b4de09a (patch) | |
| tree | 9c52c9ffb4f036ffcbeb785b8ed2b8bd0dfbf61a /src/boot.asm | |
| parent | c74bd1baa844eac1fcb17a266ef720ed0c1ae616 (diff) | |
| download | macaroni-7c870e6eabd53f7a8cb0c9b5ecb477797b4de09a.tar.gz macaroni-7c870e6eabd53f7a8cb0c9b5ecb477797b4de09a.zip | |
Diffstat (limited to 'src/boot.asm')
| -rw-r--r-- | src/boot.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/boot.asm b/src/boot.asm index e723d61..3d25240 100644 --- a/src/boot.asm +++ b/src/boot.asm @@ -1,4 +1,4 @@ -;> The Multiboot header must be contained completely within the first 8192 bytes of the OS +;> The Multiboot header must be contained completely within the first 8192 bytes of the OS ;> image, and must be longword (32-bit) aligned. MULTIBOOT_ALIGN_TO_PAGE: equ 1 << 0 MULTIBOOT_MEMORY_DESCRIBE: equ 1 << 1 @@ -9,7 +9,7 @@ MULTIBOOT_CHECKSUM: equ -(MULTIBOOT_MAGIC + MULTIBOOT_FLAGS) MULTIBOOT_VIDEO_TYPE: equ 0 MULTIBOOT_GODS_WIDTH: equ 640 MULTIBOOT_GODS_HEIGHT: equ 480 -MULTIBOOT_VIDEO_BPP: equ 16 +MULTIBOOT_VIDEO_BPP: equ 24 ; We don't set flags[16] because we assemble to ELF32 so header_addr, etc is useless to us ; (at least at the moment). @@ -39,6 +39,8 @@ section .text global _start:function (_start.end - _start) _start: mov esp, stack_top + push ebx + push eax extern cmain call cmain cli |