Add field multiboot2_header_example2.tag_entry_addr

tests/multiboot2_header_example2.h

@@ -8,6 +8,10 @@ static const struct {
 
     struct KernAux_Multiboot2_HTag_Addr tag_addr;
 
+    struct KernAux_Multiboot2_HTag_EntryAddr tag_entry_addr;
+
+    uint8_t _align1[4];
+
     struct KernAux_Multiboot2_HTag_None tag_none;
 } multiboot2_header_example2 = {
     .multiboot2_header = {
@@ -63,6 +67,14 @@ static const struct {
         .load_end_addr = 0,
         .bss_end_addr = 0,
     },
+    .tag_entry_addr = {
+        .base = {
+            .type = KERNAUX_MULTIBOOT2_HTAG_ENTRY_ADDR,
+            .flags = 0,
+            .size = sizeof(multiboot2_header_example2.tag_entry_addr),
+        },
+        .entry_addr = 0,
+    },
     .tag_none = {
         .base = {
             .type = KERNAUX_MULTIBOOT2_HTAG_NONE,

tests/multiboot2_info_example2.h

@@ -6,93 +6,91 @@ static const struct {
         char cmdline[15];
     } tag_boot_cmd_line;
 
-    unsigned char _align1[1];
+    uint8_t _align1[1];
 
     struct {
         struct KernAux_Multiboot2_ITag_BootLoaderName tag;
         char name[22];
     } tag_boot_loader_name;
 
-    unsigned char _align2[2];
+    uint8_t _align2[2];
 
     struct {
         struct KernAux_Multiboot2_ITag_Module tag;
         char cmdline[17];
     } tag_module1;
 
-    unsigned char _align3[7];
+    uint8_t _align3[7];
 
     struct {
         struct KernAux_Multiboot2_ITag_Module tag;
         char cmdline[17];
     } tag_module2;
 
-    unsigned char _align4[7];
+    uint8_t _align4[7];
 
     struct KernAux_Multiboot2_ITag_BasicMemoryInfo tag_basic_memory_info;
 
     struct KernAux_Multiboot2_ITag_BIOSBootDevice tag_bios_boot_device;
 
-    unsigned char _align5[4];
+    uint8_t _align5[4];
 
     struct {
         struct KernAux_Multiboot2_ITag_MemoryMap tag;
 
-        unsigned char
-            data[160 - sizeof(struct KernAux_Multiboot2_ITag_MemoryMap)];
+        uint8_t data[160 - sizeof(struct KernAux_Multiboot2_ITag_MemoryMap)];
     } tag_memory_map;
 
     struct KernAux_Multiboot2_ITag_VBEInfo tag_vbe_info;
 
     struct {
         struct KernAux_Multiboot2_ITag_FramebufferInfo tag;
-        unsigned char data[8];
+        uint8_t data[8];
     } tag_framebuffer_info;
 
-    unsigned char _align6[1];
+    uint8_t _align6[1];
 
     struct {
         struct KernAux_Multiboot2_ITag_ELFSymbols tag;
 
-        unsigned char
-            data[420 - sizeof(struct KernAux_Multiboot2_ITag_ELFSymbols)];
+        uint8_t data[420 - sizeof(struct KernAux_Multiboot2_ITag_ELFSymbols)];
     } tag_elf_symbols;
 
-    unsigned char _align7[4];
+    uint8_t _align7[4];
 
     struct KernAux_Multiboot2_ITag_APMTable tag_apm_table;
 
-    unsigned char _align8[4];
+    uint8_t _align8[4];
 
     struct KernAux_Multiboot2_ITag_EFI32bitSystemTablePtr tag_efi_32bit_system_table_ptr;
 
-    unsigned char _align9[4];
+    uint8_t _align9[4];
 
     struct KernAux_Multiboot2_ITag_EFI64bitSystemTablePtr tag_efi_64bit_system_table_ptr;
 
     struct {
         struct KernAux_Multiboot2_ITag_SMBIOSTables tag;
-        unsigned char data[8];
+        uint8_t data[8];
     } tag_smbios_tables;
 
     struct {
         struct KernAux_Multiboot2_ITag_ACPIOldRSDP tag;
-        unsigned char data[8];
+        uint8_t data[8];
     } tag_acpi_old_rsdp;
 
     struct {
         struct KernAux_Multiboot2_ITag_ACPINewRSDP tag;
-        unsigned char data[8];
+        uint8_t data[8];
     } tag_acpi_new_rsdp;
 
     struct {
         struct KernAux_Multiboot2_ITag_NetworkingInfo tag;
-        unsigned char data[8];
+        uint8_t data[8];
     } tag_networking_info;
 
     struct {
         struct KernAux_Multiboot2_ITag_EFIMemoryMap tag;
-        unsigned char data[8];
+        uint8_t data[8];
     } tag_efi_memory_map;
 
     struct KernAux_Multiboot2_ITag_EFIBootServicesNotTerminated
@@ -101,7 +99,7 @@ static const struct {
     struct KernAux_Multiboot2_ITag_EFI32bitImageHandlePtr
     tag_efi_32bit_image_handle_ptr;
 
-    unsigned char _align10[4];
+    uint8_t _align10[4];
 
     struct KernAux_Multiboot2_ITag_EFI64bitImageHandlePtr
     tag_efi_64bit_image_handle_ptr;
@@ -109,7 +107,7 @@ static const struct {
     struct KernAux_Multiboot2_ITag_ImageLoadBasePhysAddr
     tag_image_load_base_phys_addr;
 
-    unsigned char _align11[4];
+    uint8_t _align11[4];
 
     struct KernAux_Multiboot2_ITag_None tag_none;
 } multiboot2_info_example2 = {

tests/test_multiboot2_header_print.c

@@ -14,8 +14,8 @@ static const char output2[] =
     "Multiboot 2 header\n"
     "  magic: 920085129\n"
     "  arch: 1\n"
-    "  size: 144\n"
-    "  checksum: 3374882022\n"
+    "  size: 160\n"
+    "  checksum: 3374882006\n"
     "Multiboot 2 header tag\n"
     "  type: 1 (information request)\n"
     "  flags: 0\n"
@@ -25,6 +25,10 @@ static const char output2[] =
     "  flags: 0\n"
     "  size: 24\n"
     "Multiboot 2 header tag\n"
+    "  type: 3 (entry address)\n"
+    "  flags: 0\n"
+    "  size: 12\n"
+    "Multiboot 2 header tag\n"
     "  type: 0 (none)\n"
     "  flags: 0\n"
     "  size: 8\n";