diff options
| author | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-17 14:19:40 -0400 |
|---|---|---|
| committer | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-17 14:19:40 -0400 |
| commit | 7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6 (patch) | |
| tree | e99684b87952bded5e51c83848a5d35ab53d9ab0 /kernel/entry.S | |
| parent | starting on ata (diff) | |
| parent | clang 18 in flake instead of zig (diff) | |
| download | comus-7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6.tar.gz comus-7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6.tar.bz2 comus-7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6.zip | |
Merge branch 'main' into ata
Diffstat (limited to 'kernel/entry.S')
| -rw-r--r-- | kernel/entry.S | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/entry.S b/kernel/entry.S index 997e400..0610495 100644 --- a/kernel/entry.S +++ b/kernel/entry.S @@ -9,15 +9,26 @@ .extern GDT .section .multiboot - .align 8 # multiboot header mb_start: + .align 8 # magic .long 0xe85250d6 .long 0 .long mb_end - mb_start .long 0x100000000 - (0xe85250d6 + (mb_end - mb_start)) +mbi_start: + .align 8 + # info request + .short 1 + .short 1 + .long mbi_end - mbi_start + .long 1 # cmdline + .long 6 # mmap + .long 9 # elf section +mbi_end: + .align 8 # null .short 0 .short 0 |