[IMP && FIX] Various patches and implementations.

Most importantly:
- JSON parser.

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

34 files changed, 218 insertions, 219 deletions

diff --git a/Kernel/FSKit/NewFS.hxx b/Kernel/FSKit/NewFS.hxx
index 2b47113e..25b85ee0 100644
--- a/Kernel/FSKit/NewFS.hxx
+++ b/Kernel/FSKit/NewFS.hxx
@@ -225,7 +225,7 @@ namespace Kernel
 		/// @param theFork the fork itself.
 		/// @return the fork
 		_Output NewFork* CreateFork(_Input NewCatalog* catalog,
-									_Input NewFork& theFork);
+									_Input NewFork&	   theFork);
 
 		/// @brief Find fork inside New filesystem.
 		/// @param catalog the catalog.
@@ -243,7 +243,7 @@ namespace Kernel
 
 		_Output NewCatalog* GetCatalog(_Input const char* name);
 
-		_Output NewCatalog* CreateCatalog(_Input const char* name,
+		_Output NewCatalog* CreateCatalog(_Input const char*  name,
 										  _Input const Int32& flags,
 										  _Input const Int32& kind);
 
diff --git a/Kernel/FirmwareKit/EFI/API.hxx b/Kernel/FirmwareKit/EFI/API.hxx
index 413b1fde..3873afc6 100644
--- a/Kernel/FirmwareKit/EFI/API.hxx
+++ b/Kernel/FirmwareKit/EFI/API.hxx
@@ -92,8 +92,8 @@ Bascially frees everything we have in the EFI side.
 		CGInit();
 
 		CGDrawBitMapInRegion(NewBootFatal, NEWBOOTFATAL_HEIGHT, NEWBOOTFATAL_WIDTH,
-				  (kHandoverHeader->f_GOP.f_Width - NEWBOOTFATAL_WIDTH) / 2,
-				  (kHandoverHeader->f_GOP.f_Height - NEWBOOTFATAL_HEIGHT) / 2);
+							 (kHandoverHeader->f_GOP.f_Width - NEWBOOTFATAL_WIDTH) / 2,
+							 (kHandoverHeader->f_GOP.f_Height - NEWBOOTFATAL_HEIGHT) / 2);
 
 		CGFini();
 
diff --git a/Kernel/FirmwareKit/EFI/EFI.hxx b/Kernel/FirmwareKit/EFI/EFI.hxx
index 2dd8962d..c4120aae 100644
--- a/Kernel/FirmwareKit/EFI/EFI.hxx
+++ b/Kernel/FirmwareKit/EFI/EFI.hxx
@@ -46,7 +46,7 @@ typedef UInt64 EfiStatusType;
 /// This is like NT's Win32 HANDLE type.
 typedef struct EfiHandle
 {
-} * EfiHandlePtr;
+}* EfiHandlePtr;
 
 /* UEFI uses wide characters by default. */
 typedef WideChar EfiCharType;
@@ -589,11 +589,11 @@ typedef struct EfiSystemTable
 	{
 		EfiGUID VendorGUID;
 		VoidPtr VendorTable;
-	} * ConfigurationTable;
+	}* ConfigurationTable;
 } EfiSystemTable;
 
-#define kEfiOk	 0
-#define kEfiFail -1
+#define kEfiOk			0
+#define kEfiFail		-1
 #define kBufferTooSmall 5
 
 #define EFI_EXTERN_C extern "C"
diff --git a/Kernel/HALKit/AMD64/HalAPIC.cxx b/Kernel/HALKit/AMD64/HalAPIC.cxx
index 5e91659f..34ec7494 100644
--- a/Kernel/HALKit/AMD64/HalAPIC.cxx
+++ b/Kernel/HALKit/AMD64/HalAPIC.cxx
@@ -9,8 +9,8 @@
 
 namespace Kernel::HAL
 {
-    /// @brief Read from APIC controller.
-    /// @param reg register.
+	/// @brief Read from APIC controller.
+	/// @param reg register.
 	UInt32 APICController::Read(UInt32 reg) noexcept
 	{
 		MUST_PASS(this->fApic);
diff --git a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx
index 233a6647..48d737fe 100644
--- a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx
+++ b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx
@@ -61,7 +61,7 @@ namespace Kernel::HAL
 		} Selector;
 	};
 
-	STATIC VoidPtr kApicMadt		  = nullptr;
+	STATIC VoidPtr	   kApicMadt	  = nullptr;
 	STATIC const Char* kApicSignature = "APIC";
 
 	/// @brief Multiple APIC Descriptor Table.
@@ -172,7 +172,7 @@ namespace Kernel::HAL
 	/// @internal
 	EXTERN_C Void hal_apic_acknowledge(Void)
 	{
-	   kcout << "newoskrnl: acknowledge APIC.\r";
+		kcout << "newoskrnl: acknowledge APIC.\r";
 	}
 
 	/// @internal
diff --git a/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp b/Kernel/HALKit/AMD64/HalDescriptorLoader.cxx
index d0ac4e12..d0ac4e12 100644
--- a/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp
+++ b/Kernel/HALKit/AMD64/HalDescriptorLoader.cxx
diff --git a/Kernel/HALKit/AMD64/HalHart.cpp b/Kernel/HALKit/AMD64/HalHart.cxx
index adbf148c..adbf148c 100644
--- a/Kernel/HALKit/AMD64/HalHart.cpp
+++ b/Kernel/HALKit/AMD64/HalHart.cxx
diff --git a/Kernel/HALKit/AMD64/HalProcessor.cxx b/Kernel/HALKit/AMD64/HalProcessor.cxx
index 1f4fb4fd..2eb2d693 100644
--- a/Kernel/HALKit/AMD64/HalProcessor.cxx
+++ b/Kernel/HALKit/AMD64/HalProcessor.cxx
@@ -13,7 +13,7 @@
 
 namespace Kernel::HAL
 {
-	void Out8(UInt16 port, UInt8 value)
+	Void Out8(UInt16 port, UInt8 value)
 	{
 		asm volatile("outb %%al, %1"
 					 :
@@ -21,7 +21,7 @@ namespace Kernel::HAL
 					 : "memory");
 	}
 
-	void Out16(UInt16 port, UInt16 value)
+	Void Out16(UInt16 port, UInt16 value)
 	{
 		asm volatile("outw %%ax, %1"
 					 :
@@ -29,7 +29,7 @@ namespace Kernel::HAL
 					 : "memory");
 	}
 
-	void Out32(UInt16 port, UInt32 value)
+	Void Out32(UInt16 port, UInt32 value)
 	{
 		asm volatile("outl %%eax, %1"
 					 :
@@ -70,27 +70,27 @@ namespace Kernel::HAL
 		return value;
 	}
 
-	void rt_halt()
+	Void rt_halt()
 	{
 		asm volatile("hlt");
 	}
 
-	void rt_cli()
+	Void rt_cli()
 	{
 		asm volatile("cli");
 	}
 
-	void rt_sti()
+	Void rt_sti()
 	{
 		asm volatile("sti");
 	}
 
-	void rt_cld()
+	Void rt_cld()
 	{
 		asm volatile("cld");
 	}
 
-	void rt_std()
+	Void rt_std()
 	{
 		asm volatile("std");
 	}
diff --git a/Kernel/HALKit/AMD64/HalTimer.cxx b/Kernel/HALKit/AMD64/HalTimer.cxx
index b7015091..e893198f 100644
--- a/Kernel/HALKit/AMD64/HalTimer.cxx
+++ b/Kernel/HALKit/AMD64/HalTimer.cxx
@@ -8,7 +8,7 @@
 	Revision History:

 

 	07/07/24: Added file (amlel)

-	

+

 ------------------------------------------- */

 

 #include <ArchKit/ArchKit.hpp>
\ No newline at end of file
diff --git a/Kernel/HALKit/AMD64/Processor.hxx b/Kernel/HALKit/AMD64/Processor.hxx
index 1d2f5597..9571cbfe 100644
--- a/Kernel/HALKit/AMD64/Processor.hxx
+++ b/Kernel/HALKit/AMD64/Processor.hxx
@@ -281,7 +281,7 @@ namespace Kernel::HAL
 	{
 		/**
 		  @brief Global descriptor table entry, either null, code or data.
-	    */
+		*/
 
 		struct PACKED NewOSGDTRecord final
 		{
diff --git a/Kernel/HALKit/ARM64/HalTimer.cxx b/Kernel/HALKit/ARM64/HalTimer.cxx
index ac9413e6..63e924c3 100644
--- a/Kernel/HALKit/ARM64/HalTimer.cxx
+++ b/Kernel/HALKit/ARM64/HalTimer.cxx
@@ -8,7 +8,7 @@
 	Revision History:
 
 	07/07/24: Added file (amlel)
-	
+
 ------------------------------------------- */
 
 #include <ArchKit/ArchKit.hpp>
diff --git a/Kernel/HALKit/POWER/Processor.hxx b/Kernel/HALKit/POWER/Processor.hxx
index 03b630a5..b2186aa7 100644
--- a/Kernel/HALKit/POWER/Processor.hxx
+++ b/Kernel/HALKit/POWER/Processor.hxx
@@ -11,7 +11,7 @@
 #include <NewKit/Defines.hpp>
 #include <NewKit/Utils.hpp>
 
-#define NoOp() asm volatile("mr 0, 0")
+#define NoOp()			 asm volatile("mr 0, 0")
 #define kHalPPCAlignment __attribute__((aligned(4)))
 
 namespace Kernel::HAL
@@ -47,14 +47,10 @@ EXTERN_C Kernel::Void int_handle_math(Kernel::UIntPtr sp);
 EXTERN_C Kernel::Void int_handle_pf(Kernel::UIntPtr sp);
 
 /// @brief Set TLB.
-Kernel::Bool hal_set_tlb(Kernel::UInt8 tlb, Kernel::UInt32 epn,
-    Kernel::UInt64 rpn, Kernel::UInt8 perms,
-    Kernel::UInt8 wimge, Kernel::UInt8 ts,
-    Kernel::UInt8 esel, Kernel::UInt8 tsize, Kernel::UInt8 iprot);
+Kernel::Bool hal_set_tlb(Kernel::UInt8 tlb, Kernel::UInt32 epn, Kernel::UInt64 rpn, Kernel::UInt8 perms, Kernel::UInt8 wimge, Kernel::UInt8 ts, Kernel::UInt8 esel, Kernel::UInt8 tsize, Kernel::UInt8 iprot);
 
 /// @brief Write TLB.
-Kernel::Void hal_write_tlb(Kernel::UInt32 mas0, Kernel::UInt32 mas1,
-    Kernel::UInt32 mas2, Kernel::UInt32 mas3, Kernel::UInt32 mas7);
+Kernel::Void hal_write_tlb(Kernel::UInt32 mas0, Kernel::UInt32 mas1, Kernel::UInt32 mas2, Kernel::UInt32 mas3, Kernel::UInt32 mas7);
 
 /// @brief Flush TLB.
 EXTERN_C Kernel::Void hal_flush_tlb();
diff --git a/Kernel/HALKit/POWER/ppc-cpu.h b/Kernel/HALKit/POWER/ppc-cpu.h
index 3855b85c..46979e5f 100644
--- a/Kernel/HALKit/POWER/ppc-cpu.h
+++ b/Kernel/HALKit/POWER/ppc-cpu.h
@@ -141,36 +141,36 @@ struct pt_regs
 #define SPRN_DBCR		0x3F2 /* Debug Control Regsiter */
 #define DBCR_EDM		0x80000000
 #define DBCR_IDM		0x40000000
-#define DBCR_RST(x)		(((x)&0x3) << 28)
+#define DBCR_RST(x)		(((x) & 0x3) << 28)
 #define DBCR_RST_NONE	0
 #define DBCR_RST_CORE	1
 #define DBCR_RST_CHIP	2
 #define DBCR_RST_SYSTEM 3
-#define DBCR_IC			0x08000000		  /* Instruction Completion Debug Evnt */
-#define DBCR_BT			0x04000000		  /* Branch Taken Debug Event */
-#define DBCR_EDE		0x02000000		  /* Exception Debug Event */
-#define DBCR_TDE		0x01000000		  /* TRAP Debug Event */
-#define DBCR_FER		0x00F80000		  /* First Events Remaining Mask */
-#define DBCR_FT			0x00040000		  /* Freeze Timers on Debug Event */
-#define DBCR_IA1		0x00020000		  /* Instr. Addr. Compare 1 Enable */
-#define DBCR_IA2		0x00010000		  /* Instr. Addr. Compare 2 Enable */
-#define DBCR_D1R		0x00008000		  /* Data Addr. Compare 1 Read Enable */
-#define DBCR_D1W		0x00004000		  /* Data Addr. Compare 1 Write Enable */
-#define DBCR_D1S(x)		(((x)&0x3) << 12) /* Data Adrr. Compare 1 Size */
+#define DBCR_IC			0x08000000			/* Instruction Completion Debug Evnt */
+#define DBCR_BT			0x04000000			/* Branch Taken Debug Event */
+#define DBCR_EDE		0x02000000			/* Exception Debug Event */
+#define DBCR_TDE		0x01000000			/* TRAP Debug Event */
+#define DBCR_FER		0x00F80000			/* First Events Remaining Mask */
+#define DBCR_FT			0x00040000			/* Freeze Timers on Debug Event */
+#define DBCR_IA1		0x00020000			/* Instr. Addr. Compare 1 Enable */
+#define DBCR_IA2		0x00010000			/* Instr. Addr. Compare 2 Enable */
+#define DBCR_D1R		0x00008000			/* Data Addr. Compare 1 Read Enable */
+#define DBCR_D1W		0x00004000			/* Data Addr. Compare 1 Write Enable */
+#define DBCR_D1S(x)		(((x) & 0x3) << 12) /* Data Adrr. Compare 1 Size */
 #define DAC_BYTE		0
 #define DAC_HALF		1
 #define DAC_WORD		2
 #define DAC_QUAD		3
-#define DBCR_D2R		0x00000800		 /* Data Addr. Compare 2 Read Enable */
-#define DBCR_D2W		0x00000400		 /* Data Addr. Compare 2 Write Enable */
-#define DBCR_D2S(x)		(((x)&0x3) << 8) /* Data Addr. Compare 2 Size */
-#define DBCR_SBT		0x00000040		 /* Second Branch Taken Debug Event */
-#define DBCR_SED		0x00000020		 /* Second Exception Debug Event */
-#define DBCR_STD		0x00000010		 /* Second Trap Debug Event */
-#define DBCR_SIA		0x00000008		 /* Second IAC Enable */
-#define DBCR_SDA		0x00000004		 /* Second DAC Enable */
-#define DBCR_JOI		0x00000002		 /* JTAG Serial Outbound Int. Enable */
-#define DBCR_JII		0x00000001		 /* JTAG Serial Inbound Int. Enable */
+#define DBCR_D2R		0x00000800		   /* Data Addr. Compare 2 Read Enable */
+#define DBCR_D2W		0x00000400		   /* Data Addr. Compare 2 Write Enable */
+#define DBCR_D2S(x)		(((x) & 0x3) << 8) /* Data Addr. Compare 2 Size */
+#define DBCR_SBT		0x00000040		   /* Second Branch Taken Debug Event */
+#define DBCR_SED		0x00000020		   /* Second Exception Debug Event */
+#define DBCR_STD		0x00000010		   /* Second Trap Debug Event */
+#define DBCR_SIA		0x00000008		   /* Second IAC Enable */
+#define DBCR_SDA		0x00000004		   /* Second DAC Enable */
+#define DBCR_JOI		0x00000002		   /* JTAG Serial Outbound Int. Enable */
+#define DBCR_JII		0x00000001		   /* JTAG Serial Inbound Int. Enable */
 #ifndef CONFIG_BOOKE
 #define SPRN_DBCR0 0x3F2 /* Debug Control Register 0 */
 #else
@@ -395,27 +395,27 @@ struct pt_regs
 #define TCR_WP(x) (((64 - x) & 0x3) << 30) | \
 					  (((64 - x) & 0x3c) << 15) /* WDT Period 2^x clocks*/
 #else
-#define TCR_WP(x) (((x)&0x3) << 30)	   /* WDT Period */
-#define WP_2_17	  0					   /* 2^17 clocks */
-#define WP_2_21	  1					   /* 2^21 clocks */
-#define WP_2_25	  2					   /* 2^25 clocks */
-#define WP_2_29	  3					   /* 2^29 clocks */
-#endif								   /* CONFIG_E500 */
-#define TCR_WRC(x)	 (((x)&0x3) << 28) /* WDT Reset Control */
-#define WRC_NONE	 0				   /* No reset will occur */
-#define WRC_CORE	 1				   /* Core reset will occur */
-#define WRC_CHIP	 2				   /* Chip reset will occur */
-#define WRC_SYSTEM	 3				   /* System reset will occur */
-#define TCR_WIE		 0x08000000		   /* WDT Interrupt Enable */
-#define TCR_PIE		 0x04000000		   /* PIT Interrupt Enable */
-#define TCR_FP(x)	 (((x)&0x3) << 24) /* FIT Period */
-#define FP_2_9		 0				   /* 2^9 clocks */
-#define FP_2_13		 1				   /* 2^13 clocks */
-#define FP_2_17		 2				   /* 2^17 clocks */
-#define FP_2_21		 3				   /* 2^21 clocks */
-#define TCR_FIE		 0x00800000		   /* FIT Interrupt Enable */
-#define TCR_ARE		 0x00400000		   /* Auto Reload Enable */
-#define SPRN_THRM1	 0x3FC			   /* Thermal Management Register 1 */
+#define TCR_WP(x) (((x) & 0x3) << 30)	 /* WDT Period */
+#define WP_2_17	  0						 /* 2^17 clocks */
+#define WP_2_21	  1						 /* 2^21 clocks */
+#define WP_2_25	  2						 /* 2^25 clocks */
+#define WP_2_29	  3						 /* 2^29 clocks */
+#endif									 /* CONFIG_E500 */
+#define TCR_WRC(x)	 (((x) & 0x3) << 28) /* WDT Reset Control */
+#define WRC_NONE	 0					 /* No reset will occur */
+#define WRC_CORE	 1					 /* Core reset will occur */
+#define WRC_CHIP	 2					 /* Chip reset will occur */
+#define WRC_SYSTEM	 3					 /* System reset will occur */
+#define TCR_WIE		 0x08000000			 /* WDT Interrupt Enable */
+#define TCR_PIE		 0x04000000			 /* PIT Interrupt Enable */
+#define TCR_FP(x)	 (((x) & 0x3) << 24) /* FIT Period */
+#define FP_2_9		 0					 /* 2^9 clocks */
+#define FP_2_13		 1					 /* 2^13 clocks */
+#define FP_2_17		 2					 /* 2^17 clocks */
+#define FP_2_21		 3					 /* 2^21 clocks */
+#define TCR_FIE		 0x00800000			 /* FIT Interrupt Enable */
+#define TCR_ARE		 0x00400000			 /* Auto Reload Enable */
+#define SPRN_THRM1	 0x3FC				 /* Thermal Management Register 1 */
 #define THRM1_TIN	 (1 << 0)
 #define THRM1_TIV	 (1 << 1)
 #define THRM1_THRES	 (0x7f << 2)
@@ -429,26 +429,26 @@ struct pt_regs
 #ifndef CONFIG_BOOKE
 #define SPRN_TSR 0x3D8 /* Timer Status Register */
 #else
-#define SPRN_TSR 0x150				  /* Book E Timer Status Register */
-#endif								  /* CONFIG_BOOKE */
-#define TSR_ENW		0x80000000		  /* Enable Next Watchdog */
-#define TSR_WIS		0x40000000		  /* WDT Interrupt Status */
-#define TSR_WRS(x)	(((x)&0x3) << 28) /* WDT Reset Status */
-#define WRS_NONE	0				  /* No WDT reset occurred */
-#define WRS_CORE	1				  /* WDT forced core reset */
-#define WRS_CHIP	2				  /* WDT forced chip reset */
-#define WRS_SYSTEM	3				  /* WDT forced system reset */
-#define TSR_PIS		0x08000000		  /* PIT Interrupt Status */
-#define TSR_FIS		0x04000000		  /* FIT Interrupt Status */
-#define SPRN_UMMCR0 0x3A8			  /* User Monitor Mode Control Register 0 */
-#define SPRN_UMMCR1 0x3AC			  /* User Monitor Mode Control Register 0 */
-#define SPRN_UPMC1	0x3A9			  /* User Performance Counter Register 1 */
-#define SPRN_UPMC2	0x3AA			  /* User Performance Counter Register 2 */
-#define SPRN_UPMC3	0x3AD			  /* User Performance Counter Register 3 */
-#define SPRN_UPMC4	0x3AE			  /* User Performance Counter Register 4 */
-#define SPRN_USIA	0x3AB			  /* User Sampled Instruction Address Register */
-#define SPRN_XER	0x001			  /* Fixed Point Exception Register */
-#define SPRN_ZPR	0x3B0			  /* Zone Protection Register */
+#define SPRN_TSR 0x150					/* Book E Timer Status Register */
+#endif									/* CONFIG_BOOKE */
+#define TSR_ENW		0x80000000			/* Enable Next Watchdog */
+#define TSR_WIS		0x40000000			/* WDT Interrupt Status */
+#define TSR_WRS(x)	(((x) & 0x3) << 28) /* WDT Reset Status */
+#define WRS_NONE	0					/* No WDT reset occurred */
+#define WRS_CORE	1					/* WDT forced core reset */
+#define WRS_CHIP	2					/* WDT forced chip reset */
+#define WRS_SYSTEM	3					/* WDT forced system reset */
+#define TSR_PIS		0x08000000			/* PIT Interrupt Status */
+#define TSR_FIS		0x04000000			/* FIT Interrupt Status */
+#define SPRN_UMMCR0 0x3A8				/* User Monitor Mode Control Register 0 */
+#define SPRN_UMMCR1 0x3AC				/* User Monitor Mode Control Register 0 */
+#define SPRN_UPMC1	0x3A9				/* User Performance Counter Register 1 */
+#define SPRN_UPMC2	0x3AA				/* User Performance Counter Register 2 */
+#define SPRN_UPMC3	0x3AD				/* User Performance Counter Register 3 */
+#define SPRN_UPMC4	0x3AE				/* User Performance Counter Register 4 */
+#define SPRN_USIA	0x3AB				/* User Sampled Instruction Address Register */
+#define SPRN_XER	0x001				/* Fixed Point Exception Register */
+#define SPRN_ZPR	0x3B0				/* Zone Protection Register */
 
 /* Book E definitions */
 #define SPRN_DECAR	 0x036 /* Decrementer Auto Reload Register */
@@ -853,7 +853,7 @@ struct pt_regs
 #define IOCR_PTD	0x00000400
 #define IOCR_ARE	0x00000080
 #define IOCR_DRC	0x00000020
-#define IOCR_RDM(x) (((x)&0x3) << 3)
+#define IOCR_RDM(x) (((x) & 0x3) << 3)
 #define IOCR_TCS	0x00000004
 #define IOCR_SCS	0x00000002
 #define IOCR_SPC	0x00000001
@@ -1252,7 +1252,7 @@ int fsl_qoriq_dsp_core_to_cluster(unsigned int core);
 #if defined(CONFIG_MPC83xx)
 #define CPU_TYPE_ENTRY(x) \
 	{                     \
-#x, SPR_##x       \
+		#x, SPR_##x       \
 	}
 #endif
 #endif
diff --git a/Kernel/HALKit/POWER/ppc-mmu.h b/Kernel/HALKit/POWER/ppc-mmu.h
index 8546b0fb..8e4b3595 100644
--- a/Kernel/HALKit/POWER/ppc-mmu.h
+++ b/Kernel/HALKit/POWER/ppc-mmu.h
@@ -411,7 +411,7 @@ extern void print_bats(void);
 #define MAS0_TLBSEL(x)	(((x) << 28) & MAS0_TLBSEL_MSK)
 #define MAS0_ESEL_MSK	0x0FFF0000
 #define MAS0_ESEL(x)	(((x) << 16) & MAS0_ESEL_MSK)
-#define MAS0_NV(x)		((x)&0x00000FFF)
+#define MAS0_NV(x)		((x) & 0x00000FFF)
 
 #define MAS1_VALID		  0x80000000
 #define MAS1_IPROT		  0x40000000
@@ -468,9 +468,9 @@ extern void print_bats(void);
 	 (((ts) << 12) & MAS1_TS) |                  \
 	 (MAS1_TSIZE(tsize)))
 #define FSL_BOOKE_MAS2(epn, wimge) \
-	(((epn)&MAS3_RPN) | (wimge))
+	(((epn) & MAS3_RPN) | (wimge))
 #define FSL_BOOKE_MAS3(rpn, user, perms) \
-	(((rpn)&MAS3_RPN) | (user) | (perms))
+	(((rpn) & MAS3_RPN) | (user) | (perms))
 #define FSL_BOOKE_MAS7(rpn) \
 	(((uint64_t)(rpn)) >> 32)
 
@@ -638,10 +638,10 @@ extern int					  num_tlb_entries;
 
 /* Some handy macros */
 
-#define EPN(e)			((e)&0xfffffc00)
+#define EPN(e)			((e) & 0xfffffc00)
 #define TLB0(epn, sz)	((EPN((epn)) | (sz) | TLB_VALID))
-#define TLB1(rpn, erpn) (((rpn)&0xfffffc00) | (erpn))
-#define TLB2(a)			((a)&0x00000fbf)
+#define TLB1(rpn, erpn) (((rpn) & 0xfffffc00) | (erpn))
+#define TLB2(a)			((a) & 0x00000fbf)
 
 #define tlbtab_start \
 	mflr r1;         \
diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hpp
index 3d4f1e7d..927d8b56 100644
--- a/Kernel/KernelKit/FileManager.hpp
+++ b/Kernel/KernelKit/FileManager.hpp
@@ -42,7 +42,7 @@
 #define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR)
 
 /**
-    @note Refer to first enum.
+	@note Refer to first enum.
 */
 #define cFileOpsCount	 4
 #define cFileMimeGeneric "n-application-kind/all"
diff --git a/Kernel/KernelKit/PCI/Dma.hpp b/Kernel/KernelKit/PCI/Dma.hpp
index 7da1f241..e5e44c0b 100644
--- a/Kernel/KernelKit/PCI/Dma.hpp
+++ b/Kernel/KernelKit/PCI/Dma.hpp
@@ -52,7 +52,7 @@ namespace Kernel
 		T* Get(const UIntPtr off = 0);
 
 	public:
-			 operator bool();
+		operator bool();
 		bool operator!();
 
 	public:
diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx
index 6dbec9e1..cbce2ec2 100644
--- a/Kernel/KernelKit/ProcessScheduler.hxx
+++ b/Kernel/KernelKit/ProcessScheduler.hxx
@@ -247,7 +247,7 @@ namespace Kernel
 
 		NEWOS_COPY_DEFAULT(ProcessScheduler)
 
-			 operator bool();
+		operator bool();
 		bool operator!();
 
 	public:
@@ -255,7 +255,7 @@ namespace Kernel
 
 	public:
 		SizeT Add(Ref<ProcessHeader>& processRef);
-		Bool Remove(SizeT processSlot);
+		Bool  Remove(SizeT processSlot);
 
 	public:
 		Ref<ProcessHeader>& TheCurrent();
@@ -275,8 +275,8 @@ namespace Kernel
 	class ProcessHelper final
 	{
 	public:
-		STATIC bool Switch(HAL::StackFrame* newStack, const PID& newPid);
-		STATIC bool CanBeScheduled(Ref<ProcessHeader>& process);
+		STATIC bool	 Switch(HAL::StackFrame* newStack, const PID& newPid);
+		STATIC bool	 CanBeScheduled(Ref<ProcessHeader>& process);
 		STATIC PID&	 TheCurrentPID();
 		STATIC SizeT StartScheduling();
 	};
diff --git a/Kernel/KernelKit/SMPManager.hpp b/Kernel/KernelKit/SMPManager.hpp
index f6afd7a8..69c8b54e 100644
--- a/Kernel/KernelKit/SMPManager.hpp
+++ b/Kernel/KernelKit/SMPManager.hpp
@@ -98,7 +98,7 @@ namespace Kernel
 	public:
 		Ref<HardwareThread*> operator[](const SizeT& idx);
 		bool				 operator!() noexcept;
-							 operator bool() noexcept;
+		operator bool() noexcept;
 
 	public:
 		/// @brief Shared instance of the SMP Manager.
diff --git a/Kernel/KernelKit/ThreadLocalStorage.hxx b/Kernel/KernelKit/ThreadLocalStorage.hxx
index 2dadd48e..4a0d7528 100644
--- a/Kernel/KernelKit/ThreadLocalStorage.hxx
+++ b/Kernel/KernelKit/ThreadLocalStorage.hxx
@@ -22,10 +22,10 @@
 struct PACKED ThreadInformationBlock final
 {
 	Kernel::Char	Cookie[kTLSCookieLen]; // Process cookie.
-	Kernel::UIntPtr StartCode;	// Start Address
-	Kernel::UIntPtr StartData;	// Allocation Heap
-	Kernel::UIntPtr StartStack; // Stack Pointer.
-	Kernel::Int32	ThreadID;	// Thread execution ID.
+	Kernel::UIntPtr StartCode;			   // Start Address
+	Kernel::UIntPtr StartData;			   // Allocation Heap
+	Kernel::UIntPtr StartStack;			   // Stack Pointer.
+	Kernel::Int32	ThreadID;			   // Thread execution ID.
 };
 
 typedef struct ThreadInformationBlock ProcessInformationBlock;
diff --git a/Kernel/KernelKit/ThreadLocalStorage.inl b/Kernel/KernelKit/ThreadLocalStorage.inl
index d2bd71d4..0a860336 100644
--- a/Kernel/KernelKit/ThreadLocalStorage.inl
+++ b/Kernel/KernelKit/ThreadLocalStorage.inl
@@ -66,8 +66,8 @@ T* tls_new_class(Args&&... args)
 template <typename T>
 inline Kernel::Bool tls_delete_class(T* ptr)
 {
-    if (!ptr)
-        return false;
+	if (!ptr)
+		return false;
 
 	ptr->~T();
 	return tls_delete_ptr(ptr);
diff --git a/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx b/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx
index ab6bc6a4..6beb12a9 100644
--- a/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx
+++ b/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx
@@ -14,9 +14,9 @@
 
 namespace Kernel
 {
-    class ACPIFactoryInterface;
+	class ACPIFactoryInterface;
 
-    typedef ACPIFactoryInterface PowerFactoryInterface;
+	typedef ACPIFactoryInterface PowerFactoryInterface;
 
 	class ACPIFactoryInterface final
 	{
diff --git a/Kernel/Modules/CoreCG/CoreCG.hxx b/Kernel/Modules/CoreCG/CoreCG.hxx
index 86aa49ce..4894d150 100644
--- a/Kernel/Modules/CoreCG/CoreCG.hxx
+++ b/Kernel/Modules/CoreCG/CoreCG.hxx
@@ -17,7 +17,7 @@
 #define CGFini() __GXCursor = 0
 
 /// @brief Performs OR drawing on the framebuffer.
-#define CGDrawBitMapInRegionA(ImgPtr, _Height, _Width, BaseX, BaseY)                         \
+#define CGDrawBitMapInRegionA(ImgPtr, _Height, _Width, BaseX, BaseY)                  \
 	__GXCursor = 0;                                                                   \
                                                                                       \
 	for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i)                         \
@@ -27,14 +27,14 @@
 			*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The +              \
 										  4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
 											  i +                                     \
-										  4 * u))) |= (ImgPtr)[__GXCursor];             \
+										  4 * u))) |= (ImgPtr)[__GXCursor];           \
                                                                                       \
 			++__GXCursor;                                                             \
 		}                                                                             \
 	}
 
 /// @brief Draws a resource.
-#define CGDrawBitMapInRegion(ImgPtr, _Height, _Width, BaseX, BaseY)                              \
+#define CGDrawBitMapInRegion(ImgPtr, _Height, _Width, BaseX, BaseY)                   \
 	__GXCursor = 0;                                                                   \
                                                                                       \
 	for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i)                         \
@@ -44,14 +44,14 @@
 			*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The +              \
 										  4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
 											  i +                                     \
-										  4 * u))) = (ImgPtr)[__GXCursor];              \
+										  4 * u))) = (ImgPtr)[__GXCursor];            \
                                                                                       \
 			++__GXCursor;                                                             \
 		}                                                                             \
 	}
 
 /// @brief Cleans a resource.
-#define CGClearRegion(_Height, _Width, BaseX, BaseY)                                        \
+#define CGClearRegion(_Height, _Width, BaseX, BaseY)                                  \
                                                                                       \
 	for (Kernel::SizeT i = BaseX; i < _Height + BaseX; ++i)                           \
 	{                                                                                 \
@@ -60,12 +60,12 @@
 			*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The +              \
 										  4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
 											  i +                                     \
-										  4 * u))) = cCGClearClr;                      \
+										  4 * u))) = cCGClearClr;                     \
 		}                                                                             \
 	}
 
 /// @brief Draws inside a zone.
-#define CGDrawInRegion(_Clr, _Height, _Width, BaseX, BaseY)                                   \
+#define CGDrawInRegion(_Clr, _Height, _Width, BaseX, BaseY)                           \
                                                                                       \
 	for (Kernel::SizeT i = BaseX; i < (_Width + BaseX); ++i)                          \
 	{                                                                                 \
diff --git a/Kernel/Modules/CoreCG/CoreIMG.hxx b/Kernel/Modules/CoreCG/CoreIMG.hxx
index 8fb4629d..f51c1255 100644
--- a/Kernel/Modules/CoreCG/CoreIMG.hxx
+++ b/Kernel/Modules/CoreCG/CoreIMG.hxx
@@ -5,9 +5,9 @@
 
 namespace Kernel
 {
-    struct IMGContainerHeader;
-    struct IMGMetadataHeader;
+	struct IMGContainerHeader;
+	struct IMGMetadataHeader;
 
-}
+} // namespace Kernel
 
 #endif // ifndef __CORECG_IMG_HXX__
diff --git a/Kernel/NewKit/Defines.hpp b/Kernel/NewKit/Defines.hpp
index aee914ba..606449ec 100644
--- a/Kernel/NewKit/Defines.hpp
+++ b/Kernel/NewKit/Defines.hpp
@@ -143,8 +143,8 @@ namespace Kernel
 
 #define VoidStar Kernel::VoidPtr
 
-#ifdef INIT
-#undef INIT
-#endif // ifdef INIT
+#ifdef cInitObject
+#undef cInitObject
+#endif // ifdef cInitObject
 
-#define INIT(OBJ, TYPE, ...) TYPE OBJ = TYPE(__VA_ARGS__)
+#define cInitObject(OBJ, TYPE, ...) TYPE OBJ = TYPE(__VA_ARGS__)
diff --git a/Kernel/NewKit/Json.hxx b/Kernel/NewKit/Json.hxx
index b7623f33..8d4f3a8d 100644
--- a/Kernel/NewKit/Json.hxx
+++ b/Kernel/NewKit/Json.hxx
@@ -15,6 +15,8 @@
 #include <NewKit/String.hpp>
 #include <NewKit/Utils.hpp>
 
+#define cMaxJsonPath 4096
+
 namespace Kernel
 {
 	/// @brief Json value class
@@ -57,62 +59,66 @@ namespace Kernel
 		static JsonType kUndefined;
 	};
 
-	/// @brief Json stream helper class.
-	struct JsonStreamTrait final
+	/// @brief Json stream reader helper.
+	struct JsonStreamReader final
 	{
-		JsonType In(const char* full_array)
+		STATIC JsonType In(const Char* full_array)
 		{
-			SizeT len = rt_string_len(full_array);
+			if (full_array[0] != '{')
+				return JsonType::kUndefined;
 
-			if (full_array[0] == '\"' && full_array[len - 1] == ',' ||
-				full_array[len - 1] == '\"')
-			{
-				Boolean probe_key = true;
+			SizeT	len			= rt_string_len(full_array);
+			Boolean probe_value = false;
 
-				SizeT key_len	= 0;
-				SizeT value_len = 0;
+			SizeT key_len	= 0;
+			SizeT value_len = 0;
 
-				for (SizeT i = 1; i < len; i++)
-				{
-					if (full_array[i] == ' ')
-						continue;
+			JsonType type(cMaxJsonPath, cMaxJsonPath);
 
-					JsonType type(kPathLen, kPathLen);
+			for (SizeT i = 1; i < len; ++i)
+			{
+				if (full_array[i] == '\r' ||
+					full_array[i] == '\n')
+					continue;
 
-					if (probe_key)
+				if (probe_value)
+				{
+					if (full_array[i] == '}' ||
+						full_array[i] == ',')
 					{
-						type.AsKey().Data()[key_len] = full_array[i];
-						++key_len;
-
-						if (full_array[i] == '\"')
-						{
-							probe_key					 = false;
-							type.AsKey().Data()[key_len] = 0;
+						probe_value = false;
 
-							++i;
-						}
+						++value_len;
 					}
 					else
 					{
 						type.AsValue().Data()[value_len] = full_array[i];
+
 						++value_len;
+					}
+				}
+				else
+				{
+					if (full_array[i] == ':')
+					{
+						probe_value					 = true;
+						type.AsKey().Data()[key_len] = 0;
+						++key_len;
+					}
+					else
+					{
+						type.AsKey().Data()[key_len] = full_array[i];
 
-						if (full_array[i] == '\"')
-						{
-							type.AsValue().Data()[value_len] = 0;
-						}
+						++key_len;
 					}
 				}
 			}
 
-			return JsonType::kUndefined;
-		}
+			type.AsValue().Data()[value_len] = 0;
 
-		JsonType Out(JsonType& out)
-		{
-			return out;
+			return type;
 		}
 	};
 
-	using JsonStream = Stream<JsonStreamTrait, JsonType>;
+	using JsonStream = Stream<JsonStreamReader, JsonType>;
 } // namespace Kernel
diff --git a/Kernel/NewKit/Ref.hpp b/Kernel/NewKit/Ref.hpp
index 6bb04f44..da5d6206 100644
--- a/Kernel/NewKit/Ref.hpp
+++ b/Kernel/NewKit/Ref.hpp
@@ -73,7 +73,7 @@ namespace Kernel
 		NonNullRef(T* ref)
 			: fRef(ref, true)
 		{
-		  MUST_PASS(ref != nullptr);
+			MUST_PASS(ref != nullptr);
 		}
 
 		Ref<T>& operator->()
diff --git a/Kernel/Sources/CxxAbi-ARM64.cxx b/Kernel/Sources/CxxAbi-ARM64.cxx
index 4602be7a..46524374 100644
--- a/Kernel/Sources/CxxAbi-ARM64.cxx
+++ b/Kernel/Sources/CxxAbi-ARM64.cxx
@@ -10,62 +10,60 @@
 #include <NewKit/CxxAbi.hpp>
 #include <KernelKit/HError.hpp>
 
-
 EXTERN_C
 {
 #include <limits.h>
 }
 
-int const cUninitialized    = 0;
+int const cUninitialized	= 0;
 int const cBeingInitialized = -1;
-int const cEpochStart       = INT_MIN;
+int const cEpochStart		= INT_MIN;
 
 EXTERN_C
 {
-    int _Init_global_epoch = cEpochStart;
-    __thread int _Init_thread_epoch = cEpochStart;
+	int			 _Init_global_epoch = cEpochStart;
+	__thread int _Init_thread_epoch = cEpochStart;
 }
 
 Kernel::UInt32 const cNKTimeout = 100; // ms
 
 EXTERN_C void __cdecl _Init_thread_wait(Kernel::UInt32 const timeout)
 {
-    MUST_PASS(timeout != INT_MAX);
+	MUST_PASS(timeout != INT_MAX);
 }
 
 EXTERN_C void __cdecl _Init_thread_header(int* const pOnce) noexcept
 {
-    if (*pOnce == cUninitialized)
-    {
-        *pOnce = cBeingInitialized;
-    }
-    else
-    {
-        while (*pOnce == cBeingInitialized)
-        {
-            _Init_thread_wait(cNKTimeout);
-
-            if (*pOnce == cUninitialized)
-            {
-                *pOnce = cBeingInitialized;
-                return;
-            }
-        }
-        _Init_thread_epoch = _Init_global_epoch;
-    }
-
+	if (*pOnce == cUninitialized)
+	{
+		*pOnce = cBeingInitialized;
+	}
+	else
+	{
+		while (*pOnce == cBeingInitialized)
+		{
+			_Init_thread_wait(cNKTimeout);
+
+			if (*pOnce == cUninitialized)
+			{
+				*pOnce = cBeingInitialized;
+				return;
+			}
+		}
+		_Init_thread_epoch = _Init_global_epoch;
+	}
 }
 
 EXTERN_C void __cdecl _Init_thread_abort(int* const pOnce) noexcept
 {
-    *pOnce = cUninitialized;
+	*pOnce = cUninitialized;
 }
 
 EXTERN_C void __cdecl _Init_thread_footer(int* const pOnce) noexcept
 {
-    ++_Init_global_epoch;
-    *pOnce = _Init_global_epoch;
-    _Init_thread_epoch = _Init_global_epoch;
+	++_Init_global_epoch;
+	*pOnce			   = _Init_global_epoch;
+	_Init_thread_epoch = _Init_global_epoch;
 }
 
 EXTERN_C void _purecall()
diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index 45cdc766..5a8ff1a2 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -38,7 +38,7 @@ STATIC MountpointInterface sMountpointInterface;
 /// @param theFork the fork itself.
 /// @return the fork
 _Output NewFork* NewFSParser::CreateFork(_Input NewCatalog* catalog,
-										 _Input NewFork& theFork)
+										 _Input NewFork&	theFork)
 {
 	if (!sMountpointInterface.GetAddressOf(this->fDriveIndex))
 		return nullptr;
@@ -207,7 +207,7 @@ _Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name)
 /// @param flags the flags of the catalog.
 /// @param kind the catalog kind.
 /// @return catalog pointer.
-_Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name,
+_Output NewCatalog* NewFSParser::CreateCatalog(_Input const char*  name,
 											   _Input const Int32& flags,
 											   _Input const Int32& kind)
 {
diff --git a/Kernel/Sources/Framebuffer.cxx b/Kernel/Sources/Framebuffer.cxx
index c9c44a55..f006a9b9 100644
--- a/Kernel/Sources/Framebuffer.cxx
+++ b/Kernel/Sources/Framebuffer.cxx
@@ -70,14 +70,13 @@ namespace Kernel
 	}
 
 	/// @brief Draws a rectangle.
-	/// @param width 
-	/// @param height 
-	/// @param x 
-	/// @param y 
-	/// @param color 
-	/// @return 
-	_Output Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height,
-	 											SizeT x, SizeT y, UInt32 color)
+	/// @param width
+	/// @param height
+	/// @param x
+	/// @param y
+	/// @param color
+	/// @return
+	_Output Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y, UInt32 color)
 	{
 		for (Kernel::SizeT i = x; i < width + x; ++i)
 		{
@@ -93,10 +92,10 @@ namespace Kernel
 	}
 
 	/// @brief Put a pixel on the screen.
-	/// @param x 
-	/// @param y 
-	/// @param color 
-	/// @return 
+	/// @param x
+	/// @param y
+	/// @param color
+	/// @return
 	_Output Framebuffer& Framebuffer::PutPixel(SizeT x, SizeT y, UInt32 color)
 	{
 		*(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase +
diff --git a/Kernel/Sources/Json.cxx b/Kernel/Sources/Json.cxx
index 510ebd77..6ecd8e47 100644
--- a/Kernel/Sources/Json.cxx
+++ b/Kernel/Sources/Json.cxx
@@ -9,4 +9,4 @@
 using namespace Kernel;
 
 /// @brief Undefined object, is null in length.
-INIT(Kernel::JsonType::kUndefined, Kernel::JsonType);
+cInitObject(Kernel::JsonType::kUndefined, Kernel::JsonType);
diff --git a/Kernel/Sources/KernelHeap.cxx b/Kernel/Sources/KernelHeap.cxx
index 8c550b61..510584dd 100644
--- a/Kernel/Sources/KernelHeap.cxx
+++ b/Kernel/Sources/KernelHeap.cxx
@@ -63,7 +63,7 @@ namespace Kernel
 
 		if (heapInfoBlk->fCRC32 > 0)
 		{
-		    MUST_PASS(ke_protect_ke_heap(allocatedPtr));
+			MUST_PASS(ke_protect_ke_heap(allocatedPtr));
 		}
 
 		return allocatedPtr;
@@ -76,7 +76,7 @@ namespace Kernel
 	/// @return the pointer
 	VoidPtr ke_new_ke_heap(const SizeT sz, const bool rw, const bool user)
 	{
-	   auto szFix = sz;
+		auto szFix = sz;
 
 		if (szFix == 0)
 			++szFix;
diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx
index 85aa7f76..42e7285a 100644
--- a/Kernel/Sources/ProcessScheduler.cxx
+++ b/Kernel/Sources/ProcessScheduler.cxx
@@ -219,7 +219,7 @@ namespace Kernel
 		}
 		else
 		{
-		    // something went wrong, do not continue, process kind is incorrect.
+			// something went wrong, do not continue, process kind is incorrect.
 			process.Leak().Crash();
 			return -kErrorProcessFault;
 		}
@@ -245,7 +245,7 @@ namespace Kernel
 	/// @retval false process doesn't exist in team.
 	Bool ProcessScheduler::Remove(SizeT processSlot)
 	{
-	    // check if process is within range.
+		// check if process is within range.
 		if (processSlot > mTeam.AsArray().Count())
 			return false;
 
diff --git a/Kernel/Sources/Storage/NVMEDeviceInterface.cxx b/Kernel/Sources/Storage/NVMEDeviceInterface.cxx
index c5d47725..e1d4ed30 100644
--- a/Kernel/Sources/Storage/NVMEDeviceInterface.cxx
+++ b/Kernel/Sources/Storage/NVMEDeviceInterface.cxx
@@ -8,9 +8,9 @@
 
 namespace Kernel
 {
-    NVMEDeviceInterface::NVMEDeviceInterface(void (*Out)(MountpointInterface* outpacket),
-								 void (*In)(MountpointInterface* inpacket),
-								 void (*Cleanup)(void))
+	NVMEDeviceInterface::NVMEDeviceInterface(void (*Out)(MountpointInterface* outpacket),
+											 void (*In)(MountpointInterface* inpacket),
+											 void (*Cleanup)(void))
 		: DeviceInterface(Out, In), fCleanup(Cleanup)
 	{
 	}
diff --git a/Kernel/Sources/URL.cxx b/Kernel/Sources/URL.cxx
index 104d5f36..88328ea6 100644
--- a/Kernel/Sources/URL.cxx
+++ b/Kernel/Sources/URL.cxx
@@ -21,8 +21,8 @@ namespace Kernel
 
 	/// @brief internal and reserved protocols by kernel.
 	constexpr const Char* kURLProtocols[] = {
-		"file",	 // Filesystem protocol
-		"zup",	 // Zeta update protocol
+		"file", // Filesystem protocol
+		"zup",	// Zeta update protocol
 		"oscc", // Open System Configuration Connectivity.
 	};