[IMP] Code cleanup and improvements of the bootloader, still trying to

figure what is going wrong on the kernel's DLL.

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>

4 files changed, 49 insertions, 29 deletions

diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index 8647d00e..0e2be7ac 100644
--- a/Boot/Sources/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
@@ -16,7 +16,7 @@
 #include <KernelKit/PEF.hxx>
 #include <NewKit/Macros.hxx>
 #include <NewKit/Ref.hxx>
-#include <BootKit/ProgramLoader.hxx>
+#include <BootKit/KernelLoader.hxx>
 #include <cstring>
 
 // make the compiler shut up.
@@ -205,7 +205,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 
 	readerKernel.ReadAll(0);
 
-	Boot::ProgramLoader* loader = nullptr;
+	Boot::KernelLoader* loader = nullptr;
 
 	// ------------------------------------------ //
 	// If we succeed in reading the blob, then execute it.
@@ -213,7 +213,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 
 	if (readerKernel.Blob())
 	{
-		loader = new Boot::ProgramLoader(readerKernel.Blob());
+		loader = new Boot::KernelLoader(readerKernel.Blob());
 		loader->SetName("\"newoskrnl.dll\" (64-bit SMP DLL)");
 	}
 
diff --git a/Boot/Sources/HEL/AMD64/New+Delete.cxx b/Boot/Sources/HEL/AMD64/New+Delete.cxx
index b651f091..7039f478 100644
--- a/Boot/Sources/HEL/AMD64/New+Delete.cxx
+++ b/Boot/Sources/HEL/AMD64/New+Delete.cxx
@@ -44,6 +44,13 @@ void operator delete(void* buf)
 	BS->FreePool(buf);
 }
 
+/// @brief Deletes the object.
+/// @param buf the object.
+void operator delete[](void* buf)
+{
+	BS->FreePool(buf);
+}
+
 /// @brief Deletes the object (array specific).
 /// @param buf the object.
 /// @param size it's size.
diff --git a/Boot/Sources/ProgramLoader.cxx b/Boot/Sources/KernelLoader.cxx
index 3b24d97b..02fa97e4 100644
--- a/Boot/Sources/ProgramLoader.cxx
+++ b/Boot/Sources/KernelLoader.cxx
@@ -4,13 +4,15 @@
 
 ------------------------------------------- */
 
-#include <BootKit/ProgramLoader.hxx>
+#include <BootKit/KernelLoader.hxx>
 #include <BootKit/Support.hxx>
 #include <BootKit/BootKit.hxx>
+#include <FirmwareKit/EFI/API.hxx>
 
 #include <KernelKit/PEF.hxx>
 #include <KernelKit/PE.hxx>
 #include <KernelKit/MSDOS.hxx>
+#include <Modules/CoreCG/TextRenderer.hxx>
 #include <CFKit/LoaderUtils.hxx>
 
 EXTERN_C
@@ -18,13 +20,13 @@ EXTERN_C
 #include <string.h>
 }
 
-extern EfiBootServices* BS;
+#define kHOTypeKernel 100
+
+EXTERN EfiBootServices* BS;
 
 namespace Boot
 {
-	EXTERN_C Int32 rt_jump_to_address(HEL::HandoverProc baseCode, HEL::HandoverInformationHeader* handover, Char* stackPointer);
-
-	ProgramLoader::ProgramLoader(VoidPtr blob)
+	KernelLoader::KernelLoader(VoidPtr blob)
 		: fBlob(blob), fStartAddress(nullptr)
 	{
 		// detect the format.
@@ -46,6 +48,12 @@ namespace Boot
 			ExecHeaderPtr		  hdrPtr = ldr_find_exec_header(firstBytes);
 			ExecOptionalHeaderPtr optHdr = ldr_find_opt_exec_header(firstBytes);
 
+			if (hdrPtr->mMachine != 0x8664 &&
+				hdrPtr->mSignature != 0x20b)
+			{
+				return;
+			}
+
 			auto numSecs = hdrPtr->mNumberOfSections;
 
 			writer.Write("newosldr: Major Linker Ver: ").Write(optHdr->mMajorLinkerVersion).Write("\r");
@@ -66,7 +74,8 @@ namespace Boot
 
 			ExecSectionHeaderPtr sectPtr = (ExecSectionHeaderPtr)(((Char*)optHdr) + hdrPtr->mSizeOfOptionalHeader);
 
-			constexpr auto sectionForCode = ".start";
+			constexpr auto sectionForCode	= ".text";
+			constexpr auto sectionForNewLdr = ".ldr";
 
 			for (SizeT sectIndex = 0; sectIndex < numSecs; ++sectIndex)
 			{
@@ -74,20 +83,31 @@ namespace Boot
 
 				if (StrCmp(sectionForCode, sect->mName) == 0)
 				{
-					fStartAddress = (VoidPtr)((UIntPtr)loadStartAddress + sect->mVirtualAddress);
+					fStartAddress = (VoidPtr)((UIntPtr)loadStartAddress + optHdr->mAddressOfEntryPoint);
 					writer.Write("newosldr: Start Address: ").Write((UIntPtr)fStartAddress).Write("\r");
 				}
+				else if (StrCmp(sectionForNewLdr, sect->mName) == 0)
+				{
+					struct HANDOVER_INFORMATION_STUB
+					{
+						UInt64 HandoverMagic;
+						UInt32 HandoverType;
+
+					}* structHandover = (struct HANDOVER_INFORMATION_STUB*)(fBlob + sect->mPointerToRawData);
+
+					if (structHandover->HandoverMagic != kHandoverMagic ||
+						structHandover->HandoverType != kHOTypeKernel)
+					{
+						cg_write_text("NEWOSLDR: INVALID HANDOVER IMAGE! ABORTING...", 40, 10, RGB(0x00, 0x00, 0x00));
+						EFI::Stop();
+					}
+				}
 
-				writer.Write("newosldr: offset ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write(".\r");
+				writer.Write("newosldr: offset ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write("\r");
 
 				SetMem((VoidPtr)(loadStartAddress + sect->mVirtualAddress), 0, sect->mSizeOfRawData);
 				CopyMem((VoidPtr)(loadStartAddress + sect->mVirtualAddress), (VoidPtr)((UIntPtr)fBlob + sect->mPointerToRawData), sect->mSizeOfRawData);
 			}
-
-			// ================================ //
-			// Allocate stack.
-			// ================================ //
-			fStackPtr = new Char[optHdr->mSizeOfStackReserve];
 		}
 		else if (firstBytes[0] == kPefMagic[0] &&
 				 firstBytes[1] == kPefMagic[1] &&
@@ -108,7 +128,7 @@ namespace Boot
 	}
 
 	/// @note handover header has to be valid!
-	Void ProgramLoader::Start(HEL::HandoverInformationHeader* handover)
+	Void KernelLoader::Start(HEL::HandoverInformationHeader* handover)
 	{
 		BTextWriter writer;
 
@@ -119,10 +139,8 @@ namespace Boot
 		}
 
 		HEL::HandoverProc err_fn = [](HEL::HandoverInformationHeader* rcx) -> void {
-			BTextWriter writer;
-			writer.Write("newosldr: Exec format error, Thread has been aborted.\r");
-
-			EFI::ThrowError(L"Exec-Format-Error", L"Format doesn't match (Thread aborted).");
+			cg_write_text("NEWOSLDR: INVALID IMAGE! ABORTING...", 40, 10, RGB(0x00, 0x00, 0x00));
+			EFI::Stop();
 		};
 
 		if (!fStartAddress)
@@ -134,17 +152,17 @@ namespace Boot
 		err_fn(handover);
 	}
 
-	const Char* ProgramLoader::GetName()
+	const Char* KernelLoader::GetName()
 	{
 		return fBlobName;
 	}
 
-	Void ProgramLoader::SetName(const Char* name)
+	Void KernelLoader::SetName(const Char* name)
 	{
 		CopyMem(fBlobName, name, StrLen(name));
 	}
 
-	bool ProgramLoader::IsValid()
+	bool KernelLoader::IsValid()
 	{
 		return fStartAddress != nullptr;
 	}
diff --git a/Boot/Sources/Root/bootloader.json b/Boot/Sources/Root/bootloader.json
deleted file mode 100644
index ebfcf320..00000000
--- a/Boot/Sources/Root/bootloader.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "newoskrnl.dll": "krnldll",
-  "ZKA/fonts.json": "rsrc",
-  "ZKA/cmd.json": "cmdline"
-}