From 8153dc983802115951836f2b164af371ee6e3d73 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Wed, 24 Apr 2024 19:57:10 +0200
Subject: MHR-16: Add QR-code when bootloader crashes alongside other welcomed
 changes.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/Source/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 2f9e3756..11c1da75 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -36,7 +36,7 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__KERNEL__ -D__NEWBOOT__
 invalid-recipe:
 	@echo "invalid-recipe: Use make bootloader-<arch> instead."
 
-KERNEL_OBJ=kernel.bin
+KERNEL_OBJ=boot.bin
 DD=dd
 IMG_CREATE=qemu-img
 MAX_KERNEL_SIZE=1024K
-- 
cgit v1.2.3


From 14f26421cc6ebd678c2b5a2a04fe6cdc63ee5d38 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Thu, 25 Apr 2024 13:44:36 +0200
Subject: MHR-16: Adding BDiskFormatFactory according to MHR-16, bug fixes and
 improvements as well.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/DriverKit/KernelCall.c                     |  24 +++++
 Private/DriverKit/KernelDev.h                      |   4 +
 Private/DriverKit/KernelDispatchCall.S             |   2 +-
 Private/DriverKit/KernelStd.c                      |  24 -----
 Private/FSKit/NewFS.hxx                            |   8 +-
 Private/NewBoot/BootKit/BootKit.hxx                | 108 ++++++++++++++++---
 Private/NewBoot/BootKit/HW/ATA.hxx                 |   4 +-
 Private/NewBoot/BootKit/Vendor/Qr.hxx              |   3 +
 Private/NewBoot/Source/HEL/AMD64/BootATA.cxx       |  11 +-
 Private/NewBoot/Source/HEL/AMD64/Support.cxx       |  14 +++
 Private/NewBoot/Source/HEL/POWER/BootCoreBoot.S    |  34 ------
 Private/NewBoot/Source/HEL/POWER/BootEPM.cxx       | 118 ---------------------
 Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S |  34 ++++++
 Private/NewBoot/Source/makefile                    |   5 +-
 14 files changed, 192 insertions(+), 201 deletions(-)
 create mode 100644 Private/DriverKit/KernelCall.c
 delete mode 100644 Private/DriverKit/KernelStd.c
 delete mode 100644 Private/NewBoot/Source/HEL/POWER/BootCoreBoot.S
 delete mode 100644 Private/NewBoot/Source/HEL/POWER/BootEPM.cxx
 create mode 100644 Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/DriverKit/KernelCall.c b/Private/DriverKit/KernelCall.c
new file mode 100644
index 00000000..494ac0bc
--- /dev/null
+++ b/Private/DriverKit/KernelCall.c
@@ -0,0 +1,24 @@
+/* -------------------------------------------
+
+    Copyright Mahrouss Logic
+
+    Purpose: Kernel Definitions.
+
+------------------------------------------- */
+
+#include <DriverKit/KernelStd.h>
+#include <stdarg.h>
+
+DK_EXTERN __attribute__((naked)) void __kernelDispatchCall(int32_t cnt, ...);
+
+DK_EXTERN void* kernelCall(const char* kernelRpcName, int32_t cnt, ...) {
+    if (!kernelRpcName || cnt == 0) return NIL;
+
+    va_list arg;
+    va_start(arg, cnt);
+
+    __kernelDispatchCall(cnt, arg);
+
+    va_end(arg);
+
+}
diff --git a/Private/DriverKit/KernelDev.h b/Private/DriverKit/KernelDev.h
index daa60a7c..8b6888f0 100644
--- a/Private/DriverKit/KernelDev.h
+++ b/Private/DriverKit/KernelDev.h
@@ -10,7 +10,11 @@
 
 #include <DriverKit/KernelStd.h>
 
+struct _kernelDevice;
+
+/// @brief Kernel Device driver.
 typedef struct _kernelDevice {
+    char name[255]; // the device name. Could be /./DEVICE_NAME/
     int32_t(*read)(); // read from device.
     int32_t(*write)(); // write to device.
     struct _kernelDevice* (*open)(const char* path); // open device.
diff --git a/Private/DriverKit/KernelDispatchCall.S b/Private/DriverKit/KernelDispatchCall.S
index 4eec8ae0..64b6663e 100644
--- a/Private/DriverKit/KernelDispatchCall.S
+++ b/Private/DriverKit/KernelDispatchCall.S
@@ -14,7 +14,7 @@ __kernelDispatchCall:
 #elif defined(__powerpc64__)
 
 __kernelDispatchCall:
-    mflr 3
+    /* There is no specific interrupt request id for a system call in POWER. */
     sc
     blr
 
diff --git a/Private/DriverKit/KernelStd.c b/Private/DriverKit/KernelStd.c
deleted file mode 100644
index 494ac0bc..00000000
--- a/Private/DriverKit/KernelStd.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -------------------------------------------
-
-    Copyright Mahrouss Logic
-
-    Purpose: Kernel Definitions.
-
-------------------------------------------- */
-
-#include <DriverKit/KernelStd.h>
-#include <stdarg.h>
-
-DK_EXTERN __attribute__((naked)) void __kernelDispatchCall(int32_t cnt, ...);
-
-DK_EXTERN void* kernelCall(const char* kernelRpcName, int32_t cnt, ...) {
-    if (!kernelRpcName || cnt == 0) return NIL;
-
-    va_list arg;
-    va_start(arg, cnt);
-
-    __kernelDispatchCall(cnt, arg);
-
-    va_end(arg);
-
-}
diff --git a/Private/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx
index 339b9832..cc43f51b 100644
--- a/Private/FSKit/NewFS.hxx
+++ b/Private/FSKit/NewFS.hxx
@@ -82,7 +82,7 @@ default.
 #define kNewFSLbaType (NewOS::Lba)
 
 /// Start After the PM headers, pad 1024 bytes.
-#define kNewFSAddressAsLba (1024U)
+#define kNewFSAddressAsLba (1024)
 
 #define kResourceTypeDialog 10
 #define kResourceTypeString 11
@@ -95,6 +95,8 @@ default.
 #define kNewFSFlagUnallocated 0x00
 #define kNewFSFlagCreated 0x0F
 
+#define kNewFSMimeNameLen (216)
+
 typedef NewOS::Char NewCharType;
 
 enum {
@@ -106,10 +108,10 @@ enum {
   kNewFSDriveCount = 5,
 };
 
-/// @brief Ccatalog type.
+/// @brief Catalog type.
 struct PACKED NewCatalog final {
   NewCharType Name[kNewFSNodeNameLen];
-  NewCharType Mime[kNewFSNodeNameLen];
+  NewCharType Mime[kNewFSMimeNameLen];
 
   NewOS::Int32 Flags;
   NewOS::Int32 Kind;
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 5c3a531d..15700f54 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -11,6 +11,22 @@
 
 #pragma once
 
+#include <BootKit/HW/ATA.hxx>
+#include <CompilerKit/Version.hxx>
+
+/// include NewFS header and Support header as well.
+
+#include <FSKit/NewFS.hxx>
+#include <cstring>
+#include <BootKit/Vendor/Support.hxx>
+
+/***********************************************************************************/
+/// Include other APIs.
+/***********************************************************************************/
+
+#include <NewKit/Defines.hpp>
+#include "Builtins/ATA/ATA.hxx"
+
 /***********************************************************************************/
 /// Framebuffer helpers.
 /***********************************************************************************/
@@ -22,15 +38,6 @@ class BFileReader;
 class BFileRunner;
 class BVersionString;
 
-#include <BootKit/HW/ATA.hxx>
-#include <CompilerKit/Version.hxx>
-
-/***********************************************************************************/
-/// Include other APIs.
-/***********************************************************************************/
-
-#include <NewKit/Defines.hpp>
-
 ///! @note This address is reserved to NewKernel.
 #define kBootVirtualAddress (0xfffffff80000000)
 
@@ -39,12 +46,6 @@ using namespace NewOS;
 typedef Char *PEFImagePtr;
 typedef Char *PEImagePtr;
 
-enum {
-  kSegmentCode = 2,
-  kSegmentData = 4,
-  kSegmentBss = 6,
-};
-
 typedef WideChar CharacterTypeUTF16;
 typedef Char CharacterTypeUTF8;
 
@@ -169,3 +170,80 @@ static inline const UInt32 kRgbGreen = 0x0000FF00;
 static inline const UInt32 kRgbBlue = 0x00FF0000;
 static inline const UInt32 kRgbBlack = 0x00000000;
 static inline const UInt32 kRgbWhite = 0x00FFFFFF;
+
+/// @brief BootKit Disk Formatter.
+template <typename BootDev>
+class BDiskFormatFactory final {
+public:
+    /// @brief File entry for **BDiskFormatFactory**.
+    struct BFileDescriptor final {
+        Char fFilename[255];
+        Char fForkName[255];
+
+        VoidPtr fBlob;
+        SizeT fBlobSz;
+
+        struct BFileDescriptor* fPrev;
+        struct BFileDescriptor* fNext;
+    };
+
+public:
+    explicit BDiskFormatFactory() = default;
+    explicit BDiskFormatFactory(BootDev dev) : fDiskDev(dev) {}
+    ~BDiskFormatFactory() = default;
+
+    NEWOS_COPY_DELETE(BDiskFormatFactory);
+
+    /// @brief Format disk.
+    /// @param Partition Name
+    /// @param Blobs.
+    /// @param Number of blobs.
+    /// @retval True disk has been formatted.
+    /// @retval False failed to format.
+    Boolean Format(const char* partName, BFileDescriptor* fileBlobs, SizeT blobCount);
+
+private:
+    /// @brief Write all of the requested catalogs into the filesystem.
+    Boolean _AppendCatalogList(BFileDescriptor* fileBlobs, SizeT blobCount) {
+        return true;
+    }
+
+private:
+    BootDev fDiskDev;
+
+};
+
+/// @brief Format disk.
+/// @param Partition Name
+/// @param Blobs.
+/// @param Number of blobs.
+/// @retval True disk has been formatted.
+/// @retval False failed to format.
+template <typename BootDev>
+inline Boolean BDiskFormatFactory<BootDev>::Format(const char* partName,
+    BDiskFormatFactory::BFileDescriptor* fileBlobs, SizeT blobCount) {
+    // if (!fileBlobs || !blobCount) return false;
+
+    static_assert(kNewFSMinimumSectorSz == kATASectorSize, "Sector size doesn't match!");
+
+    Char buf[kNewFSMinimumSectorSz] = { 0 };
+    NewPartitionBlock* partBlock = reinterpret_cast<NewPartitionBlock*>(buf);
+
+    memcpy(partBlock->PartitionName, partName, strlen(partName));
+
+    /// @note A catalog roughly equal to a sector.
+
+    partBlock->CatalogCount = blobCount;
+    partBlock->Kind = kNewFSHardDrive;
+    partBlock->SectorCount = kNewFSMinimumSectorSz;
+    partBlock->FreeCatalog = fDiskDev.GetSectorsCount() - partBlock->CatalogCount;
+    partBlock->SectorCount = fDiskDev.GetSectorsCount();
+    partBlock->FreeSectors = fDiskDev.GetSectorsCount() - partBlock->CatalogCount;
+    partBlock->StartCatalog = kNewFSAddressAsLba + sizeof(NewPartitionBlock);
+
+    fDiskDev.Leak().mBase = (kNewFSAddressAsLba / kNewFSMinimumSectorSz);
+    fDiskDev.Leak().mSize = kNewFSMinimumSectorSz;
+    fDiskDev.Write(buf, kNewFSMinimumSectorSz);
+
+    return this->_AppendCatalogList(fileBlobs, blobCount);
+}
diff --git a/Private/NewBoot/BootKit/HW/ATA.hxx b/Private/NewBoot/BootKit/HW/ATA.hxx
index 9127e598..c557aeb8 100644
--- a/Private/NewBoot/BootKit/HW/ATA.hxx
+++ b/Private/NewBoot/BootKit/HW/ATA.hxx
@@ -34,6 +34,8 @@ class BootDeviceATA final : public Device {
  public:
   operator bool();
 
+  SizeT GetSectorsCount() noexcept;
+
   BootDeviceATA& Read(Char* Buf, const SizeT& SecCount) override;
   BootDeviceATA& Write(Char* Buf, const SizeT& SecCount) override;
 
@@ -41,4 +43,4 @@ class BootDeviceATA final : public Device {
 
  private:
   ATATrait mTrait;
-};
\ No newline at end of file
+};
diff --git a/Private/NewBoot/BootKit/Vendor/Qr.hxx b/Private/NewBoot/BootKit/Vendor/Qr.hxx
index ca5eb566..27db8060 100644
--- a/Private/NewBoot/BootKit/Vendor/Qr.hxx
+++ b/Private/NewBoot/BootKit/Vendor/Qr.hxx
@@ -12,6 +12,7 @@
 #include <BootKit/Vendor/Support.hxx>
 #include <Builtins/Toolbox/Toolbox.hxx>
 #include <cstdint>
+#include <CompilerKit/Detail.hxx>
 
 namespace qr {
 inline uint8_t min_poly =
@@ -811,6 +812,8 @@ public:
     explicit QrDelegate() = default;
     ~QrDelegate() = default;
 
+    NEWOS_COPY_DEFAULT(QrDelegate);
+
     /// @brief Draw method delegate.
     template <int V>
     bool draw(Qr<V>& subject, int x, int y) noexcept {
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
index d3573064..10d4272d 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
@@ -25,7 +25,7 @@
 
 static Boolean kATADetected = false;
 static Int32 kATADeviceType = kATADeviceCount;
-static CharacterTypeUTF8 kATAData[kATADataLen] = {0};
+static UInt16 kATAData[kATADataLen] = {0};
 
 Boolean boot_ata_detected(Void);
 
@@ -82,8 +82,6 @@ ATAInit_Retry:
 
   Out8(IO + ATA_REG_COMMAND, ATA_CMD_IDENTIFY);
 
-  BSetMem(kATAData, 0, kATADataLen);
-
   /// fetch serial info
   /// model, speed, number of sectors...
 
@@ -269,3 +267,10 @@ BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, const SizeT& SectorS
  * @return BootDeviceATA::ATATrait& the drive config.
  */
 BootDeviceATA::ATATrait& BootDeviceATA::Leak() { return mTrait; }
+
+/***
+    @brief Getter, gets the number of sectors inside the drive.
+*/
+SizeT BootDeviceATA::GetSectorsCount() noexcept {
+    return kATAData[60] + kATAData[61];
+}
diff --git a/Private/NewBoot/Source/HEL/AMD64/Support.cxx b/Private/NewBoot/Source/HEL/AMD64/Support.cxx
index c6b62630..0508d491 100644
--- a/Private/NewBoot/Source/HEL/AMD64/Support.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/Support.cxx
@@ -28,5 +28,19 @@ EXTERN_C VoidPtr memcpy(void *dst, const void *src,
   return dst;
 }
 
+/// @brief strlen definition in C++.
+EXTERN_C size_t strlen(const char *whatToCheck) {
+    if (!whatToCheck || *whatToCheck == 0) return 0;
+
+    SizeT len = 0;
+
+    while (whatToCheck[len] != 0) {
+        ++len;
+    }
+
+    return len;
+}
+
+
 /// @brief somthing specific to the microsoft ABI, regarding checking the stack.
 EXTERN_C void ___chkstk_ms(void) {}
diff --git a/Private/NewBoot/Source/HEL/POWER/BootCoreBoot.S b/Private/NewBoot/Source/HEL/POWER/BootCoreBoot.S
deleted file mode 100644
index c611467d..00000000
--- a/Private/NewBoot/Source/HEL/POWER/BootCoreBoot.S
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -------------------------------------------
-
-    Copyright Mahrouss Logic
-
-------------------------------------------- */
-
-.section .boot_hdr
-.align 4
-
-/* NewBoot boot header begin */
-
-boot_hdr_mag:
-	.ascii "LX"
-boot_hdr_name:
-	// it has to match ten bytes.
-	.asciz "NewBoot\0\0\0"
-boot_hdr_ver:
-	.word 0x104
-boot_hdr_proc:
-	.long bootloader_start
-
-/* NewOS boot header end */
-
-.extern bootloader_main
-.extern bootloader_stack
-
-.globl bootloader_start
-bootloader_start:
-	mflr	4			/* real address of .Laddr */
-	lwz	0,(bootloader_stack-bootloader_start)(4)	/* stack address location */
-	mr	1,0			/* use user defined stack */
-
-    bl bootloader_main
-    blr
diff --git a/Private/NewBoot/Source/HEL/POWER/BootEPM.cxx b/Private/NewBoot/Source/HEL/POWER/BootEPM.cxx
deleted file mode 100644
index 72276ef9..00000000
--- a/Private/NewBoot/Source/HEL/POWER/BootEPM.cxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -------------------------------------------
-
-    Copyright Mahrouss Logic
-
-------------------------------------------- */
-
-#include <BootKit/BootKit.hxx>
-#include <FSKit/NewFS.hxx>
-
-#define kEPMSectorSize (1024U)
-#define kEPMSwapSize MIB(16)
-
-// {310E1FC7-2060-425D-BE7B-75A37CC679BC}
-STATIC const BlockGUID kEPMGuid = {
-    0x310e1fc7,
-    0x2060,
-    0x425d,
-    {0xbe, 0x7b, 0x75, 0xa3, 0x7c, 0xc6, 0x79, 0xbc}};
-
-/// @brief Write epm partition to disk.
-/// @param namePart partition name
-/// @param namePartLength length of name
-/// @param bootDev disk interface.
-/// @return
-EXTERN_C Boolean boot_write_epm_partition(const Char* namePart, SizeT namePartLength,
-                                 BootDevice* bootDev) {
-  if (namePartLength > kEPMNameLength || !namePart) return No;
-  if (!bootDev) return No;
-
-  bootDev->Leak().mBase = kEPMStartPartitionBlk;
-  bootDev->Leak().mSize = kEPMSectorSize;
-
-  Char buf[kEPMSectorSize] = {0};
-
-  bootDev->Read(buf, 1);
-
-  BTextWriter writer;
-
-  writer.Write(L"NewBoot: Checking for an EPM partition...\r\n");
-
-  for (SizeT index = 0; index < kEPMMagicLength; ++index) {
-    if (buf[index] != kEPMMagic[index]) {
-      writer.Write(L"NewBoot: Writing an EPM partition...\r\n");
-
-      BootBlockType* bootBlock = (BootBlockType*)buf;
-
-      bootBlock->Version = kEPMRevision;
-      bootBlock->NumBlocks = 2;
-
-      for (SizeT i = 0; i < kEPMNameLength; ++i) {
-        bootBlock->Magic[i] = kEPMMagic[i];
-      }
-
-      for (SizeT i = 0; i < namePartLength; ++i) {
-        bootBlock->Name[i] = namePart[i];
-      }
-
-      bootBlock->LbaStart =
-          sizeof(BootBlockType) + (sizeof(PartitionBlockType) * kEPMMaxBlks);
-
-      bootBlock->SectorSz = kEPMSectorSize;
-
-      bootBlock->Uuid = kEPMGuid;
-
-      PartitionBlock* partBlock = (PartitionBlock*)(buf + sizeof(BootBlock));
-
-      char* fsName = "NewFS";
-      int fsNameLength = 6;
-
-      for (SizeT i = 0; i < fsNameLength; ++i) {
-        partBlock->Fs[i] = fsName[i];
-      }
-
-      partBlock->Version = kEPMNewOS;
-
-      char* partName = "System HD";
-      int partNameLength = 10;
-
-      for (SizeT i = 0; i < partNameLength; ++i) {
-        partBlock->Name[i] = partName[i];
-      }
-
-      partBlock->SectorSz = kEPMSectorSize;
-      partBlock->LbaStart = kEPMStartPartitionBlk + kEPMSwapSize;
-      partBlock->Version = kNewFSVersionInteger;
-      partBlock->Kind = kNewFSPartitionTypeStandard;
-      partBlock->LbaEnd = 0UL; ///! grows on the disk.
-
-      PartitionBlock* swapBlock = (PartitionBlock*)(buf + sizeof(BootBlock) + sizeof(PartitionBlock));
-
-      for (SizeT i = 0; i < fsNameLength; ++i) {
-        swapBlock->Fs[i] = fsName[i];
-      }
-
-      swapBlock->Version = kEPMNewOS;
-
-      partName = "Swap HD";
-      partNameLength = 8;
-
-      for (SizeT i = 0; i < partNameLength; ++i) {
-        swapBlock->Name[i] = partName[i];
-      }
-
-      swapBlock->SectorSz = kEPMSectorSize;
-      swapBlock->LbaStart = kEPMStartPartitionBlk;
-      swapBlock->Version = kNewFSVersionInteger;
-      swapBlock->Kind = kNewFSPartitionTypePage;
-      swapBlock->LbaEnd = kEPMSwapSize; /// 4 MIB swap partition.
-
-      bootDev->Write(buf, 1);
-
-      return No;
-    }
-  }
-
-  writer.Write(L"NewBoot: Partition found, everything's OK.\r\n");
-  return Yes;
-}
diff --git a/Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S b/Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S
new file mode 100644
index 00000000..41fc6ae2
--- /dev/null
+++ b/Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S
@@ -0,0 +1,34 @@
+/* -------------------------------------------
+
+    Copyright Mahrouss Logic
+
+------------------------------------------- */
+
+.section .boot_hdr
+.align 4
+
+/* NewBoot boot header begin */
+
+boot_hdr_mag:
+	.ascii "CB"
+boot_hdr_name:
+	// it has to match ten bytes.
+	.asciz "NewBoot\0\0\0"
+boot_hdr_ver:
+	.word 0x104
+boot_hdr_proc:
+	.long bootloader_start
+
+/* NewOS boot header end */
+
+.extern bootloader_main
+.extern bootloader_stack
+
+.globl bootloader_start
+bootloader_start:
+	mflr	4			/* real address of .Laddr */
+	lwz	0,(bootloader_stack-bootloader_start)(4)	/* stack address location */
+	mr	1,0			/* use user defined stack */
+
+    bl bootloader_main
+    blr
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 11c1da75..7ed42abd 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -51,6 +51,7 @@ all: compile-amd64
 	$(DD) if=$(KERNEL_OBJ) of=$(BOOT_LOADER) bs=1 seek=0 conv=notrunc
 	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/BOOTX64.EFI
 	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/NEWBOOT.EFI
+	$(COPY) ../../$(KERNEL) CDROM/$(KERNEL)
 	$(COPY) $(BOOT_LOADER) ../../Root/Boot/$(BOOT_LOADER)
 
 ifneq ($(DEBUG_SUPPORT), )
@@ -68,8 +69,8 @@ run-efi-amd64:
 
 .PHONY: epm-img
 epm-img:
-	qemu-img create -f raw $(IMG) 256M
-	qemu-img create -f raw $(IMG_2) 512M
+	qemu-img create -f qcow2 $(IMG) 256M
+	qemu-img create -f qcow2 $(IMG_2) 512M
 
 .PHONY: download-edk
 download-edk:
-- 
cgit v1.2.3


From 9bf7420620393fe693576aa04c57ea4eefc925d7 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Thu, 25 Apr 2024 15:05:50 +0200
Subject: MHR-16: Improve clean rule.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/Source/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 7ed42abd..6eb14801 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -78,7 +78,7 @@ download-edk:
 
 .PHONY: clean
 clean:
-	$(REM) $(REM_FLAG) $(OBJ) NewBoot.exe NewKernel.exe OVMF.fd $(IMG) $(IMG_2)
+	$(REM) $(REM_FLAG) $(OBJ) NewBoot.exe NewKernel.exe OVMF.fd $(IMG) $(IMG_2) *.bin
 
 .PHONY: help
 help:
-- 
cgit v1.2.3


From d7420ce44209bf6225df644880c0da2b2fb8638a Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Thu, 25 Apr 2024 15:14:28 +0200
Subject: MHR-16: Improve makefile, add $(TARGETS) which encapsulate all of the
 targets.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/Source/makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 6eb14801..f0e44ba2 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -76,9 +76,11 @@ epm-img:
 download-edk:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
 
+TARGETS=$(REM_FLAG) $(OBJ) NewBoot.exe NewKernel.exe OVMF.fd $(IMG) $(IMG_2) *.bin
+
 .PHONY: clean
 clean:
-	$(REM) $(REM_FLAG) $(OBJ) NewBoot.exe NewKernel.exe OVMF.fd $(IMG) $(IMG_2) *.bin
+	$(REM) $(TARGETS)
 
 .PHONY: help
 help:
-- 
cgit v1.2.3


From 9679735cb60011490c92fd8d3b13d337120a22ea Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Thu, 25 Apr 2024 16:23:14 +0200
Subject: MHR-16: Made it better.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/Source/makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index f0e44ba2..93bb5e28 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -76,7 +76,10 @@ epm-img:
 download-edk:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
 
-TARGETS=$(REM_FLAG) $(OBJ) NewBoot.exe NewKernel.exe OVMF.fd $(IMG) $(IMG_2) *.bin
+BINS=*.bin
+EXECUTABLES=NewBoot.exe NewKernel.exe OVMF.fd
+
+TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
 .PHONY: clean
 clean:
-- 
cgit v1.2.3


From 3b4a4a290b32fdb4a749b3e581afae450eb543c8 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Fri, 26 Apr 2024 08:13:03 +0200
Subject: MHR-16: NewBoot - BDiskFormatter and QR.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/FSKit/NewFS.hxx                            |   9 +-
 Private/HALKit/AMD64/HalNewBoot.asm                |  14 +-
 Private/HALKit/AMD64/Storage/ATA-PIO.cxx           |   2 +-
 Private/HALKit/POWER/HalStartSequence.s            |   8 +-
 Private/Linker/16x0.json                           |   2 +-
 Private/Linker/32x0.json                           |   2 +-
 Private/Linker/64x0.json                           |   2 +-
 Private/NewBoot/BootKit/BootKit.hxx                | 149 ++++++++++++++++++---
 Private/NewBoot/BootKit/HW/ATA.hxx                 |   2 +
 Private/NewBoot/Source/HEL/AMD64/BootATA.cxx       |  26 +---
 Private/NewBoot/Source/HEL/AMD64/BootJump.S        |   9 ++
 Private/NewBoot/Source/HEL/AMD64/BootMain.cxx      |  94 ++++++++-----
 .../NewBoot/Source/HEL/AMD64/BootTextWriter.cxx    |   2 +-
 Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx    |  11 ++
 Private/NewBoot/Source/makefile                    |  13 +-
 Private/NewLoader/ReadMe.md                        |   9 --
 Private/NewLoader/Source/.gitkeep                  |   0
 Private/makefile                                   |  10 +-
 18 files changed, 253 insertions(+), 111 deletions(-)
 create mode 100644 Private/NewBoot/Source/HEL/AMD64/BootJump.S
 delete mode 100644 Private/NewLoader/ReadMe.md
 delete mode 100644 Private/NewLoader/Source/.gitkeep

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx
index cc43f51b..d3b72803 100644
--- a/Private/FSKit/NewFS.hxx
+++ b/Private/FSKit/NewFS.hxx
@@ -38,7 +38,7 @@ default.
 
 #define kNewFSIdentLen 8
 #define kNewFSIdent " NewFS"
-#define kNewFSPadLen 16
+#define kNewFSPadLen 408
 
 /// @brief Partition GUID on EPM and GPT disks.
 #define kNewFSUUID "@{DD997393-9CCE-4288-A8D5-C0FDE3908DBE}"
@@ -83,6 +83,7 @@ default.
 
 /// Start After the PM headers, pad 1024 bytes.
 #define kNewFSAddressAsLba (1024)
+#define kNewFSCatalogStartAddress (kNewFSAddressAsLba + sizeof(NewPartitionBlock))
 
 #define kResourceTypeDialog 10
 #define kResourceTypeString 11
@@ -139,6 +140,9 @@ struct PACKED NewFork final {
 
   NewOS::Lba NextSibling;
   NewOS::Lba PreviousSibling;
+
+  /// To make a perfect sector.
+  NewOS::Char Padding[200];
 };
 
 /// @brief Partition block type
@@ -174,6 +178,9 @@ enum {
   kNewFSSubDriveCount,
 };
 
+/// \brief Resource fork kind.
+enum { kNewFSRsrcForkKind = 0, kNewFSDataForkKind = 1 };
+
 ///
 /// \name NewFSParser
 /// \brief NewFS parser class. (catalog creation, remove removal, root,
diff --git a/Private/HALKit/AMD64/HalNewBoot.asm b/Private/HALKit/AMD64/HalNewBoot.asm
index 995a848c..11b11c0c 100644
--- a/Private/HALKit/AMD64/HalNewBoot.asm
+++ b/Private/HALKit/AMD64/HalNewBoot.asm
@@ -23,22 +23,16 @@ HandoverMagic: dq kHandoverMagic
 HandoverType: dw kTypeKernel
 HandoverArch: dw kArchAmd64
 ;; This NewBootStart points to Main.
-HandoverStart: dq Main
+HandoverStart: dq __ImageStart
 
 section .text
 
-global Main
+global __ImageStart
 extern hal_init_platform
 
 ;; Just a simple setup, we'd also need to tell some before
-Main:
-    push rax
+__ImageStart:
     push rcx
     call hal_init_platform
     pop rcx
-    pop rax
-;; Go to sleep.
-MainLoop:
-    cli
-    hlt
-    jmp $
+    ret
diff --git a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
index 3cbba6f7..652aa6f4 100644
--- a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
+++ b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
@@ -58,7 +58,7 @@ Void drv_std_select(UInt16 Bus) {
 
 Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus,
                       UInt8& OutMaster) {
-  if (drv_std_detected()) return false;
+  if (drv_std_detected()) return true;
 
   UInt16 IO = Bus;
 
diff --git a/Private/HALKit/POWER/HalStartSequence.s b/Private/HALKit/POWER/HalStartSequence.s
index f50a4d4f..fd018304 100644
--- a/Private/HALKit/POWER/HalStartSequence.s
+++ b/Private/HALKit/POWER/HalStartSequence.s
@@ -4,11 +4,11 @@
 
 ------------------------------------------- */
 
-.globl Main
-.extern HalKernelMain
+.globl __ImageStart
+.extern hal_init_platform
 .align 4
 .text
 
-Main:
-	bl HalKernelMain
+__ImageStart:
+	bl hal_init_platform
 	blr
diff --git a/Private/Linker/16x0.json b/Private/Linker/16x0.json
index 1dd7abbd..5851a2d3 100644
--- a/Private/Linker/16x0.json
+++ b/Private/Linker/16x0.json
@@ -1,6 +1,6 @@
 {
   "executable_type": "kernel",
   "output_name": "NewKernel.exe",
-  "start_proc": "Main",
+  "start_proc": "__ImageStart",
   "format": "PEF"
 }
diff --git a/Private/Linker/32x0.json b/Private/Linker/32x0.json
index 1dd7abbd..5851a2d3 100644
--- a/Private/Linker/32x0.json
+++ b/Private/Linker/32x0.json
@@ -1,6 +1,6 @@
 {
   "executable_type": "kernel",
   "output_name": "NewKernel.exe",
-  "start_proc": "Main",
+  "start_proc": "__ImageStart",
   "format": "PEF"
 }
diff --git a/Private/Linker/64x0.json b/Private/Linker/64x0.json
index 1dd7abbd..5851a2d3 100644
--- a/Private/Linker/64x0.json
+++ b/Private/Linker/64x0.json
@@ -1,6 +1,6 @@
 {
   "executable_type": "kernel",
   "output_name": "NewKernel.exe",
-  "start_proc": "Main",
+  "start_proc": "__ImageStart",
   "format": "PEF"
 }
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 15700f54..6272e4c9 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -6,7 +6,7 @@
 
 /***********************************************************************************/
 /// @file Boot.hxx
-/// @brief Bootloader API.
+/// @brief Bootloader Programming Interface.
 /***********************************************************************************/
 
 #pragma once
@@ -25,7 +25,7 @@
 /***********************************************************************************/
 
 #include <NewKit/Defines.hpp>
-#include "Builtins/ATA/ATA.hxx"
+#include <Builtins/ATA/ATA.hxx>
 
 /***********************************************************************************/
 /// Framebuffer helpers.
@@ -49,6 +49,11 @@ typedef Char *PEImagePtr;
 typedef WideChar CharacterTypeUTF16;
 typedef Char CharacterTypeUTF8;
 
+namespace EFI  {
+    extern void ThrowError(const CharacterTypeUTF16 *ErrorCode,
+                               const CharacterTypeUTF16 *Reason) noexcept;
+}
+
 /**
  * @brief BootKit Text Writer class
  * Writes to UEFI StdOut.
@@ -58,7 +63,7 @@ class BTextWriter final {
 
  public:
   BTextWriter &Write(const Long &num);
-  BTextWriter &Write(const UChar *str);
+  BTextWriter &Write(const Char *str);
   BTextWriter &Write(const CharacterTypeUTF16 *str);
   BTextWriter &WriteCharacter(CharacterTypeUTF16 c);
 
@@ -171,14 +176,19 @@ static inline const UInt32 kRgbBlue = 0x00FF0000;
 static inline const UInt32 kRgbBlack = 0x00000000;
 static inline const UInt32 kRgbWhite = 0x00FFFFFF;
 
+#define kBKBootFileMime "boot-x/file"
+#define kBKBootDirMime  "boot-x/dir"
+
 /// @brief BootKit Disk Formatter.
 template <typename BootDev>
 class BDiskFormatFactory final {
 public:
     /// @brief File entry for **BDiskFormatFactory**.
     struct BFileDescriptor final {
-        Char fFilename[255];
-        Char fForkName[255];
+        Char fFileName[kNewFSNodeNameLen];
+        Char fForkName[kNewFSNodeNameLen];
+
+        UInt32 fKind;
 
         VoidPtr fBlob;
         SizeT fBlobSz;
@@ -190,6 +200,7 @@ public:
 public:
     explicit BDiskFormatFactory() = default;
     explicit BDiskFormatFactory(BootDev dev) : fDiskDev(dev) {}
+
     ~BDiskFormatFactory() = default;
 
     NEWOS_COPY_DELETE(BDiskFormatFactory);
@@ -204,7 +215,101 @@ public:
 
 private:
     /// @brief Write all of the requested catalogs into the filesystem.
-    Boolean _AppendCatalogList(BFileDescriptor* fileBlobs, SizeT blobCount) {
+    Boolean WriteContent(BFileDescriptor* fileBlobs, SizeT blobCount,
+                        SizeT sectorSz, NewPartitionBlock& partBlock) {
+        if (sectorSz != BootDev::kSectorSize) return false;
+
+        BFileDescriptor* blob = fileBlobs;
+        Lba startLba = partBlock.FreeCatalog;
+
+        BTextWriter writer;
+        while (blob) {
+            NewCatalog catalogKind{ 0 };
+
+            /// Fill catalog kind.
+            catalogKind.Kind = blob->fKind;
+
+            /// Allocate fork for blob.
+            catalogKind.FirstFork = (startLba + sizeof(NewCatalog));
+            catalogKind.LastFork = catalogKind.FirstFork;
+
+            NewFork forkKind{ 0 };
+
+            memcpy(forkKind.Name, blob->fForkName, strlen(blob->fForkName));
+            forkKind.Kind = (forkKind.Name[0] == kNewFSDataFork[0]) ? kNewFSDataForkKind : kNewFSRsrcForkKind;
+            forkKind.Flags = kNewFSFlagCreated;
+
+            /// We don't know.
+            forkKind.ResourceFlags = 0;
+            forkKind.ResourceId = 0;
+            forkKind.ResourceKind = 0;
+
+            /// We're the only fork here.
+            forkKind.NextSibling = catalogKind.FirstFork;
+            forkKind.PreviousSibling = catalogKind.FirstFork;
+
+            forkKind.DataOffset = (startLba + sizeof(NewCatalog) + sizeof(NewFork));
+            forkKind.DataSize = blob->fBlobSz;
+
+            Lba lbaStart = forkKind.DataOffset;
+            SizeT cur = 0UL;
+
+            while (cur < forkKind.DataSize) {
+                this->fDiskDev.Leak().mSize = BootDev::kSectorSize;
+                this->fDiskDev.Leak().mBase = forkKind.DataOffset / BootDev::kSectorSize;
+
+                this->fDiskDev.Write((Char*)(blob->fBlob) + cur, BootDev::kSectorSize);
+
+                cur += BootDev::kSectorSize;
+                lbaStart += BootDev::kSectorSize;
+            }
+
+            writer.Write((catalogKind.Kind == kNewFSCatalogKindFile) ? L"New Boot: Write-File: " :
+                L"New Boot: Write-Directory: " ).Write(blob->fFileName).Write(L"\r\n");
+
+            /// Set disk cursor here.
+
+            fDiskDev.Leak().mBase = startLba + sizeof(NewCatalog) / sectorSz;
+            fDiskDev.Leak().mSize = sizeof(NewFork);
+
+            fDiskDev.Write((Char*)&forkKind, 1);
+
+            /// Fork is done.
+
+            catalogKind.Kind = blob->fKind;
+            catalogKind.Flags |= kNewFSFlagCreated;
+
+            Lba catalogLba = (sizeof(NewCatalog) - startLba);
+
+            //// Now write catalog as well..
+
+            catalogKind.PrevSibling = startLba;
+            catalogKind.NextSibling = (sizeof(NewCatalog) + blob->fBlobSz);
+
+            /// this mime only applies to file.
+            if (catalogKind.Kind == kNewFSCatalogKindFile) {
+                memcpy(catalogKind.Mime, kBKBootFileMime, strlen(kBKBootFileMime));
+            } else  {
+                memcpy(catalogKind.Mime, kBKBootDirMime, strlen(kBKBootDirMime));
+            }
+
+            memcpy(catalogKind.Name, blob->fFileName, strlen(blob->fFileName));
+
+            fDiskDev.Leak().mBase = startLba / sectorSz;
+            fDiskDev.Leak().mSize = sizeof(NewCatalog);
+
+            fDiskDev.Write((Char*)&catalogKind, sectorSz);
+
+            startLba += (sizeof(NewCatalog) + blob->fBlobSz);
+
+            --partBlock.FreeCatalog;
+            --partBlock.FreeSectors;
+
+            ++partBlock.CatalogCount;
+
+            blob = blob->fNext;
+        }
+
         return true;
     }
 
@@ -222,28 +327,40 @@ private:
 template <typename BootDev>
 inline Boolean BDiskFormatFactory<BootDev>::Format(const char* partName,
     BDiskFormatFactory::BFileDescriptor* fileBlobs, SizeT blobCount) {
-    // if (!fileBlobs || !blobCount) return false;
+    if (!fileBlobs || !blobCount) return false; /// sanity check
 
-    static_assert(kNewFSMinimumSectorSz == kATASectorSize, "Sector size doesn't match!");
+    /// convert the sector into something that the disk understands.
+    SizeT sectorSz =  BootDev::kSectorSize;
+    Char buf[BootDev::kSectorSize] = { 0 };
 
-    Char buf[kNewFSMinimumSectorSz] = { 0 };
     NewPartitionBlock* partBlock = reinterpret_cast<NewPartitionBlock*>(buf);
 
+    memcpy(partBlock->Ident, kNewFSIdent, kNewFSIdentLen-1);
     memcpy(partBlock->PartitionName, partName, strlen(partName));
 
     /// @note A catalog roughly equal to a sector.
 
-    partBlock->CatalogCount = blobCount;
+    partBlock->CatalogCount = 0UL;
     partBlock->Kind = kNewFSHardDrive;
-    partBlock->SectorCount = kNewFSMinimumSectorSz;
+    partBlock->SectorSize = sectorSz;
     partBlock->FreeCatalog = fDiskDev.GetSectorsCount() - partBlock->CatalogCount;
     partBlock->SectorCount = fDiskDev.GetSectorsCount();
     partBlock->FreeSectors = fDiskDev.GetSectorsCount() - partBlock->CatalogCount;
-    partBlock->StartCatalog = kNewFSAddressAsLba + sizeof(NewPartitionBlock);
+    partBlock->StartCatalog = kNewFSCatalogStartAddress;
 
-    fDiskDev.Leak().mBase = (kNewFSAddressAsLba / kNewFSMinimumSectorSz);
-    fDiskDev.Leak().mSize = kNewFSMinimumSectorSz;
-    fDiskDev.Write(buf, kNewFSMinimumSectorSz);
+    if (this->WriteContent(fileBlobs, blobCount, sectorSz, *partBlock)) {
+        fDiskDev.Leak().mBase = (kNewFSAddressAsLba / sectorSz);
+        fDiskDev.Leak().mSize = BootDev::kSectorSize;
+
+        fDiskDev.Write(buf, sectorSz);
+
+        BTextWriter writer;
+        writer.Write(L"New Boot: Write-Partition, OK.\r\n");
+
+        return true;
+    } else {
+        EFI::ThrowError(L"Filesystem-Failure-Part", L"Filesystem couldn't be partitioned.");
+    }
 
-    return this->_AppendCatalogList(fileBlobs, blobCount);
+    return false;
 }
diff --git a/Private/NewBoot/BootKit/HW/ATA.hxx b/Private/NewBoot/BootKit/HW/ATA.hxx
index c557aeb8..4b96e9fa 100644
--- a/Private/NewBoot/BootKit/HW/ATA.hxx
+++ b/Private/NewBoot/BootKit/HW/ATA.hxx
@@ -23,6 +23,8 @@ class BootDeviceATA final : public Device {
 
   NEWOS_COPY_DEFAULT(BootDeviceATA);
 
+  enum { kSectorSize = kATASectorSize };
+
   struct ATATrait final : public Device::Trait {
     UInt16 mBus{kPrimary};
     UInt8 mMaster{0};
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
index 10d4272d..8d923a50 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
@@ -132,7 +132,7 @@ ATAInit_Retry:
 
 Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
                    SizeT SectorSz, SizeT Size) {
-  UInt8 Command = (!Master ? 0xE0 : 0xF0);
+  UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
   boot_ata_wait_io(IO);
 
@@ -146,27 +146,15 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
 
   Out8(IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
 
-  while ((In8(ATA_COMMAND(IO))) & ATA_SR_BSY) boot_ata_wait_io(IO);
-
-  UInt16 byte = In16(IO + ATA_REG_DATA);
-  SizeT IndexOff = 0UL;
-  Buf[IndexOff] = byte;
-
-  while (byte != 0xFF) {
-    if (IndexOff > Size) break;
-
-    ++IndexOff;
-
-    while ((In8(ATA_COMMAND(IO))) & ATA_SR_BSY) boot_ata_wait_io(IO);
-
-    byte = In16(IO + ATA_REG_DATA);
-    Buf[IndexOff] = byte;
+  for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) {
+    boot_ata_wait_io(IO);
+    Buf[IndexOff] = In16(IO + ATA_REG_DATA);
   }
 }
 
 Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
                     SizeT SectorSz, SizeT Size) {
-  UInt8 Command = (!Master ? 0xE0 : 0xF0);
+  UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
   boot_ata_wait_io(IO);
 
@@ -209,10 +197,6 @@ BootDeviceATA::BootDeviceATA() noexcept {
       boot_ata_init(ATA_SECONDARY_IO, true, this->Leak().mBus,
                     this->Leak().mMaster)) {
     kATADetected = true;
-
-    BTextWriter writer;
-
-    writer.Write(L"New Boot: Drive is OnLine.\r\n");
   }
 }
 /**
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootJump.S b/Private/NewBoot/Source/HEL/AMD64/BootJump.S
new file mode 100644
index 00000000..af278cc7
--- /dev/null
+++ b/Private/NewBoot/Source/HEL/AMD64/BootJump.S
@@ -0,0 +1,9 @@
+.global rt_jump_to_address
+.text
+
+.code64
+.intel_syntax noprefix
+
+rt_jump_to_address:
+    jmp rcx
+    ret
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 356db88b..ea3fcbf0 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -9,8 +9,15 @@
 #include <FirmwareKit/EFI.hxx>
 #include <KernelKit/MSDOS.hpp>
 #include <KernelKit/PEF.hpp>
-#include <NewKit/Ref.hpp>
+#include <NewKit/Macros.hpp>
 #include <BootKit/BootKit.hxx>
+#include <NewKit/Ref.hpp>
+#include <cstring>
+
+/// make the compiler shut up.
+#ifndef kMachineModel
+#define kMachineModel "NeWS HD"
+#endif // !kMachineModel
 
 /** Graphics related. */
 
@@ -18,6 +25,8 @@ STATIC EfiGraphicsOutputProtocol* kGop = nullptr;
 STATIC UInt16 kStride = 0U;
 STATIC EfiGUID kGopGuid;
 
+EXTERN_C Void rt_jump_to_address(VoidPtr blob);
+
 /**
     @brief Finds and stores the GOP.
 */
@@ -166,45 +175,66 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
     }
   }
 
-  BFileReader kernelFile(L"NewLoader.exe", ImageHandle);
-  kernelFile.ReadAll(MIB(1), 4096);
+  ///
+  /// The following checks for an exisiting partition
+  /// inside the disk, if it doesn't have one,
+  /// format the disk.
+  //
 
-  if (kernelFile.Blob()) {
-    PEFContainer* containerKind =
-        reinterpret_cast<PEFContainer*>(kernelFile.Blob());
+  /// need this as well, to invoke BExecutableLoader.
+  BFileReader readerKernel(L"NewKernel.exe", ImageHandle);
+  readerKernel.ReadAll(MIB(1), 4096);
 
-    if (containerKind->Magic[0] == kPefMagic[0] &&
-        containerKind->Magic[1] == kPefMagic[1] &&
-        containerKind->Magic[2] == kPefMagic[2] &&
-        containerKind->Magic[3] == kPefMagic[3] &&
-        containerKind->Magic[4] == kPefMagic[4]) {
-      if (containerKind->Abi != kPefAbi ||
-          containerKind->Cpu != kPefArchAMD64) {
-        EFI::ThrowError(L"Bad-Architecture",
-                        L"New Boot can't run this architecture.");
-      }
+  BDiskFormatFactory<BootDeviceATA> diskFormatter;
 
-      NewOS::HEL::BootMainKind main =
-          reinterpret_cast<NewOS::HEL::BootMainKind>(containerKind +
-                                                     containerKind->Start);
+  BDiskFormatFactory<BootDeviceATA>::BFileDescriptor rootDesc{0};
 
-      if (!main) {
-        EFI::ThrowError(L"Bad-Exec",
-                        L"New Boot can't recognize this executable.");
-      }
+  memcpy(rootDesc.fFileName, "/", strlen("/"));
+  memcpy(rootDesc.fForkName, kNewFSResourceFork, strlen(kNewFSResourceFork));
 
-      EFI::ExitBootServices(MapKey, ImageHandle);
+  rootDesc.fBlobSz = strlen(kMachineModel " startup disk.");
+  rootDesc.fBlob = new Char[rootDesc.fBlobSz];
 
-      main(handoverHdrPtr);
+  memcpy(rootDesc.fBlob, kMachineModel " startup disk.",
+         strlen(kMachineModel " startup disk."));
 
-      EFI::Stop();
+  rootDesc.fKind = kNewFSCatalogKindDir;
 
-      CANT_REACH();
-    }
-  }
+  BDiskFormatFactory<BootDeviceATA>::BFileDescriptor bootDesc{0};
+
+  bootDesc.fKind = kNewFSCatalogKindDir;
+
+  memcpy(bootDesc.fFileName, "/Boot", strlen("/Boot"));
+  memcpy(bootDesc.fForkName, kNewFSResourceFork, strlen(kNewFSResourceFork));
+  memcpy(bootDesc.fBlob, kMachineModel " startup folder.",
+         strlen(kMachineModel " startup folder."));
+
+  bootDesc.fBlobSz = strlen(kMachineModel " startup folder.");
+  bootDesc.fBlob = new Char[bootDesc.fBlobSz];
+
+  BDiskFormatFactory<BootDeviceATA>::BFileDescriptor kernelDesc{0};
+
+  kernelDesc.fKind = kNewFSCatalogKindFile;
+
+  memcpy(kernelDesc.fFileName, "/Boot/NewKernel", strlen("/Boot/NewKernel"));
+  memcpy(kernelDesc.fForkName, kNewFSDataFork, strlen(kNewFSDataFork));
+
+  kernelDesc.fBlob = readerKernel.Blob();
+  kernelDesc.fBlobSz = readerKernel.Size();
+
+  rootDesc.fNext = &bootDesc;
+  rootDesc.fNext->fPrev = &rootDesc;
+
+  rootDesc.fNext->fNext = &kernelDesc;
+  rootDesc.fNext->fNext->fPrev = &bootDesc;
+
+  diskFormatter.Format(kMachineModel, &rootDesc, 3);
+
+  EFI::ExitBootServices(MapKey, ImageHandle);
+
+  rt_jump_to_address(readerKernel.Blob());
 
-  EFI::ThrowError(L"Invalid-PEF-Executable",
-                  L"PEF executable expected. Got something else.");
+  EFI::Stop();
 
-  return kEfiFail;
+  CANT_REACH();
 }
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx b/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx
index 81aa6c9d..ff30ff95 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx
@@ -32,7 +32,7 @@ BTextWriter &BTextWriter::Write(const CharacterTypeUTF16 *str) {
   return *this;
 }
 
-BTextWriter &BTextWriter::Write(const UChar *str) {
+BTextWriter &BTextWriter::Write(const Char *str) {
 #ifdef __DEBUG__
   if (!str || *str == 0) return *this;
 
diff --git a/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx b/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx
index 77552ef8..01911c43 100644
--- a/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx
@@ -20,6 +20,17 @@ void* operator new(size_t sz)
     return buf;
 }
 
+/// @brief Allocates a new object.
+/// @param sz the size.
+/// @return
+void* operator new[](size_t sz)
+{
+    void* buf = nullptr;
+    BS->AllocatePool(EfiMemoryType::EfiLoaderData, sz, &buf);
+
+    return buf;
+}
+
 /// @brief Deletes the object.
 /// @param buf the object.
 void operator delete(void* buf)
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 93bb5e28..92128b02 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -18,6 +18,10 @@ else
 EMU=qemu-system-x86_64
 endif
 
+ifeq ($(NEWS_MODEL), )
+NEWOS_MODEL=-DkMachineModel="\"Generic NeWS HD\""
+endif
+
 IMG=epm.img
 IMG_2=epm-slave.img
 EMU_FLAGS=-net none -smp 4 -m 8G -M q35 -bios OVMF.fd -device piix3-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -drive file=fat:rw:CDROM,index=2,format=raw -d int -hdd epm-slave.img
@@ -46,13 +50,10 @@ KERNEL=NewKernel.exe
 .PHONY: all
 all: compile-amd64
 	mkdir -p CDROM/EFI/BOOT
-	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o $(KERNEL_OBJ)
-	$(IMG_CREATE) create -f raw $(BOOT_LOADER) $(MAX_KERNEL_SIZE)
-	$(DD) if=$(KERNEL_OBJ) of=$(BOOT_LOADER) bs=1 seek=0 conv=notrunc
+	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o $(BOOT_LOADER)
 	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/BOOTX64.EFI
 	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/NEWBOOT.EFI
 	$(COPY) ../../$(KERNEL) CDROM/$(KERNEL)
-	$(COPY) $(BOOT_LOADER) ../../Root/Boot/$(BOOT_LOADER)
 
 ifneq ($(DEBUG_SUPPORT), )
 DEBUG =  -D__DEBUG__
@@ -61,7 +62,7 @@ endif
 .PHONY: compile-amd64
 compile-amd64:
 	$(WINDRES) BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o
-	$(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard HEL/AMD64/*.cxx) $(wildcard *.cxx)
+	$(CC_GNU) $(NEWOS_MODEL) $(FLAG_GNU) $(DEBUG) $(wildcard HEL/AMD64/*.cxx) $(wildcard HEL/AMD64/*.S) $(wildcard *.cxx)
 
 .PHONY: run-efi-amd64
 run-efi-amd64:
@@ -69,7 +70,7 @@ run-efi-amd64:
 
 .PHONY: epm-img
 epm-img:
-	qemu-img create -f qcow2 $(IMG) 256M
+	qemu-img create -f qcow2 $(IMG) 512M
 	qemu-img create -f qcow2 $(IMG_2) 512M
 
 .PHONY: download-edk
diff --git a/Private/NewLoader/ReadMe.md b/Private/NewLoader/ReadMe.md
deleted file mode 100644
index 955f0651..00000000
--- a/Private/NewLoader/ReadMe.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# NewLoader
-
-## New OS Stage 2 loader.
-
-Loads and runs the NewKernel and it's components.
-
-- Loads: NewKernel.exe, a MicroKernel in C++ (PEF)
-- Loads: Bonjour.exe, zeroconf driver. (PEF)
-- Loads: MahroussUpdate.exe, mahrouss system update driver. (PEF)
diff --git a/Private/NewLoader/Source/.gitkeep b/Private/NewLoader/Source/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/Private/makefile b/Private/makefile
index 673a4b56..977e33ac 100644
--- a/Private/makefile
+++ b/Private/makefile
@@ -5,7 +5,7 @@
 
 CC			= x86_64-w64-mingw32-gcc
 LD			= x86_64-w64-mingw32-ld
-CCFLAGS		= -c -ffreestanding -fPIE -fPIC -D__NEWOS_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions -std=c++20 -D__FSKIT_NEWFS__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I../ -I./
+CCFLAGS		= -c -ffreestanding -fPIC -D__NEWOS_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions -std=c++20 -D__FSKIT_NEWFS__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I../ -I./
 ASM 		= nasm
 
 ifneq ($(ATA_PIO_SUPPORT), )
@@ -30,7 +30,7 @@ COPY		= cp
 ASMFLAGS	= -f win64
 
 # NewOS subsystem is 17.
-LDFLAGS		= -e Main --subsystem=17
+LDFLAGS		= -e __ImageStart --subsystem=17
 LDOBJ		= Objects/*.obj
 
 # This file is the kernel, responsible of task management and memory.
@@ -59,17 +59,13 @@ newos-amd64-epm: clean
 
 OBJCOPY=x86_64-w64-mingw32-objcopy
 
-KERNEL_OBJ=kernel.bin
 DD=dd
 IMG_CREATE=qemu-img
 MAX_KERNEL_SIZE=1024K
 
 .PHONY: link-amd64-epm
 link-amd64-epm:
-	$(LD) $(LDFLAGS) $(LDOBJ) -o $(KERNEL_OBJ)
-	$(IMG_CREATE) create -f raw $(KERNEL) $(MAX_KERNEL_SIZE)
-	$(DD) if=$(KERNEL_OBJ) of=$(KERNEL) bs=1 seek=0 conv=notrunc
-	$(COPY) $(KERNEL) Root/Boot
+	$(LD) $(LDFLAGS) $(LDOBJ) -o $(KERNEL)
 
 .PHONY: all
 all: newos-amd64-epm link-amd64-epm
-- 
cgit v1.2.3


From ba80f513dd5cd82feae0b8f794b3367caf9ce8bb Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Fri, 26 Apr 2024 10:20:01 +0200
Subject: MHR-16: a lot of fixes. Regarding the disk driver and the filesystem
 class BDiskFormatFactory.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/Builtins/ATA/ATA.hxx                  |   3 +-
 Private/HALKit/AMD64/Storage/ATA-PIO.cxx      |   6 +-
 Private/NewBoot/BootKit/BootKit.hxx           | 110 +++++++++++++++-----------
 Private/NewBoot/BootKit/HW/ATA.hxx            |   1 +
 Private/NewBoot/Source/HEL/AMD64/BootATA.cxx  |  67 +++++++---------
 Private/NewBoot/Source/HEL/AMD64/BootMain.cxx |  13 ++-
 Private/NewBoot/Source/makefile               |   2 +-
 7 files changed, 110 insertions(+), 92 deletions(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/Builtins/ATA/ATA.hxx b/Private/Builtins/ATA/ATA.hxx
index 66856d8a..a2ce79ba 100644
--- a/Private/Builtins/ATA/ATA.hxx
+++ b/Private/Builtins/ATA/ATA.hxx
@@ -102,7 +102,8 @@
 #define ATA_PRIMARY 0x00
 #define ATA_SECONDARY 0x01
 
-#define ATA_CYL_LOW 4
+#define ATA_CYL_LOW 3
+#define ATA_CYL_MID 4
 #define ATA_CYL_HIGH 5
 
 ///! IO Direction
diff --git a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
index f2ae01a4..beb113d3 100644
--- a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
+++ b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
@@ -134,12 +134,13 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf,
                    SizeT SectorSz, SizeT Size) {
   UInt8 Command = ((!Master )? 0xE0 : 0xF0);
 
-  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF));
+  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
   Out8(IO + ATA_REG_SEC_COUNT0, 1);
 
   Out8(IO + ATA_REG_LBA0, (Lba));
   Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
+  Out8(IO + ATA_REG_LBA4, (Lba) >> 24);
 
   Out8(IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
 
@@ -156,12 +157,13 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf,
                     SizeT SectorSz, SizeT Size) {
   UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
-  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF));
+  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
   Out8(IO + ATA_REG_SEC_COUNT0, 1);
 
   Out8(IO + ATA_REG_LBA0, (Lba));
   Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
+  Out8(IO + ATA_REG_LBA4, (Lba) >> 24);
 
   Out8(IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO);
 
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index ffa3af15..b3a81160 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -214,14 +214,25 @@ public:
     Boolean Format(const char* partName, BFileDescriptor* fileBlobs, SizeT blobCount);
 
     operator bool() noexcept {
-        fDiskDev.Leak().mBase = (kNewFSAddressAsLba / BootDev::kSectorSize);
+        fDiskDev.Leak().mBase = (kNewFSAddressAsLba);
         fDiskDev.Leak().mSize = BootDev::kSectorSize;
 
         Char buf[BootDev::kSectorSize] = { 0 };
 
         fDiskDev.Read(buf, BootDev::kSectorSize);
 
-        return buf[0] == kNewFSIdent[0];
+        NewPartitionBlock* blockPart = reinterpret_cast<NewPartitionBlock*>(buf);
+
+        for (SizeT indexMag = 0UL; indexMag < kNewFSIdentLen; ++indexMag) {
+            if (blockPart->Ident[indexMag] != kNewFSIdent[indexMag])
+                return false;
+        }
+
+        BTextWriter writer;
+
+        writer.Write(L"Disk Partition: ").Write(blockPart->PartitionName).Write(L" is okay.\r\n");
+
+        return true;
     }
 
 private:
@@ -231,43 +242,55 @@ private:
         if (sectorSz != BootDev::kSectorSize) return false;
 
         BFileDescriptor* blob = fileBlobs;
-        Lba startLba = partBlock.FreeCatalog;
-
+        Lba startLba = partBlock.StartCatalog;
         BTextWriter writer;
+
         while (blob) {
-            NewCatalog catalogKind{ 0 };
+            NewCatalog* catalogKind = new NewCatalog();
+            memset(catalogKind, 0, sizeof(NewCatalog));
 
             /// Fill catalog kind.
-            catalogKind.Kind = blob->fKind;
+            catalogKind->Kind = blob->fKind;
 
             /// Allocate fork for blob.
-            catalogKind.FirstFork = (startLba + sizeof(NewCatalog));
-            catalogKind.LastFork = catalogKind.FirstFork;
+            catalogKind->FirstFork = (startLba + sizeof(NewCatalog));
+            catalogKind->LastFork = catalogKind->FirstFork;
 
-            NewFork forkKind{ 0 };
+            NewFork* forkKind = new NewFork();
+            memset(forkKind, 0, sizeof(NewFork));
 
-            memcpy(forkKind.Name, blob->fForkName, strlen(blob->fForkName));
-            forkKind.Kind = (forkKind.Name[0] == kNewFSDataFork[0]) ? kNewFSDataForkKind : kNewFSRsrcForkKind;
-            forkKind.Flags = kNewFSFlagCreated;
+            memcpy(forkKind->Name, blob->fForkName, strlen(blob->fForkName));
+            forkKind->Kind = (forkKind->Name[0] == kNewFSDataFork[0]) ? kNewFSDataForkKind : kNewFSRsrcForkKind;
+            forkKind->Flags = kNewFSFlagCreated;
 
             /// We don't know.
-            forkKind.ResourceFlags = 0;
-            forkKind.ResourceId = 0;
-            forkKind.ResourceKind = 0;
+            forkKind->ResourceFlags = 0;
+            forkKind->ResourceId = 0;
+            forkKind->ResourceKind = 0;
 
             /// We're the only fork here.
-            forkKind.NextSibling = catalogKind.FirstFork;
-            forkKind.PreviousSibling = catalogKind.FirstFork;
+            forkKind->NextSibling = catalogKind->FirstFork;
+            forkKind->PreviousSibling = catalogKind->FirstFork;
 
-            forkKind.DataOffset = (startLba + sizeof(NewCatalog) + sizeof(NewFork));
-            forkKind.DataSize = blob->fBlobSz;
+            forkKind->DataOffset = (startLba + sizeof(NewCatalog) + sizeof(NewFork));
+            forkKind->DataSize = blob->fBlobSz;
 
-            Lba lbaStart = forkKind.DataOffset;
+            Lba lbaStart = forkKind->DataOffset;
             SizeT cur = 0UL;
 
-            while (cur < forkKind.DataSize) {
+            writer.Write((catalogKind->Kind == kNewFSCatalogKindFile) ? L"New Boot: Write-File: " :
+                            L"New Boot: Write-Directory: " ).Write(blob->fFileName).Write(L"\r\n");
+
+            /// Set disk cursor here.
+
+            fDiskDev.Leak().mBase = startLba + sizeof(NewCatalog);
+            fDiskDev.Leak().mSize = sizeof(NewFork);
+
+            fDiskDev.Write((Char*)forkKind, sizeof(NewFork));
+
+            while (cur < forkKind->DataSize) {
                 this->fDiskDev.Leak().mSize = BootDev::kSectorSize;
-                this->fDiskDev.Leak().mBase = forkKind.DataOffset / BootDev::kSectorSize;
+                this->fDiskDev.Leak().mBase = (forkKind->DataOffset + cur);
 
                 this->fDiskDev.Write((Char*)(blob->fBlob) + cur, BootDev::kSectorSize);
 
@@ -275,48 +298,40 @@ private:
                 lbaStart += BootDev::kSectorSize;
             }
 
-            writer.Write((catalogKind.Kind == kNewFSCatalogKindFile) ? L"New Boot: Write-File: " :
-                L"New Boot: Write-Directory: " ).Write(blob->fFileName).Write(L"\r\n");
-
-            /// Set disk cursor here.
-
-            fDiskDev.Leak().mBase = startLba + sizeof(NewCatalog) / sectorSz;
-            fDiskDev.Leak().mSize = sizeof(NewFork);
-
-            fDiskDev.Write((Char*)&forkKind, 1);
 
             /// Fork is done.
 
-            catalogKind.Kind = blob->fKind;
-            catalogKind.Flags |= kNewFSFlagCreated;
+            catalogKind->Kind = blob->fKind;
+            catalogKind->Flags |= kNewFSFlagCreated;
 
             Lba catalogLba = (sizeof(NewCatalog) - startLba);
 
             //// Now write catalog as well..
 
-            catalogKind.PrevSibling = startLba;
-            catalogKind.NextSibling = (sizeof(NewCatalog) + blob->fBlobSz);
+            catalogKind->PrevSibling = startLba;
+            catalogKind->NextSibling = (sizeof(NewCatalog) + blob->fBlobSz);
 
             /// this mime only applies to file.
-            if (catalogKind.Kind == kNewFSCatalogKindFile) {
-                memcpy(catalogKind.Mime, kBKBootFileMime, strlen(kBKBootFileMime));
+            if (catalogKind->Kind == kNewFSCatalogKindFile) {
+                memcpy(catalogKind->Mime, kBKBootFileMime, strlen(kBKBootFileMime));
             } else  {
-                memcpy(catalogKind.Mime, kBKBootDirMime, strlen(kBKBootDirMime));
+                memcpy(catalogKind->Mime, kBKBootDirMime, strlen(kBKBootDirMime));
             }
 
-            memcpy(catalogKind.Name, blob->fFileName, strlen(blob->fFileName));
+            memcpy(catalogKind->Name, blob->fFileName, strlen(blob->fFileName));
 
-            fDiskDev.Leak().mBase = startLba / sectorSz;
+            fDiskDev.Leak().mBase = startLba;
             fDiskDev.Leak().mSize = sizeof(NewCatalog);
 
-            fDiskDev.Write((Char*)&catalogKind, sectorSz);
+            fDiskDev.Write((Char*)catalogKind, sizeof(NewCatalog));
 
-            startLba += (sizeof(NewCatalog) + blob->fBlobSz);
+            startLba += (sizeof(NewCatalog) + sizeof(NewFork) + blob->fBlobSz);
 
             --partBlock.FreeCatalog;
             --partBlock.FreeSectors;
 
-            ++partBlock.CatalogCount;
+            delete forkKind;
+            delete catalogKind;
 
             blob = blob->fNext;
         }
@@ -346,22 +361,23 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const char* partName,
 
     NewPartitionBlock* partBlock = reinterpret_cast<NewPartitionBlock*>(buf);
 
-    memcpy(partBlock->Ident, kNewFSIdent, kNewFSIdentLen-1);
+    memcpy(partBlock->Ident, kNewFSIdent, kNewFSIdentLen - 1);
     memcpy(partBlock->PartitionName, partName, strlen(partName));
 
     /// @note A catalog roughly equal to a sector.
 
-    partBlock->CatalogCount = 0UL;
+    partBlock->CatalogCount = blobCount;
     partBlock->Kind = kNewFSHardDrive;
     partBlock->SectorSize = sectorSz;
     partBlock->FreeCatalog = fDiskDev.GetSectorsCount() - partBlock->CatalogCount;
     partBlock->SectorCount = fDiskDev.GetSectorsCount();
     partBlock->FreeSectors = fDiskDev.GetSectorsCount() - partBlock->CatalogCount;
     partBlock->StartCatalog = kNewFSCatalogStartAddress;
+    partBlock->DiskSize = fDiskDev.GetDiskSize();
 
     if (this->WriteContent(fileBlobs, blobCount, sectorSz, *partBlock)) {
-        fDiskDev.Leak().mBase = (kNewFSAddressAsLba / sectorSz);
-        fDiskDev.Leak().mSize = BootDev::kSectorSize;
+        fDiskDev.Leak().mBase = (kNewFSAddressAsLba);
+        fDiskDev.Leak().mSize = sectorSz;
 
         fDiskDev.Write(buf, sectorSz);
 
diff --git a/Private/NewBoot/BootKit/HW/ATA.hxx b/Private/NewBoot/BootKit/HW/ATA.hxx
index 4b96e9fa..5bdcec56 100644
--- a/Private/NewBoot/BootKit/HW/ATA.hxx
+++ b/Private/NewBoot/BootKit/HW/ATA.hxx
@@ -37,6 +37,7 @@ class BootDeviceATA final : public Device {
   operator bool();
 
   SizeT GetSectorsCount() noexcept;
+  SizeT GetDiskSize() noexcept;
 
   BootDeviceATA& Read(Char* Buf, const SizeT& SecCount) override;
   BootDeviceATA& Write(Char* Buf, const SizeT& SecCount) override;
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
index bb634fbf..41ea04ac 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
@@ -88,44 +88,13 @@ ATAInit_Retry:
   boot_ata_wait_io(IO);
 
   for (SizeT indexData = 0ul; indexData < kATADataLen; ++indexData) {
-    kATAData[indexData] = In16(IO + ATA_REG_DATA);
+    kATAData[indexData] = In8(IO + ATA_REG_DATA);
   }
 
   OutBus =
       (Bus == ATA_PRIMARY_IO) ? BootDeviceATA::kPrimary : BootDeviceATA::kSecondary;
-  OutMaster = (Bus == ATA_PRIMARY_IO) ? ATA_MASTER : ATA_SLAVE;
-
-  Out8(Bus + ATA_REG_HDDEVSEL, 0xA0 | ATA_MASTER << 4);
-
-  In8(Bus + ATA_REG_CONTROL);
-  In8(Bus + ATA_REG_CONTROL);
-  In8(Bus + ATA_REG_CONTROL);
-  In8(Bus + ATA_REG_CONTROL);
-
-  unsigned cl = In8(Bus + ATA_CYL_LOW); /* get the "signature bytes" */
-  unsigned ch = In8(Bus + ATA_CYL_HIGH);
-
-  /* differentiate ATA, ATAPI, SATA and SATAPI */
-  if (cl == 0x14 && ch == 0xEB) {
-    writer.Write(L"New Boot: PATAPI drive detected.\r\n");
-    kATADeviceType = kATADevicePATA_PI;
-  }
-  if (cl == 0x69 && ch == 0x96) {
-    writer.Write(L"New Boot: SATAPI drive detected.\r\n");
-    kATADeviceType = kATADeviceSATA_PI;
-  }
-
-  if (cl == 0x0 && ch == 0x0) {
-    writer.Write(L"New Boot: PATA drive detected.\r\n");
-    kATADeviceType = kATADevicePATA;
-  }
-
-  if (cl == 0x3c && ch == 0xc3) {
-    writer.Write(L"New Boot: SATA drive detected.\r\n");
-    kATADeviceType = kATADeviceSATA;
-  }
 
-  Out8(IO + ATA_REG_CONTROL, 0x02);
+  OutMaster = (Bus == ATA_PRIMARY_IO) ? ATA_MASTER : ATA_SLAVE;
 
   return true;
 }
@@ -137,12 +106,13 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
   boot_ata_wait_io(IO);
   boot_ata_select(IO);
 
-  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF));
+  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
   Out8(IO + ATA_REG_SEC_COUNT0, 1);
 
   Out8(IO + ATA_REG_LBA0, (Lba));
   Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
+  Out8(IO + ATA_REG_LBA4, (Lba) >> 24);
 
   Out8(IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
 
@@ -159,12 +129,13 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
   boot_ata_wait_io(IO);
   boot_ata_select(IO);
 
-  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF));
+  Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
   Out8(IO + ATA_REG_SEC_COUNT0, 1);
 
   Out8(IO + ATA_REG_LBA0, (Lba));
   Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
+  Out8(IO + ATA_REG_LBA4, (Lba) >> 24);
 
   Out8(IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO);
 
@@ -217,7 +188,9 @@ BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, const SizeT& SectorSz
 
   if (!Buf || SectorSz < 1) return *this;
 
-  boot_ata_read(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster,
+  auto lba = this->Leak().mBase / BootDeviceATA::kSectorSize;
+
+  boot_ata_read(lba, this->Leak().mBus, this->Leak().mMaster,
                 Buf, SectorSz, this->Leak().mSize);
 
   return *this;
@@ -238,7 +211,9 @@ BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, const SizeT& SectorS
 
   if (!Buf || SectorSz < 1) return *this;
 
-  boot_ata_write(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster,
+  auto lba = this->Leak().mBase / BootDeviceATA::kSectorSize;
+
+  boot_ata_write(lba, this->Leak().mBus, this->Leak().mMaster,
                 Buf, SectorSz, this->Leak().mSize);
 
   return *this;
@@ -256,3 +231,21 @@ BootDeviceATA::ATATrait& BootDeviceATA::Leak() { return mTrait; }
 SizeT BootDeviceATA::GetSectorsCount() noexcept {
     return kATAData[60] + kATAData[61];
 }
+
+SizeT BootDeviceATA::GetDiskSize() noexcept {
+    Out8(this->Leak().mBus + ATA_REG_COMMAND, 0xF8);
+
+    boot_ata_wait_io(this->Leak().mBus);
+
+    SizeT result = 0;
+
+    result += In8(this->Leak().mBus + ATA_CYL_LOW);
+    result += In8(this->Leak().mBus + ATA_CYL_MID) << 8;
+    result += In8(this->Leak().mBus + ATA_CYL_HIGH) << 16;
+    result += In8(this->Leak().mBus + ATA_CYL_HIGH) << 24;
+
+    BTextWriter writer;
+    writer.Write(L"Disk-Size: ").Write(result).Write(L"\r\n");
+
+    return result;
+}
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 5e9e2355..a928a41a 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -193,9 +193,11 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
     memcpy(rootDesc.fFileName, "/", strlen("/"));
     memcpy(rootDesc.fForkName, kNewFSResourceFork, strlen(kNewFSResourceFork));
 
-    rootDesc.fBlobSz = strlen(kMachineModel " startup disk.");
+    rootDesc.fBlobSz = BootDeviceATA::kSectorSize;
     rootDesc.fBlob = new Char[rootDesc.fBlobSz];
 
+    memset(rootDesc.fBlob, 0, rootDesc.fBlobSz);
+
     memcpy(rootDesc.fBlob, kMachineModel " startup disk.",
             strlen(kMachineModel " startup disk."));
 
@@ -207,12 +209,15 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
 
     memcpy(bootDesc.fFileName, "/Boot", strlen("/Boot"));
     memcpy(bootDesc.fForkName, kNewFSResourceFork, strlen(kNewFSResourceFork));
+
+    bootDesc.fBlobSz = BootDeviceATA::kSectorSize;
+    bootDesc.fBlob = new Char[rootDesc.fBlobSz];
+
+    memset(bootDesc.fBlob, 0, bootDesc.fBlobSz);
+
     memcpy(bootDesc.fBlob, kMachineModel " startup folder.",
             strlen(kMachineModel " startup folder."));
 
-    bootDesc.fBlobSz = strlen(kMachineModel " startup folder.");
-    bootDesc.fBlob = new Char[bootDesc.fBlobSz];
-
     BDiskFormatFactory<BootDeviceATA>::BFileDescriptor kernelDesc{0};
 
     kernelDesc.fKind = kNewFSCatalogKindFile;
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 92128b02..4d8e1100 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -70,7 +70,7 @@ run-efi-amd64:
 
 .PHONY: epm-img
 epm-img:
-	qemu-img create -f qcow2 $(IMG) 512M
+	qemu-img create -f qcow2 $(IMG) 1G
 	qemu-img create -f qcow2 $(IMG_2) 512M
 
 .PHONY: download-edk
-- 
cgit v1.2.3


From 72b014b98fab4a6f875648a4b7b42347f780067e Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Fri, 26 Apr 2024 11:00:27 +0200
Subject: MHR-16: bug fix Write number method, as well as an improved partition
 checker.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/BootKit/BootKit.hxx                 | 10 +++++-----
 Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx |  4 ++--
 Private/NewBoot/Source/makefile                     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 76bfbfb0..2d8b535d 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -229,12 +229,12 @@ public:
                 return false;
         }
 
-        if (blockPart->DiskSize != this->fDiskDev.GetDiskSize()) {
+        if (blockPart->DiskSize != this->fDiskDev.GetDiskSize() ||
+            blockPart->DiskSize < 1 ||
+            blockPart->SectorSize != BootDev::kSectorSize) {
             EFI::ThrowError(L"Invalid-Disk-Geometry", L"Invalid disk geometry.");
-        }
-
-        if (blockPart->DiskSize < 1) {
-                    EFI::ThrowError(L"Invalid-Disk-Geometry", L"Invalid disk geometry.");
+        } else if (blockPart->PartitionName[0] == 0) {
+            EFI::ThrowError(L"Invalid-Partition-Name", L"Invalid disk partition.");
         }
 
         BTextWriter writer;
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx b/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx
index ff30ff95..fc91a02a 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx
@@ -75,8 +75,8 @@ BTextWriter &BTextWriter::Write(const Long &x) {
 
 BTextWriter &BTextWriter::_Write(const Long &x) {
 #ifdef __DEBUG__
-  int y = x / 16;
-  int h = x % 16;
+  UInt64 y = (x > 0 ? x : -x) / 16;
+  UInt64 h = (x > 0 ? x : -x) % 16;
 
   if (y) this->_Write(y);
 
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 4d8e1100..92128b02 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -70,7 +70,7 @@ run-efi-amd64:
 
 .PHONY: epm-img
 epm-img:
-	qemu-img create -f qcow2 $(IMG) 1G
+	qemu-img create -f qcow2 $(IMG) 512M
 	qemu-img create -f qcow2 $(IMG_2) 512M
 
 .PHONY: download-edk
-- 
cgit v1.2.3


From 313c303fab092b1c45e615f960826375e7eef093 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Fri, 26 Apr 2024 14:23:37 +0200
Subject: MHR-16: Last commit on branch, merging now.

- boot manager and micro kernel have been unified, as the USA design
  states.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/HALKit/AMD64/HalNewBoot.asm               |  3 +++
 Private/NewBoot/Source/CDROM/SplashScreen.fmt     |  5 +++--
 Private/NewBoot/Source/HEL/AMD64/BootMain.cxx     | 25 ++++-------------------
 Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx |  9 ++++++++
 Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx   |  4 ++++
 Private/NewBoot/Source/HEL/AMD64/Support.cxx      |  5 ++++-
 Private/NewBoot/Source/makefile                   |  5 ++---
 Private/Source/Utils.cxx                          |  9 ++++++--
 8 files changed, 36 insertions(+), 29 deletions(-)

(limited to 'Private/NewBoot/Source/makefile')

diff --git a/Private/HALKit/AMD64/HalNewBoot.asm b/Private/HALKit/AMD64/HalNewBoot.asm
index 11b11c0c..e9034f05 100644
--- a/Private/HALKit/AMD64/HalNewBoot.asm
+++ b/Private/HALKit/AMD64/HalNewBoot.asm
@@ -28,9 +28,12 @@ HandoverStart: dq __ImageStart
 section .text
 
 global __ImageStart
+global __NewBootJumpProc
+
 extern hal_init_platform
 
 ;; Just a simple setup, we'd also need to tell some before
+__NewBootJumpProc:
 __ImageStart:
     push rcx
     call hal_init_platform
diff --git a/Private/NewBoot/Source/CDROM/SplashScreen.fmt b/Private/NewBoot/Source/CDROM/SplashScreen.fmt
index 339b94e7..857c63a1 100644
--- a/Private/NewBoot/Source/CDROM/SplashScreen.fmt
+++ b/Private/NewBoot/Source/CDROM/SplashScreen.fmt
@@ -1,6 +1,7 @@
 Welcome to NeWS.
 
-Brought to you by:
-* MicroKernel, Bootloader: Amlal EL Mahrouss.
+Brought to you by: Amlal EL Mahrouss.
+* NewBoot, NewKernel: Amlal EL Mahrouss.
 
+This copy can boot directly to NewKernel (Unified System).
 Copyright Mahrouss-Logic, all rights reserved.
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 1c969b28..68762089 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -21,6 +21,8 @@
 
 /** Graphics related. */
 
+EXTERN_C Void hal_init_platform(HEL::HandoverInformationHeader* HIH);
+
 STATIC EfiGraphicsOutputProtocol* kGop = nullptr;
 STATIC UInt16 kStride = 0U;
 STATIC EfiGUID kGopGuid;
@@ -181,12 +183,6 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
   /// format the disk.
   //
 
-  constexpr auto binarySize = KIB(512);
-
-  /// need this as well, to invoke BExecutableLoader.
-  BFileReader readerKernel(L"NewKernel.exe", ImageHandle);
-  readerKernel.ReadAll(binarySize, BootDeviceATA::kSectorSize);
-
   BDiskFormatFactory<BootDeviceATA> diskFormatter;
 
   if (!diskFormatter) {
@@ -220,28 +216,15 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
     memcpy(bootDesc.fBlob, kMachineModel " startup folder.",
             strlen(kMachineModel " startup folder."));
 
-    BDiskFormatFactory<BootDeviceATA>::BFileDescriptor kernelDesc{0};
-
-    kernelDesc.fKind = kNewFSCatalogKindFile;
-
-    memcpy(kernelDesc.fFileName, "/Boot/NewKernel", strlen("/Boot/NewKernel"));
-    memcpy(kernelDesc.fForkName, kNewFSDataFork, strlen(kNewFSDataFork));
-
-    kernelDesc.fBlob = readerKernel.Blob();
-    kernelDesc.fBlobSz = readerKernel.Size();
-
     rootDesc.fNext = &bootDesc;
     rootDesc.fNext->fPrev = &rootDesc;
 
-    rootDesc.fNext->fNext = &kernelDesc;
-    rootDesc.fNext->fNext->fPrev = &bootDesc;
-
-    diskFormatter.Format(kMachineModel, &rootDesc, 3);
+    diskFormatter.Format(kMachineModel, &rootDesc, 2);
   }
 
   EFI::ExitBootServices(MapKey, ImageHandle);
 
-  rt_jump_to_address(readerKernel.Blob());
+  hal_init_platform(kHandoverHeader);
 
   EFI::Stop();
 
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx b/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx
index f47e3532..2ac90dd8 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx
@@ -7,6 +7,9 @@
 #include <BootKit/Platform.hxx>
 #include <BootKit/Protocol.hxx>
 #include <BootKit/BootKit.hxx>
+#include "HALKit/AMD64/Processor.hpp"
+
+#if 0
 
 EXTERN_C void rt_hlt() { asm volatile("hlt"); }
 
@@ -50,3 +53,9 @@ EXTERN_C UInt32 In32(UInt16 port) {
 
   return value;
 }
+
+#else
+
+void rt_hlt() { NewOS::HAL::rt_halt(); }
+
+#endif // 0
diff --git a/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx b/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx
index 01911c43..909ccca6 100644
--- a/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx
@@ -9,6 +9,8 @@
 #include <BootKit/BootKit.hxx>
 #include <cstddef> /* Since we're using GCC for this EFI program. */
 
+#if 0
+
 /// @brief Allocates a new object.
 /// @param sz the size.
 /// @return
@@ -45,3 +47,5 @@ void operator delete(void* buf, size_t size)
 {
     BS->FreePool(buf);
 }
+
+#endif // Inactive
diff --git a/Private/NewBoot/Source/HEL/AMD64/Support.cxx b/Private/NewBoot/Source/HEL/AMD64/Support.cxx
index 0508d491..a8e2c275 100644
--- a/Private/NewBoot/Source/HEL/AMD64/Support.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/Support.cxx
@@ -8,6 +8,8 @@
 #include <FirmwareKit/Handover.hxx>
 #include <BootKit/Vendor/Support.hxx>
 
+#if 0
+
 /// @brief memset definition in C++.
 /// @param dst destination pointer.
 /// @param byte value to fill in.
@@ -41,6 +43,7 @@ EXTERN_C size_t strlen(const char *whatToCheck) {
     return len;
 }
 
-
 /// @brief somthing specific to the microsoft ABI, regarding checking the stack.
 EXTERN_C void ___chkstk_ms(void) {}
+
+#endif
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 92128b02..8306f844 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -28,7 +28,7 @@ EMU_FLAGS=-net none -smp 4 -m 8G -M q35 -bios OVMF.fd -device piix3-ide,id=ide -
 
 LD_FLAGS=-e Main --subsystem=10
 
-OBJ=*.o
+OBJ=*.o ../../Objects/*.obj
 
 REM=rm
 REM_FLAG=-f
@@ -53,7 +53,6 @@ all: compile-amd64
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o $(BOOT_LOADER)
 	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/BOOTX64.EFI
 	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/NEWBOOT.EFI
-	$(COPY) ../../$(KERNEL) CDROM/$(KERNEL)
 
 ifneq ($(DEBUG_SUPPORT), )
 DEBUG =  -D__DEBUG__
@@ -61,7 +60,7 @@ endif
 
 .PHONY: compile-amd64
 compile-amd64:
-	$(WINDRES) BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o
+	# $(WINDRES) BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o
 	$(CC_GNU) $(NEWOS_MODEL) $(FLAG_GNU) $(DEBUG) $(wildcard HEL/AMD64/*.cxx) $(wildcard HEL/AMD64/*.S) $(wildcard *.cxx)
 
 .PHONY: run-efi-amd64
diff --git a/Private/Source/Utils.cxx b/Private/Source/Utils.cxx
index e12041c8..fcdddc4a 100644
--- a/Private/Source/Utils.cxx
+++ b/Private/Source/Utils.cxx
@@ -169,10 +169,15 @@ char *rt_string_frofchar(char *str, const char chr) {
 }
 }  // namespace NewOS
 
-extern "C" void memset(void *dst, char src, size_t len) {
+EXTERN_C void memset(void *dst, char src, size_t len) {
   NewOS::rt_set_memory(dst, src, len);
 }
 
-extern "C" void memcpy(void *dst, void *src, size_t len) {
+EXTERN_C void memcpy(void *dst, void *src, size_t len) {
   NewOS::rt_copy_memory(src, dst, len);
 }
+
+/// @brief strlen definition in C++.
+EXTERN_C size_t strlen(const char *whatToCheck) {
+    return NewOS::rt_string_len(whatToCheck);
+}
-- 
cgit v1.2.3