multiboot2的头从multiboot.S挪到multiboot2_header.c里用C代码编写

diff --git a/boot/multiboot.S b/boot/multiboot.S
index fa76874c9d7326dd851b1e2bd68d29ef4ccc2adf..839b2f308fc9d4f37e0e1cfe3c7a921067cb6037 100644 (file)
--- a/boot/multiboot.S
+++ b/boot/multiboot.S
@@ -17,6 +17,7 @@
 #include "boot.h"
 #include "system.h"
 #include "task.h"
+
 .global kernel_entry
 .global main
 .extern check_kernel
@@ -77,9 +78,9 @@ real_kernel_entry:
     # 准备切保护模式
     # 此时esp的地址还需要再调整一下
     addl    $KRNLADDR, %esp
-    ljmp    $0x08,$Label+KRNLADDR
+    ljmp    $0x08,$p_label+KRNLADDR
 
-Label:
+p_label:
     leal    check_kernel, %eax
     call    *%eax
 
@@ -99,74 +100,12 @@ die:
 
 .align 32
 boot_gdt:
-EMPT: .long    0x00000000, 0x00000000
-Code: .long    0x0000FFFF, 0x00CF9B00
-Data: .long    0x0000FFFF, 0x00CF9300
+empty: .long    0x00000000, 0x00000000
+code_desc: .long    0x0000FFFF, 0x00CF9B00
+data_desc: .long    0x0000FFFF, 0x00CF9300
 boot_gdt_end:
 boot_gdtr:
     boot_gdtr_limit: .word boot_gdt_end-boot_gdt
     boot_gdtr_base:  .long boot_gdt
 
     .comm stack, MULTIBOOT_STACK_SIZE
-
-
-
-.section .multiboot2_header
-# An OS image must contain an additional header called Multiboot2 header,
-# besides the headers of the format used by the OS image.
-# The Multiboot2 header must be contained completely within the first 32768 bytes of the OS image,
-# and must be 64-bit aligned.
-# In general, it should come as early as possible,
-# and may be embedded in the beginning of the text segment after the real executable header.
-# 64-bit 对齐 就是 8 字节对齐
-.align 8
-multiboot2_header_bgn:
-    # magic
-    .long MULTIBOOT2_HEADER_MAGIC
-    # ISA: i386
-    .long MULTIBOOT_ARCHITECTURE_I386
-    # header length
-    .long multiboot2_header_end - multiboot2_header_bgn
-    # checksum
-    .long   -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot2_header_end - multiboot2_header_bgn))
-
-#if 1
-    /* === Framebuffer Tag === */
-    .align 8
-    .framebuffer_tag_bgn:
-    .short MULTIBOOT_HEADER_TAG_FRAMEBUFFER
-    .short MULTIBOOT_HEADER_TAG_OPTIONAL
-    .long .framebuffer_tag_end - .framebuffer_tag_bgn
-
-    # width
-    # Contains the number of the columns. This is specified in pixels in a graphics mode,
-    # and in characters in a text mode.
-    # The value zero indicates that the OS image has no preference.
-    .long 0
-
-    # height
-    # Contains the number of the lines. This is specified in pixels in a graphics mode,
-    # and in characters in a text mode.
-    # The value zero indicates that the OS image has no preference.
-    .long 0
-
-    # depth
-    # Contains the number of bits per pixel in a graphics mode, and zero in a text mode.
-    # The value zero indicates that the OS image has no preference.
-    .long 0
-
-    .framebuffer_tag_end:
-#endif
-    // // .align 2
-    // .multiboot2_header_tag_module:
-    // .short MULTIBOOT_HEADER_TAG_MODULE_ALIGN
-    // .short 0
-    // .long  8
-    // .long 0
-
-    .align 8
-    .multiboot2_tag_end:
-    .short MULTIBOOT_HEADER_TAG_END
-    .short 0
-    .long  8
-multiboot2_header_end:

diff --git a/boot/multiboot2_header.c b/boot/multiboot2_header.c
new file mode 100644 (file)
index 0000000..b493c3a
--- /dev/null
+++ b/boot/multiboot2_header.c
@@ -0,0 +1,55 @@
+/*
+ * ------------------------------------------------------------------------
+ *   File Name: multiboot2_header.c
+ *      Author: Zhao Yanbai
+ *              2025-12-30 08:48:35 Tuesday CST
+ * Description: none
+ * ------------------------------------------------------------------------
+ */
+
+
+
+ #include <multiboot2.h>
+
+
+ #define ENABLE_FB 0
+
+ #define ALIGN8 __attribute__((aligned(8)))
+
+ typedef struct ALIGN8 multiboot2_elf_header {
+    ALIGN8 struct multiboot_header header;
+#if ENABLE_FB
+    ALIGN8 struct multiboot_header_tag_framebuffer fb;
+#endif
+    ALIGN8 struct multiboot_header_tag end;
+ } multiboot2_bin_header_t;
+
+
+
+ __attribute__((section(".multiboot2_header"), used))
+ const multiboot2_bin_header_t multiboot2_elf_header = {
+    .header = {
+        .magic = MULTIBOOT2_HEADER_MAGIC,
+        .architecture = MULTIBOOT_ARCHITECTURE_I386,
+        .header_length = sizeof(multiboot2_bin_header_t),
+        .checksum = -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + sizeof(multiboot2_bin_header_t)),
+    },
+#if ENABLE_FB
+    .fb = {
+        .type = MULTIBOOT_HEADER_TAG_FRAMEBUFFER,
+        .flags = MULTIBOOT_HEADER_TAG_OPTIONAL,
+        .size = sizeof(struct multiboot_header_tag_framebuffer),
+        .width = 0,
+        .height = 0,
+        .depth = 0,
+    },
+#endif
+    .end = {
+        // tags are terminated by a tag of type ‘0’ and size ‘8’.
+        // MULTIBOOT_HEADER_TAG_END == 0
+        // sizeof(struct multiboot_header_tag) == 8
+        .type = MULTIBOOT_HEADER_TAG_END,
+        .flags = 0,
+        .size = sizeof(struct multiboot_header_tag),
+    },
+ };