1
0
Fork 0
mirror of https://github.com/tailix/libkernaux.git synced 2025-02-24 15:55:41 -05:00

Make Multiboot 2 memory map tag entry size to be mul of 8

This commit is contained in:
Alex Kotov 2020-11-29 03:44:26 +05:00
parent dda7ae2173
commit f8079ca66c
Signed by: kotovalexarian
GPG key ID: 553C0EBBEB5D5F08

View file

@ -355,34 +355,34 @@ tag_memory_map_with_empty_data_valid = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP, .type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP,
.size = 16, .size = 16,
}, },
.entry_size = 4, .entry_size = 8,
.entry_version = 0, .entry_version = 0,
}; };
static const struct { static const struct {
struct KernAux_Multiboot2_Tag_MemoryMap tag; struct KernAux_Multiboot2_Tag_MemoryMap tag;
unsigned char data[4 * 2]; unsigned char data[8 * 2];
} tag_memory_map_with_some_small_data_items_valid = { } tag_memory_map_with_some_small_data_items_valid = {
.tag = { .tag = {
.base = { .base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP, .type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP,
.size = 20, .size = 16 + 8 * 2,
}, },
.entry_size = 4, .entry_size = 8,
.entry_version = 123, .entry_version = 123,
}, },
}; };
static const struct { static const struct {
struct KernAux_Multiboot2_Tag_MemoryMap tag; struct KernAux_Multiboot2_Tag_MemoryMap tag;
unsigned char data[50 * 2]; unsigned char data[64 * 2];
} tag_memory_map_with_some_large_data_items_valid = { } tag_memory_map_with_some_large_data_items_valid = {
.tag = { .tag = {
.base = { .base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP, .type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP,
.size = 116, .size = 16 + 64 * 2,
}, },
.entry_size = 50, .entry_size = 64,
.entry_version = 456, .entry_version = 456,
}, },
}; };
@ -393,7 +393,7 @@ tag_memory_map_invalid_type = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_NONE, .type = KERNAUX_MULTIBOOT2_TAGTYPE_NONE,
.size = 16, .size = 16,
}, },
.entry_size = 4, .entry_size = 8,
.entry_version = 0, .entry_version = 0,
}; };
@ -401,22 +401,22 @@ static const struct KernAux_Multiboot2_Tag_MemoryMap
tag_memory_map_with_empty_data_invalid_size = { tag_memory_map_with_empty_data_invalid_size = {
.base = { .base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP, .type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP,
.size = 17, .size = 16 + 1,
}, },
.entry_size = 4, .entry_size = 8,
.entry_version = 0, .entry_version = 0,
}; };
static const struct { static const struct {
struct KernAux_Multiboot2_Tag_MemoryMap tag; struct KernAux_Multiboot2_Tag_MemoryMap tag;
unsigned char data[50 * 2 + 1]; unsigned char data[64 * 2 + 1];
} tag_memory_map_with_some_large_data_items_invalid_size = { } tag_memory_map_with_some_large_data_items_invalid_size = {
.tag = { .tag = {
.base = { .base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP, .type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP,
.size = 116 + 1, .size = 16 + 64 * 2 + 1,
}, },
.entry_size = 50, .entry_size = 64,
.entry_version = 456, .entry_version = 456,
}, },
}; };