tailix/libkernaux
1
0
Fork 0
mirror of https://github.com/tailix/libkernaux.git synced 2025-10-30 23:47:50 -04:00
Code Releases Activity

Rename Multiboot2 info validation funcs

Browse source
This commit is contained in:
Alex Kotov 2022-01-13 08:10:33 +05:00
parent e68d131fae
commit a5f4adda40
6 changed files with 116 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -49,7 +49,7 @@
/tests/test_itoa /tests/test_itoa
/tests/test_multiboot2_helpers /tests/test_multiboot2_helpers
/tests/test_multiboot2_print /tests/test_multiboot2_print
/tests/test_multiboot2_validation /tests/test_multiboot2_info_validation
/tests/test_pfa /tests/test_pfa
/tests/test_pfa_assert /tests/test_pfa_assert
/tests/test_printf /tests/test_printf

8
Makefile.am
View file

@ -57,12 +57,12 @@ endif
if WITH_MULTIBOOT2 if WITH_MULTIBOOT2
libkernaux_a_SOURCES += \ libkernaux_a_SOURCES += \
src/multiboot2/helpers.c \ src/multiboot2/helpers.c \
src/multiboot2/is_valid.c \ src/multiboot2/info_is_valid.c \
src/multiboot2/print.c src/multiboot2/print.c
TESTS += \ TESTS += \
tests/test_multiboot2_helpers \ tests/test_multiboot2_helpers \
tests/test_multiboot2_print \ tests/test_multiboot2_print \
tests/test_multiboot2_validation tests/test_multiboot2_info_validation
noinst_PROGRAMS += \ noinst_PROGRAMS += \
tests/multiboot2_print1 \ tests/multiboot2_print1 \
tests/multiboot2_print2 tests/multiboot2_print2
@ -143,9 +143,9 @@ tests_test_multiboot2_print_SOURCES = \
$(libkernaux_a_SOURCES) \ $(libkernaux_a_SOURCES) \
tests/test_multiboot2_print.c tests/test_multiboot2_print.c
tests_test_multiboot2_validation_SOURCES = \ tests_test_multiboot2_info_validation_SOURCES = \
$(libkernaux_a_SOURCES) \ $(libkernaux_a_SOURCES) \
tests/test_multiboot2_validation.c \ tests/test_multiboot2_info_validation.c \
tests/multiboot2_example1.h \ tests/multiboot2_example1.h \
tests/multiboot2_example2.h tests/multiboot2_example2.h

50
include/kernaux/multiboot2.h
View file

@ -351,9 +351,9 @@ void KernAux_Multiboot2_ITagBase_print(
void (*printf)(const char *format, ...) void (*printf)(const char *format, ...)
); );
/************************ /************************************
* Validation functions * * Information validation functions *
************************/ ************************************/
bool KernAux_Multiboot2_is_valid( bool KernAux_Multiboot2_is_valid(
const struct KernAux_Multiboot2 *multiboot2 const struct KernAux_Multiboot2 *multiboot2
@ -363,91 +363,91 @@ bool KernAux_Multiboot2_ITagBase_is_valid(
const struct KernAux_Multiboot2_ITagBase *tag_base const struct KernAux_Multiboot2_ITagBase *tag_base
); );
bool KernAux_Multiboot2_Tag_None_is_valid( bool KernAux_Multiboot2_ITag_None_is_valid(
const struct KernAux_Multiboot2_Tag_None *tag const struct KernAux_Multiboot2_Tag_None *tag
); );
bool KernAux_Multiboot2_Tag_BootCmdLine_is_valid( bool KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
const struct KernAux_Multiboot2_Tag_BootCmdLine *tag const struct KernAux_Multiboot2_Tag_BootCmdLine *tag
); );
bool KernAux_Multiboot2_Tag_BootLoaderName_is_valid( bool KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
const struct KernAux_Multiboot2_Tag_BootLoaderName *tag const struct KernAux_Multiboot2_Tag_BootLoaderName *tag
); );
bool KernAux_Multiboot2_Tag_Module_is_valid( bool KernAux_Multiboot2_ITag_Module_is_valid(
const struct KernAux_Multiboot2_Tag_Module *tag const struct KernAux_Multiboot2_Tag_Module *tag
); );
bool KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid( bool KernAux_Multiboot2_ITag_BasicMemoryInfo_is_valid(
const struct KernAux_Multiboot2_Tag_BasicMemoryInfo *tag const struct KernAux_Multiboot2_Tag_BasicMemoryInfo *tag
); );
bool KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid( bool KernAux_Multiboot2_ITag_BIOSBootDevice_is_valid(
const struct KernAux_Multiboot2_Tag_BIOSBootDevice *tag const struct KernAux_Multiboot2_Tag_BIOSBootDevice *tag
); );
bool KernAux_Multiboot2_Tag_MemoryMap_is_valid( bool KernAux_Multiboot2_ITag_MemoryMap_is_valid(
const struct KernAux_Multiboot2_Tag_MemoryMap *tag const struct KernAux_Multiboot2_Tag_MemoryMap *tag
); );
bool KernAux_Multiboot2_Tag_VBEInfo_is_valid( bool KernAux_Multiboot2_ITag_VBEInfo_is_valid(
const struct KernAux_Multiboot2_Tag_VBEInfo *tag const struct KernAux_Multiboot2_Tag_VBEInfo *tag
); );
bool KernAux_Multiboot2_Tag_FramebufferInfo_is_valid( bool KernAux_Multiboot2_ITag_FramebufferInfo_is_valid(
const struct KernAux_Multiboot2_Tag_FramebufferInfo *tag const struct KernAux_Multiboot2_Tag_FramebufferInfo *tag
); );
bool KernAux_Multiboot2_Tag_ELFSymbols_is_valid( bool KernAux_Multiboot2_ITag_ELFSymbols_is_valid(
const struct KernAux_Multiboot2_Tag_ELFSymbols *tag const struct KernAux_Multiboot2_Tag_ELFSymbols *tag
); );
bool KernAux_Multiboot2_Tag_APMTable_is_valid( bool KernAux_Multiboot2_ITag_APMTable_is_valid(
const struct KernAux_Multiboot2_Tag_APMTable *tag const struct KernAux_Multiboot2_Tag_APMTable *tag
); );
bool KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI32bitSystemTablePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr *tag const struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr *tag
); );
bool KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI64bitSystemTablePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr *tag const struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr *tag
); );
bool KernAux_Multiboot2_Tag_SMBIOSTables_is_valid( bool KernAux_Multiboot2_ITag_SMBIOSTables_is_valid(
const struct KernAux_Multiboot2_Tag_SMBIOSTables *tag const struct KernAux_Multiboot2_Tag_SMBIOSTables *tag
); );
bool KernAux_Multiboot2_Tag_ACPIOldRSDP_is_valid( bool KernAux_Multiboot2_ITag_ACPIOldRSDP_is_valid(
const struct KernAux_Multiboot2_Tag_ACPIOldRSDP *tag const struct KernAux_Multiboot2_Tag_ACPIOldRSDP *tag
); );
bool KernAux_Multiboot2_Tag_ACPINewRSDP_is_valid( bool KernAux_Multiboot2_ITag_ACPINewRSDP_is_valid(
const struct KernAux_Multiboot2_Tag_ACPINewRSDP *tag const struct KernAux_Multiboot2_Tag_ACPINewRSDP *tag
); );
bool KernAux_Multiboot2_Tag_NetworkingInfo_is_valid( bool KernAux_Multiboot2_ITag_NetworkingInfo_is_valid(
const struct KernAux_Multiboot2_Tag_NetworkingInfo *tag const struct KernAux_Multiboot2_Tag_NetworkingInfo *tag
); );
bool KernAux_Multiboot2_Tag_EFIMemoryMap_is_valid( bool KernAux_Multiboot2_ITag_EFIMemoryMap_is_valid(
const struct KernAux_Multiboot2_Tag_EFIMemoryMap *tag const struct KernAux_Multiboot2_Tag_EFIMemoryMap *tag
); );
bool KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated_is_valid( bool KernAux_Multiboot2_ITag_EFIBootServicesNotTerminated_is_valid(
const struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated *tag const struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated *tag
); );
bool KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI32bitImageHandlePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr *tag const struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr *tag
); );
bool KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI64bitImageHandlePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr *tag const struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr *tag
); );
bool KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr_is_valid( bool KernAux_Multiboot2_ITag_ImageLoadBasePhysAddr_is_valid(
const struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr *tag const struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr *tag
); );

91
src/multiboot2/is_valid.c → src/multiboot2/info_is_valid.c
View file

@ -56,91 +56,92 @@ bool KernAux_Multiboot2_ITagBase_is_valid(
) { ) {
switch (tag_base->type) { switch (tag_base->type) {
case KERNAUX_MULTIBOOT2_ITAG_NONE: case KERNAUX_MULTIBOOT2_ITAG_NONE:
return KernAux_Multiboot2_Tag_None_is_valid( return KernAux_Multiboot2_ITag_None_is_valid(
(struct KernAux_Multiboot2_Tag_None*)tag_base (struct KernAux_Multiboot2_Tag_None*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_BOOT_CMD_LINE: case KERNAUX_MULTIBOOT2_ITAG_BOOT_CMD_LINE:
return KernAux_Multiboot2_Tag_BootCmdLine_is_valid( return KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
(struct KernAux_Multiboot2_Tag_BootCmdLine*)tag_base (struct KernAux_Multiboot2_Tag_BootCmdLine*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_BOOT_LOADER_NAME: case KERNAUX_MULTIBOOT2_ITAG_BOOT_LOADER_NAME:
return KernAux_Multiboot2_Tag_BootLoaderName_is_valid( return KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
(struct KernAux_Multiboot2_Tag_BootLoaderName*)tag_base (struct KernAux_Multiboot2_Tag_BootLoaderName*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_MODULE: case KERNAUX_MULTIBOOT2_ITAG_MODULE:
return KernAux_Multiboot2_Tag_Module_is_valid( return KernAux_Multiboot2_ITag_Module_is_valid(
(struct KernAux_Multiboot2_Tag_Module*)tag_base (struct KernAux_Multiboot2_Tag_Module*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_BASIC_MEMORY_INFO: case KERNAUX_MULTIBOOT2_ITAG_BASIC_MEMORY_INFO:
return KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid( return KernAux_Multiboot2_ITag_BasicMemoryInfo_is_valid(
(struct KernAux_Multiboot2_Tag_BasicMemoryInfo*)tag_base (struct KernAux_Multiboot2_Tag_BasicMemoryInfo*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_BIOS_BOOT_DEVICE: case KERNAUX_MULTIBOOT2_ITAG_BIOS_BOOT_DEVICE:
return KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid( return KernAux_Multiboot2_ITag_BIOSBootDevice_is_valid(
(struct KernAux_Multiboot2_Tag_BIOSBootDevice*)tag_base (struct KernAux_Multiboot2_Tag_BIOSBootDevice*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_MEMORY_MAP: case KERNAUX_MULTIBOOT2_ITAG_MEMORY_MAP:
return KernAux_Multiboot2_Tag_MemoryMap_is_valid( return KernAux_Multiboot2_ITag_MemoryMap_is_valid(
(struct KernAux_Multiboot2_Tag_MemoryMap*)tag_base (struct KernAux_Multiboot2_Tag_MemoryMap*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_VBE_INFO: case KERNAUX_MULTIBOOT2_ITAG_VBE_INFO:
return KernAux_Multiboot2_Tag_VBEInfo_is_valid( return KernAux_Multiboot2_ITag_VBEInfo_is_valid(
(struct KernAux_Multiboot2_Tag_VBEInfo*)tag_base (struct KernAux_Multiboot2_Tag_VBEInfo*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_FRAMEBUFFER_INFO: case KERNAUX_MULTIBOOT2_ITAG_FRAMEBUFFER_INFO:
return KernAux_Multiboot2_Tag_FramebufferInfo_is_valid( return KernAux_Multiboot2_ITag_FramebufferInfo_is_valid(
(struct KernAux_Multiboot2_Tag_FramebufferInfo*)tag_base (struct KernAux_Multiboot2_Tag_FramebufferInfo*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_ELF_SYMBOLS: case KERNAUX_MULTIBOOT2_ITAG_ELF_SYMBOLS:
return KernAux_Multiboot2_Tag_ELFSymbols_is_valid( return KernAux_Multiboot2_ITag_ELFSymbols_is_valid(
(struct KernAux_Multiboot2_Tag_ELFSymbols*)tag_base (struct KernAux_Multiboot2_Tag_ELFSymbols*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_APM_TABLE: case KERNAUX_MULTIBOOT2_ITAG_APM_TABLE:
return KernAux_Multiboot2_Tag_APMTable_is_valid( return KernAux_Multiboot2_ITag_APMTable_is_valid(
(struct KernAux_Multiboot2_Tag_APMTable*)tag_base (struct KernAux_Multiboot2_Tag_APMTable*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_EFI_32BIT_SYSTEM_TABLE_PTR: case KERNAUX_MULTIBOOT2_ITAG_EFI_32BIT_SYSTEM_TABLE_PTR:
return KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr_is_valid( return KernAux_Multiboot2_ITag_EFI32bitSystemTablePtr_is_valid(
(struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr*)tag_base (struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_EFI_64BIT_SYSTEM_TABLE_PTR: case KERNAUX_MULTIBOOT2_ITAG_EFI_64BIT_SYSTEM_TABLE_PTR:
return KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr_is_valid( return KernAux_Multiboot2_ITag_EFI64bitSystemTablePtr_is_valid(
(struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr*)tag_base (struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_SMBIOS_TABLES: case KERNAUX_MULTIBOOT2_ITAG_SMBIOS_TABLES:
return KernAux_Multiboot2_Tag_SMBIOSTables_is_valid( return KernAux_Multiboot2_ITag_SMBIOSTables_is_valid(
(struct KernAux_Multiboot2_Tag_SMBIOSTables*)tag_base (struct KernAux_Multiboot2_Tag_SMBIOSTables*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_ACPI_OLD_RSDP: case KERNAUX_MULTIBOOT2_ITAG_ACPI_OLD_RSDP:
return KernAux_Multiboot2_Tag_ACPIOldRSDP_is_valid( return KernAux_Multiboot2_ITag_ACPIOldRSDP_is_valid(
(struct KernAux_Multiboot2_Tag_ACPIOldRSDP*)tag_base (struct KernAux_Multiboot2_Tag_ACPIOldRSDP*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_ACPI_NEW_RSDP: case KERNAUX_MULTIBOOT2_ITAG_ACPI_NEW_RSDP:
return KernAux_Multiboot2_Tag_ACPINewRSDP_is_valid( return KernAux_Multiboot2_ITag_ACPINewRSDP_is_valid(
(struct KernAux_Multiboot2_Tag_ACPINewRSDP*)tag_base (struct KernAux_Multiboot2_Tag_ACPINewRSDP*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_NETWORKING_INFO: case KERNAUX_MULTIBOOT2_ITAG_NETWORKING_INFO:
return KernAux_Multiboot2_Tag_NetworkingInfo_is_valid( return KernAux_Multiboot2_ITag_NetworkingInfo_is_valid(
(struct KernAux_Multiboot2_Tag_NetworkingInfo*)tag_base (struct KernAux_Multiboot2_Tag_NetworkingInfo*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_EFI_MEMORY_MAP: case KERNAUX_MULTIBOOT2_ITAG_EFI_MEMORY_MAP:
return KernAux_Multiboot2_Tag_EFIMemoryMap_is_valid( return KernAux_Multiboot2_ITag_EFIMemoryMap_is_valid(
(struct KernAux_Multiboot2_Tag_EFIMemoryMap*)tag_base (struct KernAux_Multiboot2_Tag_EFIMemoryMap*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_EFI_BOOT_SERVICES_NOT_TERMINATED: case KERNAUX_MULTIBOOT2_ITAG_EFI_BOOT_SERVICES_NOT_TERMINATED:
return KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated_is_valid( return KernAux_Multiboot2_ITag_EFIBootServicesNotTerminated_is_valid(
(struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated*)tag_base (struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated*)
tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_EFI_32BIT_IMAGE_HANDLE_PTR: case KERNAUX_MULTIBOOT2_ITAG_EFI_32BIT_IMAGE_HANDLE_PTR:
return KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr_is_valid( return KernAux_Multiboot2_ITag_EFI32bitImageHandlePtr_is_valid(
(struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr*)tag_base (struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_EFI_64BIT_IMAGE_HANDLE_PTR: case KERNAUX_MULTIBOOT2_ITAG_EFI_64BIT_IMAGE_HANDLE_PTR:
return KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr_is_valid( return KernAux_Multiboot2_ITag_EFI64bitImageHandlePtr_is_valid(
(struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr*)tag_base (struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr*)tag_base
); );
case KERNAUX_MULTIBOOT2_ITAG_IMAGE_LOAD_BASE_PHYS_ADDR: case KERNAUX_MULTIBOOT2_ITAG_IMAGE_LOAD_BASE_PHYS_ADDR:
return KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr_is_valid( return KernAux_Multiboot2_ITag_ImageLoadBasePhysAddr_is_valid(
(struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr*)tag_base (struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr*)tag_base
); );
default: default:
@ -148,7 +149,7 @@ bool KernAux_Multiboot2_ITagBase_is_valid(
} }
} }
bool KernAux_Multiboot2_Tag_None_is_valid( bool KernAux_Multiboot2_ITag_None_is_valid(
const struct KernAux_Multiboot2_Tag_None *const tag const struct KernAux_Multiboot2_Tag_None *const tag
) { ) {
return ( return (
@ -157,7 +158,7 @@ bool KernAux_Multiboot2_Tag_None_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_BootCmdLine_is_valid( bool KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
const struct KernAux_Multiboot2_Tag_BootCmdLine *const tag const struct KernAux_Multiboot2_Tag_BootCmdLine *const tag
) { ) {
size_t index = 1; size_t index = 1;
@ -176,7 +177,7 @@ bool KernAux_Multiboot2_Tag_BootCmdLine_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_BootLoaderName_is_valid( bool KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
const struct KernAux_Multiboot2_Tag_BootLoaderName *const tag const struct KernAux_Multiboot2_Tag_BootLoaderName *const tag
) { ) {
size_t index = 1; size_t index = 1;
@ -195,7 +196,7 @@ bool KernAux_Multiboot2_Tag_BootLoaderName_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_Module_is_valid( bool KernAux_Multiboot2_ITag_Module_is_valid(
const struct KernAux_Multiboot2_Tag_Module *const tag const struct KernAux_Multiboot2_Tag_Module *const tag
) { ) {
size_t index = 1; size_t index = 1;
@ -215,7 +216,7 @@ bool KernAux_Multiboot2_Tag_Module_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid( bool KernAux_Multiboot2_ITag_BasicMemoryInfo_is_valid(
const struct KernAux_Multiboot2_Tag_BasicMemoryInfo *const tag const struct KernAux_Multiboot2_Tag_BasicMemoryInfo *const tag
) { ) {
return ( return (
@ -224,7 +225,7 @@ bool KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid( bool KernAux_Multiboot2_ITag_BIOSBootDevice_is_valid(
const struct KernAux_Multiboot2_Tag_BIOSBootDevice *const tag const struct KernAux_Multiboot2_Tag_BIOSBootDevice *const tag
) { ) {
return ( return (
@ -233,7 +234,7 @@ bool KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_MemoryMap_is_valid( bool KernAux_Multiboot2_ITag_MemoryMap_is_valid(
const struct KernAux_Multiboot2_Tag_MemoryMap *const tag const struct KernAux_Multiboot2_Tag_MemoryMap *const tag
) { ) {
return ( return (
@ -245,7 +246,7 @@ bool KernAux_Multiboot2_Tag_MemoryMap_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_VBEInfo_is_valid( bool KernAux_Multiboot2_ITag_VBEInfo_is_valid(
const struct KernAux_Multiboot2_Tag_VBEInfo *const tag const struct KernAux_Multiboot2_Tag_VBEInfo *const tag
) { ) {
return ( return (
@ -254,7 +255,7 @@ bool KernAux_Multiboot2_Tag_VBEInfo_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_FramebufferInfo_is_valid( bool KernAux_Multiboot2_ITag_FramebufferInfo_is_valid(
const struct KernAux_Multiboot2_Tag_FramebufferInfo *const tag const struct KernAux_Multiboot2_Tag_FramebufferInfo *const tag
) { ) {
return ( return (
@ -263,7 +264,7 @@ bool KernAux_Multiboot2_Tag_FramebufferInfo_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_ELFSymbols_is_valid( bool KernAux_Multiboot2_ITag_ELFSymbols_is_valid(
const struct KernAux_Multiboot2_Tag_ELFSymbols *const tag const struct KernAux_Multiboot2_Tag_ELFSymbols *const tag
) { ) {
return ( return (
@ -274,7 +275,7 @@ bool KernAux_Multiboot2_Tag_ELFSymbols_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_APMTable_is_valid( bool KernAux_Multiboot2_ITag_APMTable_is_valid(
const struct KernAux_Multiboot2_Tag_APMTable *const tag const struct KernAux_Multiboot2_Tag_APMTable *const tag
) { ) {
return ( return (
@ -283,7 +284,7 @@ bool KernAux_Multiboot2_Tag_APMTable_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI32bitSystemTablePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr *const tag const struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr *const tag
) { ) {
return ( return (
@ -292,7 +293,7 @@ bool KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI64bitSystemTablePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr *const tag const struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr *const tag
) { ) {
return ( return (
@ -301,7 +302,7 @@ bool KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_SMBIOSTables_is_valid( bool KernAux_Multiboot2_ITag_SMBIOSTables_is_valid(
const struct KernAux_Multiboot2_Tag_SMBIOSTables *const tag const struct KernAux_Multiboot2_Tag_SMBIOSTables *const tag
) { ) {
return ( return (
@ -310,7 +311,7 @@ bool KernAux_Multiboot2_Tag_SMBIOSTables_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_ACPIOldRSDP_is_valid( bool KernAux_Multiboot2_ITag_ACPIOldRSDP_is_valid(
const struct KernAux_Multiboot2_Tag_ACPIOldRSDP *const tag const struct KernAux_Multiboot2_Tag_ACPIOldRSDP *const tag
) { ) {
return ( return (
@ -319,7 +320,7 @@ bool KernAux_Multiboot2_Tag_ACPIOldRSDP_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_ACPINewRSDP_is_valid( bool KernAux_Multiboot2_ITag_ACPINewRSDP_is_valid(
const struct KernAux_Multiboot2_Tag_ACPINewRSDP *const tag const struct KernAux_Multiboot2_Tag_ACPINewRSDP *const tag
) { ) {
return ( return (
@ -328,7 +329,7 @@ bool KernAux_Multiboot2_Tag_ACPINewRSDP_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_NetworkingInfo_is_valid( bool KernAux_Multiboot2_ITag_NetworkingInfo_is_valid(
const struct KernAux_Multiboot2_Tag_NetworkingInfo *const tag const struct KernAux_Multiboot2_Tag_NetworkingInfo *const tag
) { ) {
return ( return (
@ -337,7 +338,7 @@ bool KernAux_Multiboot2_Tag_NetworkingInfo_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_EFIMemoryMap_is_valid( bool KernAux_Multiboot2_ITag_EFIMemoryMap_is_valid(
const struct KernAux_Multiboot2_Tag_EFIMemoryMap *const tag const struct KernAux_Multiboot2_Tag_EFIMemoryMap *const tag
) { ) {
return ( return (
@ -346,7 +347,7 @@ bool KernAux_Multiboot2_Tag_EFIMemoryMap_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated_is_valid( bool KernAux_Multiboot2_ITag_EFIBootServicesNotTerminated_is_valid(
const struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated *const tag const struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated *const tag
) { ) {
return ( return (
@ -356,7 +357,7 @@ bool KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI32bitImageHandlePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr *const tag const struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr *const tag
) { ) {
return ( return (
@ -365,7 +366,7 @@ bool KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr_is_valid( bool KernAux_Multiboot2_ITag_EFI64bitImageHandlePtr_is_valid(
const struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr *const tag const struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr *const tag
) { ) {
return ( return (
@ -374,7 +375,7 @@ bool KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr_is_valid(
); );
} }
bool KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr_is_valid( bool KernAux_Multiboot2_ITag_ImageLoadBasePhysAddr_is_valid(
const struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr *const tag const struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr *const tag
) { ) {
return ( return (

4
src/multiboot2/print.c
View file

@ -291,7 +291,7 @@ void KernAux_Multiboot2_Tag_MemoryMap_print(
const struct KernAux_Multiboot2_Tag_MemoryMap *const tag, const struct KernAux_Multiboot2_Tag_MemoryMap *const tag,
void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2))) void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
) { ) {
if (!KernAux_Multiboot2_Tag_MemoryMap_is_valid(tag)) { if (!KernAux_Multiboot2_ITag_MemoryMap_is_valid(tag)) {
printf(" invalid!\n"); printf(" invalid!\n");
return; return;
} }
@ -322,7 +322,7 @@ void KernAux_Multiboot2_Tag_ELFSymbols_print(
const struct KernAux_Multiboot2_Tag_ELFSymbols *const tag, const struct KernAux_Multiboot2_Tag_ELFSymbols *const tag,
void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2))) void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
) { ) {
if (!KernAux_Multiboot2_Tag_ELFSymbols_is_valid(tag)) { if (!KernAux_Multiboot2_ITag_ELFSymbols_is_valid(tag)) {
printf(" invalid!\n"); printf(" invalid!\n");
return; return;
} }

76
tests/test_multiboot2_validation.c → tests/test_multiboot2_info_validation.c
View file

@ -930,163 +930,163 @@ int main()
// Tag_None // Tag_None
assert(KernAux_Multiboot2_Tag_None_is_valid(&tag_none_valid)); assert(KernAux_Multiboot2_ITag_None_is_valid(&tag_none_valid));
assert(!KernAux_Multiboot2_Tag_None_is_valid(&tag_none_invalid_type)); assert(!KernAux_Multiboot2_ITag_None_is_valid(&tag_none_invalid_type));
assert(!KernAux_Multiboot2_Tag_None_is_valid(&tag_none_invalid_size)); assert(!KernAux_Multiboot2_ITag_None_is_valid(&tag_none_invalid_size));
// Tag_BootCmdLine // Tag_BootCmdLine
assert(KernAux_Multiboot2_Tag_BootCmdLine_is_valid( assert(KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
&tag_boot_cmd_line_with_empty_cmdline_valid.tag &tag_boot_cmd_line_with_empty_cmdline_valid.tag
)); ));
assert(KernAux_Multiboot2_Tag_BootCmdLine_is_valid( assert(KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
&tag_boot_cmd_line_with_some_cmdline_valid.tag &tag_boot_cmd_line_with_some_cmdline_valid.tag
)); ));
assert(!KernAux_Multiboot2_Tag_BootCmdLine_is_valid( assert(!KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
&tag_boot_cmd_line_invalid_type.tag &tag_boot_cmd_line_invalid_type.tag
)); ));
assert(!KernAux_Multiboot2_Tag_BootCmdLine_is_valid( assert(!KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
&tag_boot_cmd_line_with_empty_cmdline_invalid_size.tag &tag_boot_cmd_line_with_empty_cmdline_invalid_size.tag
)); ));
assert(!KernAux_Multiboot2_Tag_BootCmdLine_is_valid( assert(!KernAux_Multiboot2_ITag_BootCmdLine_is_valid(
&tag_boot_cmd_line_with_some_cmdline_invalid_size.tag &tag_boot_cmd_line_with_some_cmdline_invalid_size.tag
)); ));
// Tag_BootLoaderName // Tag_BootLoaderName
assert(KernAux_Multiboot2_Tag_BootLoaderName_is_valid( assert(KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
&tag_boot_loader_name_with_empty_name_valid.tag &tag_boot_loader_name_with_empty_name_valid.tag
)); ));
assert(KernAux_Multiboot2_Tag_BootLoaderName_is_valid( assert(KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
&tag_boot_loader_name_with_some_name_valid.tag &tag_boot_loader_name_with_some_name_valid.tag
)); ));
assert(!KernAux_Multiboot2_Tag_BootLoaderName_is_valid( assert(!KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
&tag_boot_loader_name_invalid_type.tag &tag_boot_loader_name_invalid_type.tag
)); ));
assert(!KernAux_Multiboot2_Tag_BootLoaderName_is_valid( assert(!KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
&tag_boot_loader_name_with_empty_name_invalid_size.tag &tag_boot_loader_name_with_empty_name_invalid_size.tag
)); ));
assert(!KernAux_Multiboot2_Tag_BootLoaderName_is_valid( assert(!KernAux_Multiboot2_ITag_BootLoaderName_is_valid(
&tag_boot_loader_name_with_some_name_invalid_size.tag &tag_boot_loader_name_with_some_name_invalid_size.tag
)); ));
// Tag_Module // Tag_Module
assert(KernAux_Multiboot2_Tag_Module_is_valid( assert(KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_with_empty_name_valid.tag &tag_module_with_empty_name_valid.tag
)); ));
assert(KernAux_Multiboot2_Tag_Module_is_valid( assert(KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_with_some_name_valid.tag &tag_module_with_some_name_valid.tag
)); ));
assert(!KernAux_Multiboot2_Tag_Module_is_valid( assert(!KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_invalid_type.tag &tag_module_invalid_type.tag
)); ));
assert(!KernAux_Multiboot2_Tag_Module_is_valid( assert(!KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_with_empty_name_invalid_size.tag &tag_module_with_empty_name_invalid_size.tag
)); ));
assert(!KernAux_Multiboot2_Tag_Module_is_valid( assert(!KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_with_some_name_invalid_size.tag &tag_module_with_some_name_invalid_size.tag
)); ));
assert(!KernAux_Multiboot2_Tag_Module_is_valid( assert(!KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_with_equal_start_end_invalid.tag &tag_module_with_equal_start_end_invalid.tag
)); ));
assert(!KernAux_Multiboot2_Tag_Module_is_valid( assert(!KernAux_Multiboot2_ITag_Module_is_valid(
&tag_module_with_reversed_start_end_invalid.tag &tag_module_with_reversed_start_end_invalid.tag
)); ));
// Tag_BasicMemoryInfo // Tag_BasicMemoryInfo
assert(KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid( assert(KernAux_Multiboot2_ITag_BasicMemoryInfo_is_valid(
&tag_basic_memory_info_valid &tag_basic_memory_info_valid
)); ));
assert(!KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid( assert(!KernAux_Multiboot2_ITag_BasicMemoryInfo_is_valid(
&tag_basic_memory_info_invalid_type &tag_basic_memory_info_invalid_type
)); ));
assert(!KernAux_Multiboot2_Tag_BasicMemoryInfo_is_valid( assert(!KernAux_Multiboot2_ITag_BasicMemoryInfo_is_valid(
&tag_basic_memory_info_invalid_size &tag_basic_memory_info_invalid_size
)); ));
// Tag_BIOSBootDevice // Tag_BIOSBootDevice
assert(KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid( assert(KernAux_Multiboot2_ITag_BIOSBootDevice_is_valid(
&tag_bios_boot_device_valid &tag_bios_boot_device_valid
)); ));
assert(!KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid( assert(!KernAux_Multiboot2_ITag_BIOSBootDevice_is_valid(
&tag_bios_boot_device_invalid_type &tag_bios_boot_device_invalid_type
)); ));
assert(!KernAux_Multiboot2_Tag_BIOSBootDevice_is_valid( assert(!KernAux_Multiboot2_ITag_BIOSBootDevice_is_valid(
&tag_bios_boot_device_invalid_size &tag_bios_boot_device_invalid_size
)); ));
// Tag_MemoryMap // Tag_MemoryMap
assert(KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_empty_data_valid &tag_memory_map_with_empty_data_valid
)); ));
assert(KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_some_small_data_items_valid.tag &tag_memory_map_with_some_small_data_items_valid.tag
)); ));
assert(KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_some_large_data_items_valid.tag &tag_memory_map_with_some_large_data_items_valid.tag
)); ));
assert(!KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(!KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_invalid_type &tag_memory_map_invalid_type
)); ));
assert(!KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(!KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_some_large_data_items_invalid_size.tag &tag_memory_map_with_some_large_data_items_invalid_size.tag
)); ));
assert(!KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(!KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_empty_data_invalid_entry_size_zero &tag_memory_map_with_empty_data_invalid_entry_size_zero
)); ));
assert(!KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(!KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_empty_data_invalid_entry_size_not_mul8 &tag_memory_map_with_empty_data_invalid_entry_size_not_mul8
)); ));
assert(!KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(!KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_some_small_data_items_invalid_entry_size_not_mul8 &tag_memory_map_with_some_small_data_items_invalid_entry_size_not_mul8
.tag .tag
)); ));
assert(!KernAux_Multiboot2_Tag_MemoryMap_is_valid( assert(!KernAux_Multiboot2_ITag_MemoryMap_is_valid(
&tag_memory_map_with_some_large_data_items_invalid_entry_size_not_mul8 &tag_memory_map_with_some_large_data_items_invalid_entry_size_not_mul8
.tag .tag
)); ));
// Tag_VBEInfo // Tag_VBEInfo
assert(KernAux_Multiboot2_Tag_VBEInfo_is_valid( assert(KernAux_Multiboot2_ITag_VBEInfo_is_valid(
&tag_vbe_info_valid &tag_vbe_info_valid
)); ));
assert(!KernAux_Multiboot2_Tag_VBEInfo_is_valid( assert(!KernAux_Multiboot2_ITag_VBEInfo_is_valid(
&tag_vbe_info_invalid_type &tag_vbe_info_invalid_type
)); ));
assert(!KernAux_Multiboot2_Tag_VBEInfo_is_valid( assert(!KernAux_Multiboot2_ITag_VBEInfo_is_valid(
&tag_vbe_info_invalid_size &tag_vbe_info_invalid_size
)); ));