Merge pull request #19 from amlel-el-mahrouss/dev

urgent patches.

2 files changed, 45 insertions, 67 deletions

diff --git a/dev/boot/src/HEL/AMD64/BootAPI.S b/dev/boot/src/HEL/AMD64/BootAPI.S
index c4a7ad39..963ef46a 100644
--- a/dev/boot/src/HEL/AMD64/BootAPI.S
+++ b/dev/boot/src/HEL/AMD64/BootAPI.S
@@ -11,11 +11,16 @@
 rt_jump_to_address:
     mov rbx, rcx
     mov rcx, rdx
+    push rbx
+    push rdx
     mov rsp, r8
-
-    cli
+    push rax
     jmp rbx
 
+    pop rdx
+    pop rbx
+    pop rax
+
     ret
 
 rt_reset_hardware:
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 4220c6cb..fa0cb74b 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -73,27 +73,32 @@ STATIC Bool boot_init_fb() noexcept
 EfiGUID kEfiGlobalNamespaceVarGUID = {
 	0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C}};
 
-/// @brief ModuleMain EFI entrypoint.
+/// @brief BootloaderMain EFI entrypoint.
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
-									  EfiSystemTable* sys_table)
+EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr	  image_handle,
+										  EfiSystemTable* sys_table)
 {
-	InitEFI(sys_table); ///! Init the EFI library.
+	fw_init_efi(sys_table); ///! Init the EFI library.
 
 	HEL::BootInfoHeader* handover_hdr =
 		new HEL::BootInfoHeader();
 
 	UInt32				 map_key		 = 0;
+	UInt32				 size_struct_ptr = sizeof(EfiMemoryDescriptor);
+	EfiMemoryDescriptor* struct_ptr		 = nullptr;
+	UInt32				 sz_desc		 = sizeof(EfiMemoryDescriptor);
+	UInt32				 rev_desc		 = 0;
+
+	Boot::BootTextWriter writer;
+
+	writer.Write("BootZ: NeKernel Loader.\r");
 
-#ifdef ZBA_USE_FB
 	if (!boot_init_fb())
 	{
-		Boot::BootTextWriter writer;
 		writer.Write("BootZ: Invalid Framebuffer, can't boot NeKernel.\r");
-
-		CANT_REACH();
+		Boot::Stop();
 	}
 
 	for (SizeT index_vt = 0; index_vt < sys_table->NumberOfTableEntries;
@@ -123,7 +128,6 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 	handover_hdr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine;
 	handover_hdr->f_GOP.f_PixelFormat  = kGop->Mode->Info->PixelFormat;
 	handover_hdr->f_GOP.f_Size		   = kGop->Mode->FrameBufferSize;
-#endif // ZBA_USE_FB
 
 	// ------------------------------------------- //
 	// Grab MP services, extended to runtime.	   //
@@ -138,12 +142,10 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 	kHandoverHeader = handover_hdr;
 
-	fb_init();
-
 	FB::fb_clear_video();
 
+	fb_init();
 	FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
-
 	fb_clear();
 
 	UInt32 cnt_enabled	= 0;
@@ -161,14 +163,12 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 	// Fill handover header now.
 
-	Boot::BootTextWriter writer;
+	handover_hdr->f_BitMapStart = nullptr;			 /* Start of bitmap. */
+	handover_hdr->f_BitMapSize	= kHandoverBitMapSz; /* Size of bitmap in bytes. */
 
-	//-------------------------------------------------------------//
-	// Update handover file specific table and phyiscal start field.
-	//-------------------------------------------------------------//
+	Int32 trials = 5 * 10000000;
 
-	handover_hdr->f_BitMapSize = gib_cast(4); /* Size of bitmap in bytes. */
-	Int32 trials			   = 5 * 10000000;
+	writer.Write("BootZ: Allocating sufficent memory, trying with 4GB...\r");
 
 	while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
 	{
@@ -180,7 +180,7 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 			trials = 3 * 10000000;
 
-			handover_hdr->f_BitMapSize = gib_cast(2); /* Size of bitmap in bytes. */
+			handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
 
 			while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
 			{
@@ -214,24 +214,12 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 		if (syschk_thread->Start(handover_hdr, NO) != kEfiOk)
 		{
-			fb_init();
-
 			FB::fb_clear_video();
-
 			FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
-
-			fb_clear();
-
-			Boot::Stop();
 		}
 	}
 
-	// ------------------------------------------ //
-	// null these fields, to avoid being reused later.
-	// ------------------------------------------ //
-
-	handover_hdr->f_FirmwareCustomTables[0] = nullptr;
-	handover_hdr->f_FirmwareCustomTables[1] = nullptr;
+	BS->GetMemoryMap(&size_struct_ptr, struct_ptr, &map_key, &sz_desc, &rev_desc);
 
 	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 
@@ -267,60 +255,45 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 		ver = KERNEL_VERSION_BCD;
 
 		ST->RuntimeServices->SetVariable(L"/props/kern_ver", kEfiGlobalNamespaceVarGUID, nullptr, &sz_ver, &ver);
-		writer.Write("BootZ: Kernel Version Updated: ").Write(ver).Write("\r");
+		writer.Write("BootZ: version has been updated: ").Write(ver).Write("\r");
 	}
 
-	writer.Write("BootZ: Kernel Version: ").Write(ver).Write("\r");
+	writer.Write("BootZ: version: ").Write(ver).Write("\r");
+
+	// boot to kernel, if not netboot this.
 
 	Boot::BootFileReader reader_kernel(kernel_path, image_handle);
 
 	reader_kernel.ReadAll(0);
 
-	Boot::BootThread* kernel_thread = nullptr;
-
 	// ------------------------------------------ //
 	// If we succeed in reading the blob, then execute it.
 	// ------------------------------------------ //
 
 	if (reader_kernel.Blob())
 	{
-		kernel_thread = new Boot::BootThread(reader_kernel.Blob());
-		kernel_thread->SetName("BootZ: Kernel");
+		// ------------------------------------------ //
+		// null these fields, to avoid being reused later.
+		// ------------------------------------------ //
+
+		auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
+
+		kernel_thread.SetName("BootZ: Kernel");
 
 		handover_hdr->f_KernelImage = reader_kernel.Blob();
-	}
-	else
-	{
-		fb_init();
-		FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
+		handover_hdr->f_KernelSz	= reader_kernel.Size();
 
-		Boot::Stop();
+		kernel_thread.Start(handover_hdr, YES);
 	}
 
 	Boot::BootFileReader reader_netboot(L"net.efi", image_handle);
 	reader_netboot.ReadAll(0);
 
-	Boot::BootThread* netboot_thread = nullptr;
+	if (!reader_netboot.Blob())
+		return kEfiFail;
 
-	// ---------------------------------------------------- //
-	// Finally load the OS kernel.
-	// ---------------------------------------------------- //
-
-	Boot::ExitBootServices(map_key, image_handle);
-
-	if (kernel_thread->Start(handover_hdr, YES) != kEfiOk)
-	{
-		// ------------------------------------------ //
-		// If we fail into booting the kernel, then run BootNet.
-		// ------------------------------------------ //
-
-		if (reader_netboot.Blob())
-		{
-			netboot_thread = new Boot::BootThread(reader_netboot.Blob());
-			netboot_thread->SetName("BootZ: BootNet");
-			netboot_thread->Start(handover_hdr, YES);
-		}
-	}
+	auto netboot_thread = Boot::BootThread(reader_netboot.Blob());
+	netboot_thread.SetName("BootZ: BootNet");
 
-	CANT_REACH();
+	return netboot_thread.Start(handover_hdr, NO);
 }