ADD: SwapDisk format, you use a custom data structure to work with virtual memory now.

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

5 files changed, 17 insertions, 16 deletions

diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc
index b73dfbe6..eea53bc6 100644
--- a/dev/Kernel/src/DriveMgr.cc
+++ b/dev/Kernel/src/DriveMgr.cc
@@ -49,10 +49,10 @@ namespace Kernel
 		if (!pckt)
 			return;
 
-    if (pckt->fPacketReadOnly)
-      return;
+		if (pckt->fPacketReadOnly)
+			return;
 
-    kcout << "Writing blob to disk...\r";
+		kcout << "Writing blob to disk...\r";
 
 #ifdef __AHCI__
 		drv_std_write(pckt->fPacketLba, (Char*)pckt->fPacketContent, pckt->fSectorSz, pckt->fPacketSize);
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index 0ef83615..213fb8c7 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -138,11 +138,11 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NFS_FORK_STRUCT& the_fork)
 		the_fork.PreviousSibling = lbaOfPreviousFork;
 		the_fork.NextSibling	 = (the_fork.DataOffset - the_fork.DataSize - sizeof(NFS_FORK_STRUCT));
 
-    NFS_FORK_STRUCT* fork = new NFS_FORK_STRUCT;
+		NFS_FORK_STRUCT* fork = new NFS_FORK_STRUCT;
 
-    MUST_PASS(fork); // ?????
+		MUST_PASS(fork); // ?????
 
-    rt_copy_memory(&the_fork, fork, sizeof(NFS_FORK_STRUCT));
+		rt_copy_memory(&the_fork, fork, sizeof(NFS_FORK_STRUCT));
 
 		drv.fPacket.fPacketLba	   = lba;
 		drv.fPacket.fPacketSize	   = sizeof(NFS_FORK_STRUCT);
@@ -150,10 +150,10 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NFS_FORK_STRUCT& the_fork)
 
 		kcout << "Writing fork...\r";
 
-    drv.fOutput(&drv.fPacket);
+		drv.fOutput(&drv.fPacket);
 
-    delete fork;
-    fork = nullptr;
+		delete fork;
+		fork = nullptr;
 
 		/// log what we have now.
 		kcout << "Wrote fork data at: " << hex_number(the_fork.DataOffset)
diff --git a/dev/Kernel/src/HardwareThreadScheduler.cc b/dev/Kernel/src/HardwareThreadScheduler.cc
index 2121a911..90f084c6 100644
--- a/dev/Kernel/src/HardwareThreadScheduler.cc
+++ b/dev/Kernel/src/HardwareThreadScheduler.cc
@@ -21,7 +21,7 @@ namespace Kernel
 	/// @note Those symbols are needed in order to switch and validate the stack.
 	/***********************************************************************************/
 
-	EXTERN_C Bool	  hal_check_stack(HAL::StackFramePtr frame_ptr);
+	EXTERN_C Bool hal_check_stack(HAL::StackFramePtr frame_ptr);
 	EXTERN_C Bool mp_register_process(HAL::StackFramePtr frame, ProcessID pid);
 
 	STATIC HardwareThreadScheduler kHardwareThreadScheduler;
diff --git a/dev/Kernel/src/Heap.cc b/dev/Kernel/src/Heap.cc
index 7409813b..2e0127d6 100644
--- a/dev/Kernel/src/Heap.cc
+++ b/dev/Kernel/src/Heap.cc
@@ -40,7 +40,7 @@ namespace Kernel
 		struct PACKED HEAP_INFORMATION_BLOCK final
 		{
 			///! @brief 32-bit value which contains the magic number of the heap.
-			UInt32 fMagic;
+			UInt64 fMagic;
 
 			///! @brief Boolean value which tells if the heap is allocated.
 			Boolean fPresent : 1;
diff --git a/dev/Kernel/src/System/SwapDisk.cc b/dev/Kernel/src/System/SwapDisk.cc
index ce80ce66..798a3f2a 100644
--- a/dev/Kernel/src/System/SwapDisk.cc
+++ b/dev/Kernel/src/System/SwapDisk.cc
@@ -9,7 +9,7 @@
 
 namespace Kernel
 {
-	BOOL SwapDisk::Write(const Char* fork_name, const SizeT fork_name_len, VoidPtr data, const SizeT data_len)
+	BOOL SwapDisk::Write(const Char* fork_name, const SizeT fork_name_len, SWAP_DISK_HEADER_REF data, const SizeT data_len)
 	{
 		if (!fork_name || !fork_name_len)
 			return NO;
@@ -22,7 +22,7 @@ namespace Kernel
 
 		FileStream file(kSwapPageFile, "wb");
 
-		auto ret = file.Write(fork_name, data, data_len);
+		auto ret = file.Write(fork_name, data, sizeof(SWAP_DISK_HEADER) + data_len);
 
 		if (ret.Error())
 			return NO;
@@ -30,7 +30,7 @@ namespace Kernel
 		return YES;
 	}
 
-	VoidPtr SwapDisk::Read(const Char* fork_name, const SizeT fork_name_len, const SizeT data_len)
+	SWAP_DISK_HEADER_REF SwapDisk::Read(const Char* fork_name, const SizeT fork_name_len, const SizeT data_len)
 	{
 		if (!fork_name || !fork_name_len)
 			return nullptr;
@@ -40,7 +40,8 @@ namespace Kernel
 
 		FileStream file(kSwapPageFile, "rb");
 
-		VoidPtr blob = file.Read(fork_name, data_len);
-		return blob;
+		VoidPtr blob = file.Read(fork_name, sizeof(SWAP_DISK_HEADER) + data_len);
+
+		return (SWAP_DISK_HEADER_REF)blob;
 	}
 } // namespace Kernel