From f1a121780e58c0e2afebee122d3e0b017baee8ab Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 1 Mar 2024 13:53:31 +0100 Subject: Meta: update makefile. Signed-off-by: Amlal El Mahrouss --- Private/NewBoot/Source/makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index 23680c09..acf686da 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -9,6 +9,9 @@ LD_FLAGS=-e efi_main --subsystem=10 ASM=nasm OBJ=$(wildcard *.o) $(wildcard ../../Obj/*.obj) $(wildcard HEL/AMD64/*.obj) +REM=rm +REM_FLAG=-f + FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -D__DEBUG__ -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -I./ -I$(HOME)/ @@ -35,4 +38,4 @@ download-edk: .PHONY: clean clean: - rm -f $(OBJ) HCoreLdr.exe OVMF.fd + $(REM) $(REM_FLAG) $(OBJ) HCoreLdr.exe HCoreKrnl.exe OVMF.fd -- cgit v1.2.3 From d08c678da62fca6e13500037da5daf77e8cf0401 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 1 Mar 2024 16:34:14 +0100 Subject: Meta: remove debug switch on bootloader. Signed-off-by: Amlal El Mahrouss --- Private/NewBoot/Source/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index acf686da..fbde0833 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -13,7 +13,7 @@ REM=rm REM_FLAG=-f FLAG_ASM=-f win64 -FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -D__DEBUG__ -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -I./ -I$(HOME)/ +FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -I./ -I$(HOME)/ .PHONY: invalid-recipe invalid-recipe: -- cgit v1.2.3 From 018a48921cdae58d8dec9b06e63300952279c9b3 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 1 Mar 2024 17:48:59 +0100 Subject: XIFF: Update XIFF container. Signed-off-by: Amlal El Mahrouss --- Public/Kits/SystemKit/XIFF.hxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Public/Kits/SystemKit/XIFF.hxx b/Public/Kits/SystemKit/XIFF.hxx index acaf9103..29726a14 100644 --- a/Public/Kits/SystemKit/XIFF.hxx +++ b/Public/Kits/SystemKit/XIFF.hxx @@ -14,13 +14,16 @@ #include +/// @brief four-character code for XIFF. +#define kFourCCLength_XIFF 4 + /*** * @brief Generic XIFF header * Used by XIFF based containers. */ struct PACKED XiffHeader final { - BYTE f_Mag[5]; // XIFF string (includes \0) + BYTE f_Mag[kFourCCLength_XIFF]; // XIFF string (includes \0) DWORD f_Size; // overall size of header (XiffHeader) in bytes DWORD f_FormatType; // format type. generic BYTE f_SpecificMag[4]; // The sub header magic -- cgit v1.2.3 From e93e0a0c548a407b7eadc8148687f626f2e26c42 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 3 Mar 2024 11:48:58 +0000 Subject: Update makefile, add __BOOTLOADER__ macro. --- Private/NewBoot/Source/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index fbde0833..2d3dc777 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -13,7 +13,7 @@ REM=rm REM_FLAG=-f FLAG_ASM=-f win64 -FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -I./ -I$(HOME)/ +FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -D__BOOTLOADER__ -I./ -I$(HOME)/ .PHONY: invalid-recipe invalid-recipe: @@ -22,7 +22,7 @@ invalid-recipe: .PHONY: bootloader-amd64 bootloader-amd64: $(CC_GNU) $(FLAG_GNU) HEL/AMD64/*.cxx *.cxx - $(ASM) $(FLAG_ASM) HEl/AMD64/AMD64-VirtualMemory.asm + $(ASM) $(FLAG_ASM) HEL/AMD64/AMD64-VirtualMemory.asm $(LD_GNU) $(OBJ) $(LD_FLAGS) -o HCoreLdr.exe cp HCoreLdr.exe CDROM/EFI/BOOT/BOOTX64.EFI cp HCoreLdr.exe CDROM/EFI/BOOT/HCORELDR.EFI -- cgit v1.2.3