From 64fa0db684db306766280593b0a9717132e636d4 Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Wed, 7 Aug 2024 22:55:34 +0200 Subject: [IMP] - Updated the PEF header for NDK. - Adding ICL parser for SCM (ToDo) - Updated extensions of PEF. - Updated start address for exes in PEF. Signed-off-by: Amlal EL Mahrouss --- Boot/Sources/HEL/AMD64/BootMain.cxx | 4 ++-- Boot/Sources/Root/bootloader.json | 2 +- Boot/amd64-efi.make | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Boot') diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx index d2a478c6..2bc2aca1 100644 --- a/Boot/Sources/HEL/AMD64/BootMain.cxx +++ b/Boot/Sources/HEL/AMD64/BootMain.cxx @@ -201,7 +201,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, // format the disk. // ---------------------------------------------------- // - BFileReader readerKernel(L"newoskrnl.lib", ImageHandle); + BFileReader readerKernel(L"newoskrnl.dll", ImageHandle); readerKernel.ReadAll(0); @@ -214,7 +214,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, if (readerKernel.Blob()) { loader = new Boot::ProgramLoader(readerKernel.Blob()); - loader->SetName("\"newoskrnl.lib\" (64-bit SMP DLL)"); + loader->SetName("\"newoskrnl.dll\" (64-bit SMP DLL)"); } writer.Write("newosldr: Running: ").Write(loader->GetName()).Write("\r"); diff --git a/Boot/Sources/Root/bootloader.json b/Boot/Sources/Root/bootloader.json index 51cb36b5..fe1a57d4 100644 --- a/Boot/Sources/Root/bootloader.json +++ b/Boot/Sources/Root/bootloader.json @@ -1,4 +1,4 @@ { - "newoskrnl.lib": "kernel", + "newoskrnl.dll": "kernel", "ZETA/fonts.json": "rsrc" } diff --git a/Boot/amd64-efi.make b/Boot/amd64-efi.make index a0bec415..12bd4941 100644 --- a/Boot/amd64-efi.make +++ b/Boot/amd64-efi.make @@ -50,9 +50,9 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEWOSKRNL__ -D__NEWOSL -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__NEWOS_AMD64__ -D__MAHROUSS__ -D__BOOTLOADER__ -I../ BOOT_LOADER=newosldr.exe -KERNEL=newoskrnl.lib -DDK=libDDK.lib -SCI=libSCI.lib +KERNEL=newoskrnl.dll +DDK=libDDK.dll +SCI=libSCI.dll .PHONY: invalid-recipe invalid-recipe: @@ -97,7 +97,7 @@ download-edk: $(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd BINS=*.bin -EXECUTABLES=newosldr.exe newoskrnl.lib OVMF.fd +EXECUTABLES=newosldr.exe newoskrnl.dll OVMF.fd TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES) -- cgit v1.2.3