[IMP] Add page file inside \System\ (syspage.sys)

[FIX] Fix ATA support in bootloader and kernel.
[IMP] Add sector count macro in DriveManager.

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

2 files changed, 21 insertions, 39 deletions

diff --git a/dev/ZKA/Sources/DLLMain.cxx b/dev/ZKA/Sources/DLLMain.cxx
index 997fed52..3e62bc54 100644
--- a/dev/ZKA/Sources/DLLMain.cxx
+++ b/dev/ZKA/Sources/DLLMain.cxx
@@ -7,6 +7,7 @@
 
 ------------------------------------------- */
 
+#include <KernelKit/PE.hxx>
 #include <ArchKit/ArchKit.hxx>
 #include <CompilerKit/Detail.hxx>
 #include <FirmwareKit/Handover.hxx>
@@ -100,8 +101,6 @@ namespace Kernel::Detail
 										   theFork.CatalogName,
 										   Kernel::rt_string_len(catalogDir->Name));
 
-					delete catalogDir;
-
 					theFork.DataSize	 = kNewFSForkSize;
 					theFork.ResourceId	 = 0;
 					theFork.ResourceKind = Kernel::kNewFSRsrcForkKind;
@@ -119,22 +118,20 @@ namespace Kernel::Detail
 
 					const Kernel::SizeT metadataSz = kNewFSSectorSz;
 
-					auto catalogSystem = fNewFS->GetParser()->GetCatalog(cDirStr[dirIndx]);
-
-					fNewFS->GetParser()->CreateFork(catalogSystem, theFork);
+					fNewFS->GetParser()->CreateFork(catalogDir, theFork);
 
 					fNewFS->GetParser()->WriteCatalog(
-						catalogSystem, true, (Kernel::VoidPtr)(metadataFolder.CData()),
+						catalogDir, true, (Kernel::VoidPtr)(metadataFolder.CData()),
 						metadataSz, cFolderInfo);
 
-					delete catalogSystem;
+					delete catalogDir;
 				}
 			}
 
 			NFS_CATALOG_STRUCT* catalogDisk =
-				this->fNewFS->GetParser()->GetCatalog("\\System\\newoskrnl.dll");
+				this->fNewFS->GetParser()->GetCatalog("\\System\\syspage.sys");
 
-			const Kernel::Char* cSrcName = "KERNEL_EXEC";
+			const Kernel::Char* cSrcName = "8K_SYS_PAGE_KERNEL";
 
 			if (catalogDisk)
 			{
@@ -143,7 +140,7 @@ namespace Kernel::Detail
 			else
 			{
 				catalogDisk =
-					(NFS_CATALOG_STRUCT*)this->Leak()->CreateAlias("\\System\\newoskrnl.dll");
+					(NFS_CATALOG_STRUCT*)this->Leak()->CreateAlias("\\System\\syspage.sys");
 
 				NFS_FORK_STRUCT theDiskFork{0};
 
@@ -154,16 +151,14 @@ namespace Kernel::Detail
 									   theDiskFork.CatalogName,
 									   Kernel::rt_string_len(catalogDisk->Name));
 
-				theDiskFork.DataSize	 = kHandoverHeader->f_HardwareTables.f_ImageSz;
-				theDiskFork.ResourceId	 = Kernel::kPefKindExec | 0xFFFF000;
+				Kernel::Size sz_hdr = kNewFSForkSz;
+
+				theDiskFork.DataSize	 =sz_hdr;
+				theDiskFork.ResourceId	 = kNewFSCatalogKindExecutable | kNewFSCatalogKindPage;
 				theDiskFork.ResourceKind = Kernel::kNewFSDataForkKind;
 				theDiskFork.Kind		 = Kernel::kNewFSDataForkKind;
 
 				fNewFS->GetParser()->CreateFork(catalogDisk, theDiskFork);
-				fNewFS->GetParser()->WriteCatalog(catalogDisk,
-												  false,
-												  kHandoverHeader->f_HardwareTables.f_ImagePtr,
-												  kHandoverHeader->f_HardwareTables.f_ImageSz, cSrcName);
 
 				delete catalogDisk;
 			}
diff --git a/dev/ZKA/Sources/FS/NewFS.cxx b/dev/ZKA/Sources/FS/NewFS.cxx
index e55939f7..cdf9d6a4 100644
--- a/dev/ZKA/Sources/FS/NewFS.cxx
+++ b/dev/ZKA/Sources/FS/NewFS.cxx
@@ -62,7 +62,8 @@ STATIC MountpointInterface sMountpointInterface;
 _Output NFS_FORK_STRUCT* NewFSParser::CreateFork(_Input NFS_CATALOG_STRUCT* catalog,
 												 _Input NFS_FORK_STRUCT& theFork)
 {
-	if (catalog && theFork.ForkName[0] != 0)
+	if (catalog && theFork.ForkName[0] != 0 &&
+	   theFork.DataSize <= kNewFSForkSz)
 	{
 		Lba lba = (theFork.Kind == kNewFSDataForkKind) ? catalog->DataFork
 													   : catalog->ResourceFork;
@@ -641,6 +642,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
 								   : catalog->ResourceFork;
 
 	NFS_FORK_STRUCT* forkDataIn = new NFS_FORK_STRUCT();
+	NFS_FORK_STRUCT	 prevFork{};
 
 	// sanity check of the fork position as the condition to run the loop.
 	while (startFork >= kNewFSCatalogStartAddress)
@@ -666,25 +668,6 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
 			StringBuilder::Equals(forkDataIn->ForkName, forkName) &&
 			StringBuilder::Equals(forkDataIn->CatalogName, catalog->Name))
 		{
-			if (forkDataIn->DataSize < sizeOfData &&
-				forkDataIn->DataSize < 1)
-			{
-				startFork = forkDataIn->NextSibling;
-				continue;
-			}
-
-			drive.fPacket.fPacketContent = data;
-			drive.fPacket.fPacketSize	 = sizeOfData;
-			drive.fPacket.fLba			 = forkDataIn->DataOffset;
-
-			kcout << "newoskrnl: data offset: " << hex_number(forkDataIn->DataOffset) << endl;
-
-			drive.fOutput(&drive.fPacket);
-
-			return true;
-		}
-		else
-		{
 			// ===================================================== //
 			// Store size of blob now.
 			// ===================================================== //
@@ -692,13 +675,13 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
 			if (forkDataIn->DataSize < sizeOfData &&
 				forkDataIn->DataSize < 1)
 			{
-				startFork = forkDataIn->NextSibling + sizeof(NFS_FORK_STRUCT);
+				startFork = forkDataIn->NextSibling;
 				continue;
 			}
 
-			forkDataIn->Flags = kNewFSFlagCreated;
+			forkDataIn->Flags	   = kNewFSFlagCreated;
 			forkDataIn->DataOffset = startFork + sizeof(NFS_FORK_STRUCT);
-			forkDataIn->DataSize = sizeOfData;
+			forkDataIn->DataSize   = sizeOfData;
 
 			drive.fPacket.fPacketContent = data;
 			drive.fPacket.fPacketSize	 = sizeOfData;
@@ -721,6 +704,10 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
 			return true;
 		}
 
+		// stumble upon a fork, store it.
+
+		prevFork = *forkDataIn;
+
 		startFork = forkDataIn->NextSibling + forkDataIn->DataSize;
 	}