FIX: Fix scheduler for the task switch, separate desktop and mobile

targets.

	- Giving priority to aarch64 support.
	- The scheduler needed those fixes before proceeding to aarch64
	  support.
	- We use the register approach, which is correct here, the
	  platform code will just take those records and execute them.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

12 files changed, 71 insertions, 137 deletions

diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc
index b2545db6..2305a3e4 100644
--- a/dev/Boot/Mod/SysChk/Module.cc
+++ b/dev/Boot/Mod/SysChk/Module.cc
@@ -28,5 +28,5 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 
 	Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
 
-	return !partition_factory.IsPartitionValid() ? kEfiOk : kEfiFail;
+	return (!partition_factory.IsPartitionValid()) ? kEfiFail : kEfiOk;
 }
diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc
index db370db1..6aa5a0d9 100644
--- a/dev/Boot/src/HEL/AMD64/BootMain.cc
+++ b/dev/Boot/src/HEL/AMD64/BootMain.cc
@@ -231,7 +231,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 		root.fKind = kNeFSCatalogKindDir;
 
-		partition_factory.Format(kMachineModel " HD", &root, 1);
+		partition_factory.Format("HD", &root, 1);
 
 		UI::fb_clear_video();
 
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
index 32be8dee..ca3f2353 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
+++ b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
@@ -17,9 +17,6 @@ EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp)
 {
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
-	if (!process)
-		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
-
 	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
@@ -44,9 +41,6 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp)
 {
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
-	if (!process)
-		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
-
 	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
@@ -96,9 +90,6 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp)
 {
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
-	if (!process)
-		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
-
 	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
@@ -125,9 +116,6 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp)
 {
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
-	if (!process)
-		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
-
 	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
@@ -152,9 +140,6 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip)
 {
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
-	if (!process)
-		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
-
 	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
@@ -179,9 +164,6 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp)
 {
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
-	if (!process)
-		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
-
 	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
index c8556ddc..298dfe06 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
+++ b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
@@ -146,7 +146,7 @@ namespace Kernel::HAL
 		return kProcessBlocks[process_index].f_Frame;
 	}
 
-	EXTERN_C Bool mp_register_process(VoidPtr image, UInt8* stack_ptr, HAL::StackFramePtr stack_frame, ProcessID pid)
+	EXTERN_C BOOL mp_register_process(VoidPtr image, UInt8* stack_ptr, HAL::StackFramePtr stack_frame, ProcessID pid)
 	{
 		MUST_PASS(image && stack_ptr && stack_frame);
 
@@ -156,12 +156,7 @@ namespace Kernel::HAL
 		kProcessBlocks[process_index].f_Stack = stack_ptr;
 		kProcessBlocks[process_index].f_Image = image;
 
-		if (!mp_is_smp())
-		{
-			/// TODO: Switch from process_index in hash list.
-		}
-
-		return Yes;
+		return NO;
 	}
 
 	/***********************************************************************************/
diff --git a/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm b/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
index fbc7cda8..02031c4c 100644
--- a/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
+++ b/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
@@ -11,7 +11,7 @@
 
 [bits 64]
 
-%define kInterruptId 0x21
+%define kInterruptId 50
 
 %macro IntExp 1
 global __ZKA_INT_%1
@@ -26,9 +26,8 @@ __ZKA_INT_%1:
     call idt_handle_generic
     pop rcx
 
-
-
     std
+
     o64 iret
 %endmacro
 
@@ -42,6 +41,7 @@ __ZKA_INT_%1:
     out 0x20, al
 
     std
+    
     o64 iret
 %endmacro
 
@@ -67,6 +67,7 @@ __ZKA_INT_0:
     out 0x20, al
 
     std
+
     o64 iret
 
 __ZKA_INT_1:
@@ -79,9 +80,8 @@ __ZKA_INT_1:
     call idt_handle_generic
     pop rcx
 
-
-    
     std
+
     o64 iret
 
 __ZKA_INT_2:
@@ -94,9 +94,8 @@ __ZKA_INT_2:
     call idt_handle_generic
     pop rcx
 
-
-    
     std
+
     o64 iret
 
 ;; @brief Triggers a breakpoint and freeze the process. RIP is also fetched.
@@ -110,9 +109,8 @@ __ZKA_INT_3:
     call idt_handle_generic
     pop rcx
 
-
-    
     std
+
     o64 iret
 
 __ZKA_INT_4:
@@ -126,10 +124,8 @@ __ZKA_INT_4:
     call idt_handle_generic
     pop rcx
 
-
-    
-
     std
+
     o64 iret
 
 __ZKA_INT_5:
@@ -138,9 +134,8 @@ __ZKA_INT_5:
     mov al, 0x20
     out 0x20, al
 
-
-    
     std
+
     o64 iret
 
 ;; Invalid opcode interrupt
@@ -154,9 +149,8 @@ __ZKA_INT_6:
     call idt_handle_generic
     pop rcx
 
-
-    
     std
+
     o64 iret
 
 __ZKA_INT_7:
@@ -169,9 +163,8 @@ __ZKA_INT_7:
     call idt_handle_generic
     pop rcx
 
-
-    
     std
+
     o64 iret
 
 ;; Invalid opcode interrupt
@@ -187,6 +180,7 @@ __ZKA_INT_8:
     pop rcx
 
     std
+
     o64 iret
 
 IntNormal 9
@@ -206,9 +200,8 @@ __ZKA_INT_13:
     call idt_handle_gpf
     pop rcx
 
-    add qword [rsp + 4], 2
-
     std
+    
     o64 iret
 
 __ZKA_INT_14:
@@ -222,9 +215,8 @@ __ZKA_INT_14:
     call idt_handle_pf
     pop rcx
 
-    add qword [rsp + 4], 2
-
     std
+
     o64 iret
 
 IntNormal 15
@@ -262,6 +254,7 @@ __ZKA_INT_32:
     pop rax
 
     std
+
     o64 iret
 
 IntNormal 33
@@ -371,23 +364,6 @@ extern hal_real_init
 
 hal_reload_segments:
     std
-    ;; Write address of syscall handler.
-    mov rdx, [mp_system_call_handler]
-    shr rdx, 32
-    mov rcx, 0xC0000082
-    wrmsr
-
-    ;; Set segments of syscall handler.
-
-    xor rax, rax
-    mov rdx, 0x230008
-    mov rcx, 0xC0000081
-    wrmsr
-
-    mov ecx, 0xC0000080
-    rdmsr
-    or eax, 1
-    wrmsr
 
     jmp hal_real_init
     ret
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
index 25bb1de3..e5449649 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
@@ -70,10 +70,10 @@ EXTERN_C void hal_init_platform(
 	/* GDT, mostly descriptors for user and kernel segments. */
 	STATIC Kernel::HAL::Detail::ZKA_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = {
 		{.fLimitLow = 0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x00, .fFlags = 0x00, .fBaseHigh = 0},	  // Null entry
-		{.fLimitLow = 0xFFFF, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code
-		{.fLimitLow = 0xFFFF, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data
-		{.fLimitLow = 0xFFFF, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0xF2, .fFlags = 0xCF, .fBaseHigh = 0}, // User data
-		{.fLimitLow = 0xFFFF, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0xFA, .fFlags = 0xAF, .fBaseHigh = 0}, // User code
+		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code
+		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data
+		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0xFA, .fFlags = 0xAF, .fBaseHigh = 0}, // User code
+		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0xF2, .fFlags = 0xCF, .fBaseHigh = 0}, // User data
 	};
 
 	// Load memory descriptors.
@@ -91,9 +91,16 @@ EXTERN_C void hal_init_platform(
 
 EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept
 {
-	auto str_proc = Kernel::rt_alloc_string("System");
+	//rtl_kernel_main(0, nullptr, nullptr, 0);
 
-	auto pid = Kernel::rtl_create_process(rtl_kernel_main, str_proc);
+	auto str_proc = Kernel::rt_alloc_string("User Program");
+
+	auto pid = Kernel::rtl_create_process([](const Kernel::SizeT argc, Kernel::Char** argv, Kernel::Char** envp, const Kernel::SizeT envp_len) -> void {
+		while (YES)
+		{
+			kcout << "what\r";
+		}
+	}, str_proc);
 
 	Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[pid].PTime = 0;
 	Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[pid].Status = Kernel::ProcessStatusKind::kRunning;
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc b/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc
index ac41f7fa..6f8b292a 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc
+++ b/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc
@@ -62,9 +62,6 @@ namespace Kernel
 
 		fb_render_string(message_cr2, y, x, panic_text);
 
-		kcout << message_apicid;
-		kcout << message_cr2;
-
 		y += 10;
 
 		fb_clear();
diff --git a/dev/Kernel/amd64-efi.make b/dev/Kernel/amd64-desktop.make
index 99be29ad..99be29ad 100644
--- a/dev/Kernel/amd64-efi.make
+++ b/dev/Kernel/amd64-desktop.make
diff --git a/dev/Kernel/arm64-efi.make b/dev/Kernel/arm64-desktop.make
index a899ae18..a899ae18 100644
--- a/dev/Kernel/arm64-efi.make
+++ b/dev/Kernel/arm64-desktop.make
diff --git a/dev/Kernel/src/HardwareThreadScheduler.cc b/dev/Kernel/src/HardwareThreadScheduler.cc
index 8ece31b9..91800ab7 100644
--- a/dev/Kernel/src/HardwareThreadScheduler.cc
+++ b/dev/Kernel/src/HardwareThreadScheduler.cc
@@ -4,6 +4,7 @@
 
 ------------------------------------------- */
 
+#include "NewKit/Macros.h"
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/UserProcessScheduler.h>
 #include <KernelKit/HardwareThreadScheduler.h>
@@ -101,11 +102,6 @@ namespace Kernel
 	Void HardwareThread::Wake(const bool wakeup) noexcept
 	{
 		fWakeup = wakeup;
-
-		if (!fWakeup)
-			mp_hang_thread(fStack);
-		else
-			mp_wakeup_thread(fStack);
 	}
 
 	/***********************************************************************************/
@@ -116,27 +112,13 @@ namespace Kernel
 	/***********************************************************************************/
 	Bool HardwareThread::Switch(VoidPtr image, Ptr8 stack_ptr, HAL::StackFramePtr frame, const ThreadID& pid)
 	{
-		if (!frame ||
-			!image ||
-			!stack_ptr)
-			return No;
-
-		if (!this->IsWakeup())
-			return No;
-
-		if (this->IsBusy())
-			return No;
-
-		if (!hal_check_stack(frame))
-			return No;
-
 		this->fStack	 = frame;
 		this->fSourcePID = pid;
 
 		Bool ret = mp_register_process(image, stack_ptr, fStack, this->fSourcePID);
 
 		if (ret)
-			this->Busy(true);
+			this->Busy(YES);
 
 		return ret;
 	}
@@ -230,9 +212,6 @@ namespace Kernel
 	/***********************************************************************************/
 	SizeT HardwareThreadScheduler::Capacity() noexcept
 	{
-		if (fThreadList.Empty())
-			return 0UL;
-
-		return fThreadList.Capacity();
+		return fThreadList.Count();
 	}
 } // namespace Kernel
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index d62fe3b2..981866d2 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -118,7 +118,7 @@ namespace Kernel::Detail
 	};
 } // namespace Kernel::Detail
 
-/// @brief Application entrypoint.
+/// @brief Kernel entrypoint.
 /// @param Void
 /// @return Void
 EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len)
diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc
index 5356ee65..91001b05 100644
--- a/dev/Kernel/src/UserProcessScheduler.cc
+++ b/dev/Kernel/src/UserProcessScheduler.cc
@@ -37,7 +37,7 @@ namespace Kernel
 
 	STATIC UserProcessScheduler kProcessScheduler;
 
-	UserThread::UserThread()	= default;
+	UserThread::UserThread()  = default;
 	UserThread::~UserThread() = default;
 
 	/// @brief Gets the last exit code.
@@ -352,8 +352,8 @@ namespace Kernel
 		process.ProcessParentTeam = &mTeam;
 
 		process.ProcessId = pid;
-		process.Status	   = ProcessStatusKind::kStarting;
-		process.PTime	   = (UIntPtr)AffinityKind::kStandard;
+		process.Status	  = ProcessStatusKind::kStarting;
+		process.PTime	  = (UIntPtr)AffinityKind::kStandard;
 
 		kcout << "PID: " << number(process.ProcessId) << endl;
 		kcout << "Name: " << process.Name << endl;
@@ -441,8 +441,12 @@ namespace Kernel
 				kcout << "Switch to '" << process.Name << "'.\r";
 
 				// tell helper to find a core to schedule on.
-				UserProcessHelper::Switch(process.Image.fCode, &process.StackReserve[process.StackSize - 1], process.StackFrame,
-											   process.ProcessId);
+				if (!UserProcessHelper::Switch(process.Image.fCode, &process.StackReserve[process.StackSize - 1], process.StackFrame,
+											   process.ProcessId))
+				{
+					kcout << "Invalid process.\r";
+					process.Crash();
+				}
 			}
 			else
 			{
@@ -525,50 +529,44 @@ namespace Kernel
 
 	Bool UserProcessHelper::Switch(VoidPtr image_ptr, UInt8* stack, HAL::StackFramePtr frame_ptr, const PID& new_pid)
 	{
-		if (!stack || !frame_ptr || !image_ptr)
-			return No;
-
-		if (!mm_is_valid_heap(image_ptr))
-			return No;
-
 		for (SizeT index = 0UL; index < HardwareThreadScheduler::The().Capacity(); ++index)
 		{
-			if (!HardwareThreadScheduler::The()[index].Leak())
+			if (HardwareThreadScheduler::The()[index].Leak()->Kind() == kInvalidAP ||
+				HardwareThreadScheduler::The()[index].Leak()->Kind() == kAPBoot)
 				continue;
 
-			if (HardwareThreadScheduler::The()[index].Leak()->Kind() == kInvalidAP)
-				continue;
+			PID prev_pid									 = UserProcessHelper::TheCurrentPID();
+			UserProcessHelper::TheCurrentPID().Leak().Leak() = new_pid;
 
-			if (HardwareThreadScheduler::The()[index].Leak()->Kind() !=
-					ThreadKind::kAPBoot &&
-				HardwareThreadScheduler::The()[index].Leak()->Kind() !=
-					ThreadKind::kAPSystemReserved)
-			{
-				PID prev_pid									 = UserProcessHelper::TheCurrentPID();
-				UserProcessHelper::TheCurrentPID().Leak().Leak() = new_pid;
+			////////////////////////////////////////////////////////////
+			///	Prepare task switch.								 ///
+			////////////////////////////////////////////////////////////
 
-				////////////////////////////////////////////////////////////
-				///	Prepare task switch.								 ///
-				////////////////////////////////////////////////////////////
+			HardwareThreadScheduler::The()[index].Leak()->Wake(YES);
+			HardwareThreadScheduler::The()[index].Leak()->Busy(NO);
 
-				auto prev_ptime										 = HardwareThreadScheduler::The()[index].Leak()->fPTime;
-				HardwareThreadScheduler::The()[index].Leak()->fPTime = UserProcessScheduler::The().CurrentTeam().AsArray()[new_pid].PTime;
-				Bool ret											 = HardwareThreadScheduler::The()[index].Leak()->Switch(image_ptr, stack, frame_ptr, new_pid);
+			auto prev_ptime										 = HardwareThreadScheduler::The()[index].Leak()->fPTime;
+			HardwareThreadScheduler::The()[index].Leak()->fPTime = UserProcessScheduler::The().CurrentTeam().AsArray()[new_pid].PTime;
 
-				////////////////////////////////////////////////////////////
-				///	Rollback on fail.    								 ///
-				////////////////////////////////////////////////////////////
-				if (!ret)
-				{
-					HardwareThreadScheduler::The()[index].Leak()->fPTime = prev_ptime;
-					UserProcessHelper::TheCurrentPID().Leak().Leak()	 = prev_pid;
+			Bool ret											 = HardwareThreadScheduler::The()[index].Leak()->Switch(image_ptr, stack, frame_ptr, new_pid);
 
-					return false;
-				}
+			////////////////////////////////////////////////////////////
+			///	Rollback on fail.    								 ///
+			////////////////////////////////////////////////////////////
+			if (!ret)
+			{
+				HardwareThreadScheduler::The()[index].Leak()->fPTime = prev_ptime;
+				UserProcessHelper::TheCurrentPID().Leak().Leak()	 = prev_pid;
+
+				HardwareThreadScheduler::The()[index].Leak()->Busy(NO);
 			}
+
+			HardwareThreadScheduler::The()[index].Leak()->Wake(NO);
+
+			return Yes;
 		}
 
-		return false;
+		return No;
 	}
 
 	////////////////////////////////////////////////////////////