aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@ost.ch>2023-10-11 10:24:38 +0200
committerFelix Morgner <felix.morgner@ost.ch>2023-10-11 10:24:38 +0200
commitf47bee5f51a73593d3594940663f56f2427f480b (patch)
tree202f03086a7ee8d7d55d090c3a822c53a98b7d90
parent649eb315d2b629166263e5655609518fc8da528f (diff)
downloadteachos-f47bee5f51a73593d3594940663f56f2427f480b.tar.xz
teachos-f47bee5f51a73593d3594940663f56f2427f480b.zip
x86_64: multiboot: fix header and tag alignment
-rw-r--r--source/boot/arch/x86_64/src/multiboot.s19
1 files changed, 14 insertions, 5 deletions
diff --git a/source/boot/arch/x86_64/src/multiboot.s b/source/boot/arch/x86_64/src/multiboot.s
index 207a639..7ccca56 100644
--- a/source/boot/arch/x86_64/src/multiboot.s
+++ b/source/boot/arch/x86_64/src/multiboot.s
@@ -1,5 +1,5 @@
.section .boot_mbh, "a"
-.align 64
+.align 8
multiboot_header_start:
.Lmagic:
@@ -10,8 +10,17 @@ multiboot_header_start:
.long multiboot_header_end - multiboot_header_start
.Lchecksum:
.long 0x100000000 - (0xe85250d6 + 0 + (multiboot_header_end - multiboot_header_start))
-.Lend:
- .int 0
- .int 0
- .long 8
+.align 8
+.Lflags_start:
+ .word 4
+ .word 1
+ .long .Lflags_end - .Lflags_start
+ .long 3
+.Lflags_end:
+.align 8
+.Lend_start:
+ .word 0
+ .word 0
+ .long .Lend_end - .Lend_start
+.Lend_end:
multiboot_header_end: