diff options
Diffstat (limited to 'Private')
48 files changed, 1818 insertions, 428 deletions
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/Builtins/Toolbox/Toolbox.hxx b/Private/Builtins/Toolbox/Toolbox.hxx index b3dad30b..0c5b31c5 100644 --- a/Private/Builtins/Toolbox/Toolbox.hxx +++ b/Private/Builtins/Toolbox/Toolbox.hxx @@ -25,8 +25,8 @@ EXTERN_C NewOS::Boolean _hal_right_button_pressed(); #define ToolboxDrawOrRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ __ToolboxCursor = 0; \ \ - for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < (_Height + BaseX); ++i) { \ + for (NewOS::SizeT u = BaseY; u < (_Width + BaseY); ++u) { \ *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ @@ -40,8 +40,8 @@ EXTERN_C NewOS::Boolean _hal_right_button_pressed(); #define ToolboxDrawRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ __ToolboxCursor = 0; \ \ - for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < (_Height + BaseX); ++i) { \ + for (NewOS::SizeT u = BaseY; u < (_Width + BaseY); ++u) { \ *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ @@ -66,8 +66,8 @@ EXTERN_C NewOS::Boolean _hal_right_button_pressed(); /// @brief Draws inside a zone. #define ToolboxDrawZone(_Clr, _Height, _Width, BaseX, BaseY) \ \ - for (NewOS::SizeT i = BaseX; i < _Width + BaseX; ++i) { \ - for (NewOS::SizeT u = BaseY; u < _Height + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < (_Width + BaseX); ++i) { \ + for (NewOS::SizeT u = BaseY; u < (_Height + BaseY); ++u) { \ *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ diff --git a/Private/Documentation/Spec.md b/Private/Docs/SPECIFICATION.md index e218947e..e218947e 100644 --- a/Private/Documentation/Spec.md +++ b/Private/Docs/SPECIFICATION.md diff --git a/Private/Documentation/Todo.md b/Private/Docs/TODO-LIST.md index 2c4af6e5..c997ce10 100644 --- a/Private/Documentation/Todo.md +++ b/Private/Docs/TODO-LIST.md @@ -1,14 +1,16 @@ +# TODO list. + - We need preemptive multi-threading. [ X ] - We then need sync primitives. [ X ] - We also need a system library for the OS. [ X ] - We need a bootloader for AMD64 [ X ] - - Implement Boot Services [ X ] - - Design Handover [ X ] - - Load kernel into memory [ X ] - - Fix bug in kernel loader, which causes a 06 #UD. [ X ] - - Load Kernel [ X ] - - Add IDT [ X ] - - AHCI driver [ WiP ] + - Implement Boot Services [ X ] + - Design Handover [ X ] + - Load kernel into memory [ X ] + - Fix bug in kernel loader, which causes a 06 #UD. [ X ] + - Load Kernel [ X ] + - Add IDT [ X ] + - AHCI driver [ WiP ] - Context switch x87/SSE/AVX registers [ X ] - Framebuffer [ X ] - AHCI support [ ] @@ -17,5 +19,5 @@ Status: NewBoot: Need to boot from EPM partition. +<br> NewKernel: New Filesystem in progress. - diff --git a/Private/Documentation/.gitkeep b/Private/Documentation/.gitkeep deleted file mode 100644 index e69de29b..00000000 --- a/Private/Documentation/.gitkeep +++ /dev/null diff --git a/Private/Documentation/kernel-design.drawio b/Private/Documentation/kernel-design.drawio deleted file mode 100644 index d78ac170..00000000 --- a/Private/Documentation/kernel-design.drawio +++ /dev/null @@ -1,70 +0,0 @@ -<mxfile host="app.diagrams.net" modified="2024-03-20T02:51:52.841Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0" etag="oPkzCtvrIkHoFdXP1Jzt" version="24.0.7" type="gitlab"> - <diagram name="Page-1" id="mxOE_IV8GVOi3fDmlM2_"> - <mxGraphModel dx="1002" dy="569" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0"> - <root> - <mxCell id="0" /> - <mxCell id="1" parent="0" /> - <mxCell id="dpAw-ApGermXuwIBdtFA-1" value="<h1 style="margin-top: 0px;">NewKernel.exe</h1><p>The kernel is a C++ app, designed to be scalable, reliable and object oriented.</p><p>We're actually working on the AHCI support for it is scheduled to be done by the end of april.</p>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1"> - <mxGeometry x="40" y="40" width="400" height="120" as="geometry" /> - </mxCell> - <mxCell id="dpAw-ApGermXuwIBdtFA-2" value="MicroKernel" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="286" y="450" width="256" height="60" as="geometry" /> - </mxCell> - <mxCell id="dpAw-ApGermXuwIBdtFA-3" value="System Call Interface" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="286" y="420" width="256" height="30" as="geometry" /> - </mxCell> - <mxCell id="dpAw-ApGermXuwIBdtFA-4" value="System Object" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="286" y="330" width="254" height="70" as="geometry" /> - </mxCell> - <mxCell id="dpAw-ApGermXuwIBdtFA-5" value="User Defined Object #1" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="288" y="280" width="92" height="40" as="geometry" /> - </mxCell> - <mxCell id="dpAw-ApGermXuwIBdtFA-6" value="User Defined Object #2" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="390" y="280" width="70" height="40" as="geometry" /> - </mxCell> - <mxCell id="dpAw-ApGermXuwIBdtFA-7" value="User Defined Object #3" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="470" y="280" width="70" height="40" as="geometry" /> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-1" value="<h1 style="margin-top: 0px;"><span style="background-color: initial;">SystemLib.lib</span></h1><h1 style="margin-top: 0px;"><span style="background-color: initial; font-size: 12px; font-weight: normal;">The System API is written in C/C++ and assembly, meant to interface with the SCI, it provides everything you need to make a NewOS application, properties, objects, threading, heap allocation.</span><br></h1><div><span style="background-color: initial; font-size: 12px; font-weight: normal;">You can also register you own user objects.</span></div>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1"> - <mxGeometry x="40" y="560" width="360" height="190" as="geometry" /> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-2" value="System Object" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="281" y="820" width="254" height="70" as="geometry" /> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-3" value="User Defined Object #1" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="286" y="730" width="92" height="40" as="geometry" /> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-4" value="User Defined Object #2" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="388" y="730" width="70" height="40" as="geometry" /> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-5" value="User Defined Object #3" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="468" y="730" width="70" height="40" as="geometry" /> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-6" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0;exitDx=0;exitDy=0;" parent="1" source="NTNQYUPq4CuizRvDkpOI-5" edge="1"> - <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="390" y="770" as="sourcePoint" /> - <mxPoint x="560" y="690" as="targetPoint" /> - </mxGeometry> - </mxCell> - <mxCell id="NTNQYUPq4CuizRvDkpOI-7" value="/Manifest.xml<div>/NewOS/</div><div><span style="white-space: pre;">	</span>- Library.lib/Dll.dll (Subsystem 17)</div><div>/Resources/</div><div><br></div><div><br></div>" style="rounded=0;whiteSpace=wrap;html=1;align=left;" parent="1" vertex="1"> - <mxGeometry x="570" y="650" width="210" height="110" as="geometry" /> - </mxCell> - <mxCell id="vm68-OaV5PJmx3jSNiIi-1" value="<h1 style="margin-top: 0px;">GraphicsLib.lib (merged with SystemLib)</h1><p>Handles input, graphics and sound.</p><p>Uses the ODF format to display graphics and sound is handled by XIFF.</p>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" vertex="1" parent="1"> - <mxGeometry x="31" y="980" width="250" height="120" as="geometry" /> - </mxCell> - <mxCell id="vm68-OaV5PJmx3jSNiIi-3" value="GraphicsLib.lib" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="286" y="780" width="114" height="30" as="geometry" /> - </mxCell> - <mxCell id="vm68-OaV5PJmx3jSNiIi-4" value="System Object" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="298" y="1150" width="254" height="70" as="geometry" /> - </mxCell> - <mxCell id="vm68-OaV5PJmx3jSNiIi-5" value="GraphicsLib.lib" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="300" y="1110" width="114" height="30" as="geometry" /> - </mxCell> - <mxCell id="vm68-OaV5PJmx3jSNiIi-6" value="SystemLib.lib" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="406" y="780" width="124" height="30" as="geometry" /> - </mxCell> - </root> - </mxGraphModel> - </diagram> -</mxfile> diff --git a/Private/DriverKit/KernelStd.c b/Private/DriverKit/KernelCall.c index 494ac0bc..494ac0bc 100644 --- a/Private/DriverKit/KernelStd.c +++ b/Private/DriverKit/KernelCall.c 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/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx index 339b9832..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}" @@ -82,7 +82,8 @@ default. #define kNewFSLbaType (NewOS::Lba) /// Start After the PM headers, pad 1024 bytes. -#define kNewFSAddressAsLba (1024U) +#define kNewFSAddressAsLba (1024) +#define kNewFSCatalogStartAddress (kNewFSAddressAsLba + sizeof(NewPartitionBlock)) #define kResourceTypeDialog 10 #define kResourceTypeString 11 @@ -95,6 +96,8 @@ default. #define kNewFSFlagUnallocated 0x00 #define kNewFSFlagCreated 0x0F +#define kNewFSMimeNameLen (216) + typedef NewOS::Char NewCharType; enum { @@ -106,10 +109,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; @@ -137,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 @@ -172,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/FirmwareKit/EFI/API.hxx b/Private/FirmwareKit/EFI/API.hxx index 536d12c8..0e2ef200 100644 --- a/Private/FirmwareKit/EFI/API.hxx +++ b/Private/FirmwareKit/EFI/API.hxx @@ -7,16 +7,23 @@ #ifndef __EFI_API__ #define __EFI_API__ -#ifdef __NEWBOOT__ -#include <BootKit/Rsrc/NewBootFatal.rsrc> -#include <Builtins/Toolbox/Toolbox.hxx> -#endif // ifdef __NEWBOOT__ - #include <FirmwareKit/EFI/EFI.hxx> #include <FirmwareKit/Handover.hxx> #include <KernelKit/MSDOS.hpp> #include <KernelKit/PE.hxx> +#ifdef __NEWBOOT__ +// forward decl. +class BTextWriter; + +#define __BOOTKIT_NO_INCLUDE__ 1 + +#include <BootKit/BootKit.hxx> +#include <BootKit/Rsrc/NewBootFatal.rsrc> +#include <BootKit/Vendor/Qr.hxx> +#include <Builtins/Toolbox/Toolbox.hxx> +#endif // ifdef __NEWBOOT__ + inline EfiSystemTable *ST = nullptr; inline EfiBootServices *BS = nullptr; @@ -54,21 +61,23 @@ enum { inline UInt32 Platform() noexcept { return kPEMachineAMD64; } /*** - * @brief Raise Hard kernel error. + * @brief Throw an error, stop execution as well. + * @param ErrorCode error code to be print. + * @param Reason reason to be print. */ -inline void RaiseHardError(const EfiCharType *ErrorCode, +inline void ThrowError(const EfiCharType *ErrorCode, const EfiCharType *Reason) noexcept { +#ifdef __DEBUG__ ST->ConOut->OutputString(ST->ConOut, L"\r\n*** STOP ***\r\n"); ST->ConOut->OutputString(ST->ConOut, L"*** Error: "); ST->ConOut->OutputString(ST->ConOut, ErrorCode); -#ifdef __DEBUG__ ST->ConOut->OutputString(ST->ConOut, L", Reason: "); ST->ConOut->OutputString(ST->ConOut, Reason); -#endif // ifdef __DEBUG__ ST->ConOut->OutputString(ST->ConOut, L" ***\r\n"); +#endif // ifdef __DEBUG__ #ifdef __NEWBOOT__ ToolboxInitRsrc(); @@ -78,7 +87,24 @@ inline void RaiseHardError(const EfiCharType *ErrorCode, (kHandoverHeader->f_GOP.f_Height - NEWBOOTFATAL_HEIGHT) / 2); ToolboxClearRsrc(); -#endif // ifdef __NEWBOOT__ + + /// Show the QR code now. + + constexpr auto ver = 4; + auto ecc = qr::Ecc::H; + auto str = "https://el-mahrouss-logic.com/"; + auto len = BStrLen(L"https://el-mahrouss-logic.com/"); + + qr::Qr<ver> encoder; + qr::QrDelegate encoderDelegate; + + encoder.encode(str, len, ecc, 0); // Manual mask 0 + + /// tell delegate to draw encoded QR. + encoderDelegate.draw<ver>(encoder, (kHandoverHeader->f_GOP.f_Width - encoder.side_size()) - 20, + (kHandoverHeader->f_GOP.f_Height - encoder.side_size()) / 2); + +#endif // ifdef __NEWBOOT__ EFI::Stop(); } diff --git a/Private/FirmwareKit/EPM.hxx b/Private/FirmwareKit/EPM.hxx index b7f77742..3b3585be 100644 --- a/Private/FirmwareKit/EPM.hxx +++ b/Private/FirmwareKit/EPM.hxx @@ -29,6 +29,7 @@ typedef struct BlockGUID { /** * @brief The EPM bootloader block. + * @note NumBlock and LbaStart are ignored on UEFI. */ struct PACKED BootBlock { NewOS::Char Magic[kEPMMagicLength]; @@ -42,7 +43,7 @@ struct PACKED BootBlock { /** * @brief The EPM partition block. - * used to describe a partition inside a media. + * used to describe a partition inside a media, doesn't exist on uefi. */ struct PACKED PartitionBlock { NewOS::Char Name[kEPMNameLength]; @@ -75,6 +76,10 @@ struct PACKED PartitionBlock { #define kEPMMagicPPC "EPMPC" +/* @brief UEFI magic for EPM */ + +#define kEPMMagicUEFI "EPMUE" + /* @brief Invalid magic for EPM */ #define kEPMMagicError "EPM??" @@ -109,7 +114,10 @@ typedef struct PartitionBlock PartitionBlockType; #define kEPMStartPartitionBlk (0) ///! @brief Current EPM revision (2) -#define kEPMRevision (21) +#define kEPMRevision (2) + +///! @brief Current EPM revision (2) +#define kEPMRevisionUEFI (0xF) /// END SPECS diff --git a/Private/FirmwareKit/Handover.hxx b/Private/FirmwareKit/Handover.hxx index 5ab19fdf..4131467d 100644 --- a/Private/FirmwareKit/Handover.hxx +++ b/Private/FirmwareKit/Handover.hxx @@ -81,10 +81,11 @@ struct HandoverInformationHeader { } f_GOP; }; -/** - @brief Handover Jump Proc -*/ -typedef void (*HandoverProc)(HandoverInformationHeader* pHandover); +/// @brief Bootloader main type. +typedef void (*BootMainKind)(NewOS::HEL::HandoverInformationHeader* handoverInfo); + +/// @brief Alias of bootloader main type. +typedef void (*HandoverProc)(HandoverInformationHeader* handoverInfo); } // namespace NewOS::HEL diff --git a/Private/HALKit/AMD64/HalNewBoot.asm b/Private/HALKit/AMD64/HalNewBoot.asm index 995a848c..e9034f05 100644 --- a/Private/HALKit/AMD64/HalNewBoot.asm +++ b/Private/HALKit/AMD64/HalNewBoot.asm @@ -23,22 +23,19 @@ 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 +global __NewBootJumpProc + extern hal_init_platform ;; Just a simple setup, we'd also need to tell some before -Main: - push rax +__NewBootJumpProc: +__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/HalProcessor.cpp b/Private/HALKit/AMD64/HalProcessor.cpp index 4fea4e7e..61d98c8c 100644 --- a/Private/HALKit/AMD64/HalProcessor.cpp +++ b/Private/HALKit/AMD64/HalProcessor.cpp @@ -8,7 +8,7 @@ /** * @file Processor.cpp - * @brief This file is about processor specific functions (in/out...) + * @brief This file is about processor specific functions (in/out/cli/std...) */ namespace NewOS::HAL { diff --git a/Private/HALKit/AMD64/Storage/AHCI.cxx b/Private/HALKit/AMD64/Storage/AHCI.cxx index 5e6b3348..c9db540a 100644 --- a/Private/HALKit/AMD64/Storage/AHCI.cxx +++ b/Private/HALKit/AMD64/Storage/AHCI.cxx @@ -33,11 +33,11 @@ NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented) { for (SizeT devIndex = 0; devIndex < NEWOS_BUS_COUNT; ++devIndex) { if (iterator[devIndex].Leak().Subclass() == kSATASubClass && iterator[devIndex].Leak().ProgIf() == kSATAProgIfAHCI) { - iterator[devIndex].Leak().EnableMmio(); - kAhciDevice = iterator[devIndex].Leak(); + iterator[devIndex].Leak().EnableMmio(); /// enable the memory i/o for this ahci device. + kAhciDevice = iterator[devIndex].Leak(); /// and then leak the reference. kcout << "NewKernel: [PCI] Found AHCI controller.\r\n"; - + return true; } } @@ -54,4 +54,4 @@ NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size) {} -#endif // __AHCI__
\ No newline at end of file +#endif // __AHCI__ diff --git a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx index 3cbba6f7..beb113d3 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; @@ -132,15 +132,15 @@ ATAInit_Retry: Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz, SizeT Size) { - UInt8 Command = (!Master ? 0xE0 : 0xF0); + UInt8 Command = ((!Master )? 0xE0 : 0xF0); - Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF)); - Out8(IO + ATA_REG_SEC_COUNT0, SectorSz); + 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_LBA3, (Lba) >> 24); + Out8(IO + ATA_REG_LBA4, (Lba) >> 24); Out8(IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO); @@ -155,15 +155,15 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz, SizeT Size) { - UInt8 Command = (!Master ? 0xE0 : 0xF0); + UInt8 Command = ((!Master) ? 0xE0 : 0xF0); - Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF)); - Out8(IO + ATA_REG_SEC_COUNT0, SectorSz); + 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_LBA3, (Lba) >> 24); + Out8(IO + ATA_REG_LBA4, (Lba) >> 24); Out8(IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO); 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/KernelKit/SMPManager.hpp b/Private/KernelKit/SMPManager.hpp index 17ea9d38..b7f78ebd 100644 --- a/Private/KernelKit/SMPManager.hpp +++ b/Private/KernelKit/SMPManager.hpp @@ -29,6 +29,9 @@ enum ThreadKind { kHartCount, }; +typedef enum ThreadKind SmThreadKind; +typedef ThreadID SmThreadID; + /// /// \name HardwareThread /// @brief CPU Hardware Thread (POWER, x64, or 64x0) 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/BitManip.hxx b/Private/NewBoot/BootKit/BitManip.hxx new file mode 100644 index 00000000..dcb786cf --- /dev/null +++ b/Private/NewBoot/BootKit/BitManip.hxx @@ -0,0 +1,20 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#ifndef __BITMANIP_H__ +#define __BITMANIP_H__ + +/// Name: Bits API. +/// Purpose: Bit manip helpers, based on CoreBoot header. + +#define bk_set_bit(X, O) X = (1 << O) | X +#define bk_clear_bit(X, O) X = ~(1 << O) & X +#define bk_toogle(X, O) X = (1 << O) ^ X +#define bk_lsb(X) X = X & -X +#define bk_msb(X) X = -(mp_lsb(X)) & X +#define bk_look_for_bit(X, O) (1 << O) | X + +#endif // ifndef __BITMANIP_H__ diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx index 1a992166..f7f33958 100644 --- a/Private/NewBoot/BootKit/BootKit.hxx +++ b/Private/NewBoot/BootKit/BootKit.hxx @@ -6,11 +6,27 @@ /***********************************************************************************/ /// @file Boot.hxx -/// @brief Bootloader API. +/// @brief Bootloader Programming Interface. /***********************************************************************************/ #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,40 +38,22 @@ class BFileReader; class BFileRunner; class BVersionString; -#include <BootKit/HW/ATA.hxx> -#include <CompilerKit/Version.hxx> - -/***********************************************************************************/ -/// Include other APIs. -/***********************************************************************************/ - -#include <BootKit/Platform.hxx> -#include <BootKit/Protocol.hxx> - ///! @note This address is reserved to NewKernel. #define kBootVirtualAddress (0xfffffff80000000) -#ifdef __EFI_x86_64__ -#include <FirmwareKit/EFI.hxx> -#endif // ifdef __EFI_x86_64__ - -#include <FirmwareKit/EPM.hxx> -#include <NewKit/Defines.hpp> - using namespace NewOS; typedef Char *PEFImagePtr; typedef Char *PEImagePtr; -enum { - kSegmentCode = 2, - kSegmentData = 4, - kSegmentBss = 6, -}; - 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. @@ -65,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); @@ -147,9 +145,6 @@ class BVersionString final { static const CharacterTypeUTF16 *Shared() { return BOOTLOADER_VERSION; } }; -/// @brief Bootloader main type. -typedef void (*BootMainKind)(HEL::HandoverInformationHeader *handoverInfo); - /***********************************************************************************/ /// Provide some useful processor features. /***********************************************************************************/ @@ -180,3 +175,226 @@ static inline const UInt32 kRgbGreen = 0x0000FF00; 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[kNewFSNodeNameLen]; + Char fForkName[kNewFSNodeNameLen]; + + UInt32 fKind; + + 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); + + /// @brief check if partition is good. + operator bool() noexcept { + fDiskDev.Leak().mBase = (kNewFSAddressAsLba); + fDiskDev.Leak().mSize = BootDev::kSectorSize; + + Char buf[BootDev::kSectorSize] = { 0 }; + + fDiskDev.Read(buf, BootDev::kSectorSize); + + 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"Device Size: ").Write(this->fDiskDev.GetDiskSize()).Write(L"\r\n"); + + if (blockPart->DiskSize != this->fDiskDev.GetDiskSize() || + blockPart->DiskSize < 1 || + blockPart->SectorSize != BootDev::kSectorSize) { + 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."); + } + + writer.Write(L"Device Partition: ").Write(blockPart->PartitionName).Write(L" is healthy.\r\n"); + + return true; + } + +private: + /// @brief Write all of the requested catalogs into the filesystem. + Boolean WriteContent(BFileDescriptor* fileBlobs, SizeT blobCount, + SizeT sectorSz, NewPartitionBlock& partBlock) { + if (sectorSz != BootDev::kSectorSize) return false; + + BFileDescriptor* blob = fileBlobs; + Lba startLba = partBlock.StartCatalog; + BTextWriter writer; + + while (blob) { + NewCatalog* catalogKind = new NewCatalog(); + memset(catalogKind, 0, sizeof(NewCatalog)); + + /// Fill catalog kind. + catalogKind->Kind = blob->fKind; + + /// Allocate fork for blob. + catalogKind->FirstFork = (startLba + sizeof(NewCatalog)); + catalogKind->LastFork = catalogKind->FirstFork; + + 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; + + /// 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; + + SizeT cur = 0UL; + + 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)); + + do { + this->fDiskDev.Leak().mSize = BootDev::kSectorSize; + this->fDiskDev.Leak().mBase = (forkKind->DataOffset + cur); + + this->fDiskDev.Write((Char*)(blob->fBlob) + cur, BootDev::kSectorSize); + + cur += BootDev::kSectorSize; + } while (cur < forkKind->DataSize); + + /// 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; + fDiskDev.Leak().mSize = sizeof(NewCatalog); + + fDiskDev.Write((Char*)catalogKind, sizeof(NewCatalog)); + + startLba += (sizeof(NewCatalog) + sizeof(NewFork) + blob->fBlobSz); + + --partBlock.FreeCatalog; + --partBlock.FreeSectors; + + delete forkKind; + delete catalogKind; + + blob = blob->fNext; + } + + 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; /// sanity check + + /// convert the sector into something that the disk understands. + SizeT sectorSz = BootDev::kSectorSize; + Char buf[BootDev::kSectorSize] = { 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->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); + fDiskDev.Leak().mSize = sectorSz; + + 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 false; +} diff --git a/Private/NewBoot/BootKit/HW/ATA.hxx b/Private/NewBoot/BootKit/HW/ATA.hxx index 9127e598..5bdcec56 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}; @@ -34,6 +36,9 @@ class BootDeviceATA final : public Device { public: operator bool(); + SizeT GetSectorsCount() noexcept; + SizeT GetDiskSize() noexcept; + BootDeviceATA& Read(Char* Buf, const SizeT& SecCount) override; BootDeviceATA& Write(Char* Buf, const SizeT& SecCount) override; @@ -41,4 +46,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 new file mode 100644 index 00000000..27db8060 --- /dev/null +++ b/Private/NewBoot/BootKit/Vendor/Qr.hxx @@ -0,0 +1,830 @@ +#ifndef QR_H +#define QR_H + +#include <math.h> +#include <stddef.h> +#include <stdint.h> + +#include <BootKit/Vendor/QrVendor/base.h> +#include <BootKit/Vendor/QrVendor/bit.h> + +#include <BootKit/Vendor/QrPrelude.hxx> +#include <BootKit/Vendor/Support.hxx> +#include <Builtins/Toolbox/Toolbox.hxx> +#include <cstdint> +#include <CompilerKit/Detail.hxx> + +namespace qr { +inline uint8_t min_poly = + 0b11101, /* Minimal polynomial x^8 + x^4 + x^3 + x^2 + 1 */ + generator = 0b10; /* Generator of Galois field */ + +/// @brief galois finite field multiplication. +inline uint8_t gf_mul(uint8_t a, uint8_t b) { + uint8_t res = 0; + + for (; b; b >>= 1) { + if (b & 1) res ^= a; + if (a & 0x80) + a = (a << 1) ^ min_poly; + else + a <<= 1; + } + + return res; +} + +// Size of Ecc block with respect to level and version. 0 version is for +// padding. +constexpr int ECC_CODEWORDS_PER_BLOCK[4][41] = { + {0, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, + 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, + {0, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, + 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, + {0, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, + 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, + {0, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, + 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, +}; + +// Number of Ecc blocks with respect to level and version. 0 version is for +// padding. +constexpr int N_ECC_BLOCKS[4][41] = { + {0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, + 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, + {0, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, + 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, + 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, + {0, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, + 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, + 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, + {0, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, + 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, + 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, +}; + +// Positions of central modules of alignment patterns according to version. 0 +// version is for padding. +constexpr int ALIGN_POS[41][7] = { + {}, + {0}, + {6, 18}, + {6, 22}, + {6, 26}, + {6, 30}, + {6, 34}, + {6, 22, 38}, + {6, 24, 42}, + {6, 26, 46}, + {6, 28, 50}, + {6, 30, 54}, + {6, 32, 58}, + {6, 34, 62}, + {6, 26, 46, 66}, + {6, 26, 48, 70}, + {6, 26, 50, 74}, + {6, 30, 54, 78}, + {6, 30, 56, 82}, + {6, 30, 58, 86}, + {6, 34, 62, 90}, + {6, 28, 50, 72, 94}, + {6, 26, 50, 74, 98}, + {6, 30, 54, 78, 102}, + {6, 28, 54, 80, 106}, + {6, 32, 58, 84, 110}, + {6, 30, 58, 86, 114}, + {6, 34, 62, 90, 118}, + {6, 26, 50, 74, 98, 122}, + {6, 30, 54, 78, 102, 126}, + {6, 26, 52, 78, 104, 130}, + {6, 30, 56, 82, 108, 134}, + {6, 34, 60, 86, 112, 138}, + {6, 30, 58, 86, 114, 142}, + {6, 34, 62, 90, 118, 146}, + {6, 30, 54, 78, 102, 126, 150}, + {6, 24, 50, 76, 102, 128, 154}, + {6, 28, 54, 80, 106, 132, 158}, + {6, 32, 58, 84, 110, 136, 162}, + {6, 26, 54, 82, 110, 138, 166}, + {6, 30, 58, 86, 114, 142, 170}, +}; + +// Return n-th bit of arr starting from MSB. +constexpr uint8_t get_bit_r(uint8_t *arr, int n) { + return (arr[n >> 3] >> (7 - (n & 7))) & 1; +} + +// Add up to 16 bits to arr. Data starts from MSB as well as each byte of an +// array. +constexpr void add_bits(uint16_t data, int n, uint8_t *arr, size_t &pos) { + while (n--) { + arr[pos >> 3] |= ((data >> n) & 1) << (7 - (pos & 7)); + ++pos; + } +} + +// Translate char to alphanumeric encoding value, +constexpr int alphanumeric(char c) { + if (c >= '0' && c <= '9') return c - '0'; + + if (c >= 'A' && c <= 'Z') return c - 'A' + 10; + + switch (c) { + case ' ': + return 36; + case '$': + return 37; + case '%': + return 38; + case '*': + return 39; + case '+': + return 40; + case '-': + return 41; + case '.': + return 42; + case '/': + return 43; + case ':': + return 44; + } + return -1; +} + +// Check if string can be encoded in alphanumeric mode. +constexpr bool is_alphanumeric(const char *str, size_t len) { + for (size_t i = 0; i < len; ++i) + if (alphanumeric(str[i]) == -1) return false; + return true; +} + +// Check if string can be encoded in numeric mode. +constexpr bool is_numeric(const char *str, size_t len) { + for (size_t i = 0; i < len; ++i) + if (str[i] < '0' || str[i] > '9') return false; + return true; +} + +// Check if string can be encoded in kanji mode. +constexpr bool is_kanji(const char *str, size_t len) { + for (size_t i = 0; i < len; i += 2) { + uint16_t val = uint16_t(str[i]) | (uint16_t(str[i + 1]) << 8); + if (val < 0x8140 || val > 0xebbf || (val > 0x9ffc && val < 0xe040)) + return false; + } + return true; +} + +// Reed-Solomon Ecc generator polynomial for the given degree. +constexpr void gf_gen_poly(int degree, uint8_t *poly) { + SetMem(poly, 0, degree); + + uint8_t root = poly[degree - 1] = 1; + + for (int i = 0; i < degree; ++i) { + for (int j = 0; j < degree - 1; ++j) + poly[j] = gf_mul(poly[j], root) ^ poly[j + 1]; + poly[degree - 1] = gf_mul(poly[degree - 1], root); + root = (root << 1) ^ ((root >> 7) * 0x11d); + } +} + +// Polynomial division if Galois Field. +constexpr void gf_poly_div(uint8_t *dividend, size_t len, uint8_t *divisor, + int degree, uint8_t *result) { + SetMem(result, 0, degree); + + for (size_t i = 0; i < len; ++i) { + uint8_t factor = dividend[i] ^ result[0]; + MoveMem(&result[0], &result[1], degree - 1); + result[degree - 1] = 0; + for (int j = 0; j < degree; ++j) result[j] ^= gf_mul(divisor[j], factor); + } +} + +enum Ecc { + L, + M, + Q, + H, +}; + +enum Mode { + M_NUMERIC, + M_ALPHANUMERIC, + M_BYTE, + M_KANJI, +}; + +// Select appropriate encoding mode for string. +constexpr Mode select_mode(const char *str, size_t len) { + if (is_numeric(str, len)) return M_NUMERIC; + if (is_alphanumeric(str, len)) return M_ALPHANUMERIC; + if (is_kanji(str, len)) return M_KANJI; + return M_BYTE; +} + +// Return size of Character Control Indicator in bits for given version and +// mode. +constexpr int cci(int ver, Mode mode) { + constexpr int cnt[4][3] = { + {10, 12, 14}, + {9, 11, 13}, + {8, 16, 16}, + {8, 10, 12}, + }; + if (ver < 10) return cnt[mode][0]; + if (ver < 27) return cnt[mode][1]; + return cnt[mode][2]; +} + +template <int V> +struct Qr { +private: + friend class QrDelegate; + bool draw(int x, int y) noexcept; + +public: + constexpr auto side_size() const { return SIDE; } + constexpr auto data_size() const { return N_BITS; } + constexpr auto data_ptr() const { return code; } + + bool module(int x, int y); + bool encode(const char *str, size_t len, Ecc ecc, int mask = -1); + + private: + bool encode_data(const char *data, size_t len, Ecc ecc, uint8_t *out); + void encode_ecc(uint8_t *data, Ecc ecc, uint8_t *out); + + void add_data(uint8_t *data, uint8_t *patterns); + void add_patterns(); + void add_version(); + void add_format(Ecc ecc, int mask); + void reserve_patterns(uint8_t *out); + + template <bool Black> + void draw_rect(int y, int x, int height, int width, uint8_t *out); + template <bool Black> + void draw_bound(int y, int x, int height, int width, uint8_t *out); + + template <bool Horizontal> + int rule_1_3_score(); + int penalty_score(); + int select_mask(Ecc ecc, uint8_t *patterns); + void apply_mask(int mask, uint8_t *patterns); + + private: + static_assert(V >= 1 && V <= 40, "invalid version"); + static constexpr int SIDE = 17 + V * 4; + static constexpr int N_BITS = SIDE * SIDE; + static constexpr int N_ALIGN = V == 1 ? 0 : V / 7 + 2; + static constexpr int N_ALIGN_BITS = V > 1 ? (N_ALIGN *N_ALIGN - 3) * 25 : 0; + static constexpr int N_TIMING_BITS = + (SIDE - 16) * 2 - (10 * (V > 1 ? N_ALIGN - 2 : 0)); + static constexpr int N_VER_BITS = V > 6 ? 36 : 0; + static constexpr int N_DAT_BITS = + N_BITS - (192 + N_ALIGN_BITS + N_TIMING_BITS + 31 + N_VER_BITS); + static constexpr int N_BYTES = utl::bytes_in_bits(N_BITS); // Actual number of bytes_in_bits + // required to store whole Qr code + static constexpr int N_DAT_BYTES = utl::bytes_in_bits(N_DAT_BITS); // Actual number of bytes_in_bits required to store + // [data + ecc] + static constexpr int N_DAT_CAPACITY = + N_DAT_BITS >> 3; // Capacity of [data + ecc] without remainder bits + private: + /// @brief internal function to retrieve bit from a bitset. + uint8_t get_arr_bit(uint8_t *arr, unsigned bit) const { + return utl::get_arr_bit(arr, bit); + } + + /// @brief internal function to set bit from a bitset. + void set_arr_bit(uint8_t *arr, unsigned bit) { + utl::set_arr_bit(arr, bit); + } + + /// @brief internal function to clear bit from a bitset. + void clr_arr_bit(uint8_t *arr, unsigned bit) { + utl::clr_arr_bit(arr, bit); + } + + uint8_t code[N_BYTES] = {}; + + bool status = false; +}; + +// Get color of a module from left-to-right and top-to-bottom. Black is true. +template <int V> +bool Qr<V>::module(int x, int y) { + return get_arr_bit(code, y * SIDE + x); +} + +/// @brief draw a new QR code. +template <int V> +bool Qr<V>::draw(int whereX, int whereY) noexcept { + if (!this->status) return false; // it may be invalid. + + for (int y = 0; y < (this->side_size()); ++y) { + for (int x = 0; x < (this->side_size()); ++x) { + ToolboxDrawZone( + (this->module(x, y) ? RGB(00, 00, 00) : RGB(FF, FF, FF)), + 1, 1, + x + whereX, y + whereY); + } + } + + return false; +} + +// Create Qr code with given error correction level. If mask == -1, +// then best mask selected automatically. NOTE: Automatic mask is the +// most expensive operation. Takes about 95 % of all computation time. +template <int V> +bool Qr<V>::encode(const char *str, size_t len, Ecc ecc, int mask) { + uint8_t data[N_DAT_BYTES] = {}; + uint8_t data_with_ecc[N_DAT_BYTES] = {}; + uint8_t patterns[N_BYTES] = {}; + + if (!encode_data(str, len, ecc, data)) { + return status = false; + } + + encode_ecc(data, ecc, data_with_ecc); + + reserve_patterns(patterns); + CopyMem(code, patterns, N_BYTES); + + add_data(data_with_ecc, patterns); + add_patterns(); + add_version(); + + mask = mask != -1 ? mask & 7 : select_mask(ecc, patterns); + + add_format(ecc, mask); + apply_mask(mask, patterns); + + return status = true; +} + +template <int V> +bool Qr<V>::encode_data(const char *data, size_t len, Ecc ecc, uint8_t *out) { + Mode mode = select_mode(data, len); + + size_t n_bits = + (N_DAT_CAPACITY - ECC_CODEWORDS_PER_BLOCK[ecc][V] * N_ECC_BLOCKS[ecc][V]) + << 3; + size_t pos = 0; + + add_bits(1 << mode, 4, out, pos); + add_bits(len, cci(V, mode), out, pos); + + if (mode == M_NUMERIC) { + const size_t triplets = len / 3; + const size_t triplets_size = triplets * 3; + const size_t rem = len % 3; + const size_t rem_bits = rem == 2 ? 7 : rem == 1 ? 4 : 0; + const size_t total_size = 10 * triplets + rem_bits; + + if (pos + total_size > n_bits) return false; + + char buf[4] = {}; + + for (size_t i = 0; i < triplets_size; i += 3) { + buf[0] = data[i]; + buf[1] = data[i + 1]; + buf[2] = data[i + 2]; + + uint16_t num = StringToLong(buf, NULL, 10); + add_bits(num, 10, out, pos); + } + + if (rem) { + buf[0] = data[triplets_size]; + buf[1] = data[triplets_size + 1]; + buf[rem] = 0; + + uint16_t num = StringToLong(buf, NULL, 10); + add_bits(num, rem_bits, out, pos); + } + } else if (mode == M_ALPHANUMERIC) { + if (pos + 11 * (int(len & ~1ul) / 2) > n_bits) return false; + + for (int i = 0; i < int(len & ~1ul); i += 2) { + uint16_t num = alphanumeric(data[i]) * 45 + alphanumeric(data[i + 1]); + add_bits(num, 11, out, pos); + } + if (len & 1) { + if (pos + 6 > n_bits) return false; + + add_bits(alphanumeric(data[len - 1]), 6, out, pos); + } + + } else if (mode == M_BYTE) { + if (pos + len * 8 > n_bits) return false; + + for (size_t i = 0; i < len; ++i) add_bits(data[i], 8, out, pos); + + } else { + if (pos + 13 * (len / 2) > n_bits) return false; + + for (size_t i = 0; i < len; i += 2) { + uint16_t val = ((uint8_t)data[i]) | (((uint8_t)data[i + 1]) << 8); + uint16_t res = 0; + val -= val < 0x9FFC ? 0x8140 : 0xC140; + res += val & 0xff; + res += (val >> 8) * 0xc0; + add_bits(res, 13, out, pos); + } + } + + size_t padding = n_bits - pos; + size_t i = 0; + + add_bits(0, padding > 4 ? 4 : padding, out, pos); + + if (pos & 7) add_bits(0, (8 - pos) & 7, out, pos); + + while (pos < n_bits) add_bits(++i & 1 ? 0xec : 0x11, 8, out, pos); + + return true; +} + +template <int V> +void Qr<V>::encode_ecc(uint8_t *data, Ecc ecc, uint8_t *out) { + int n_blocks = N_ECC_BLOCKS[ecc][V]; + int ecc_len = ECC_CODEWORDS_PER_BLOCK[ecc][V]; + + int n_data_bytes = N_DAT_CAPACITY - ecc_len * n_blocks; + + int n_short_blocks = n_blocks - N_DAT_CAPACITY % n_blocks; + int short_len = N_DAT_CAPACITY / n_blocks - ecc_len; + + uint8_t gen_poly[30]; + uint8_t ecc_buf[30]; + + gf_gen_poly(ecc_len, gen_poly); + + uint8_t *data_ptr = data; + + for (int i = 0; i < n_blocks; ++i) { + int data_len = short_len; + + if (i >= n_short_blocks) ++data_len; + + gf_poly_div(data_ptr, data_len, gen_poly, ecc_len, ecc_buf); + + for (int j = 0, k = i; j < data_len; ++j, k += n_blocks) { + if (j == short_len) k -= n_short_blocks; + out[k] = data_ptr[j]; + } + for (int j = 0, k = n_data_bytes + i; j < ecc_len; ++j, k += n_blocks) + out[k] = ecc_buf[j]; + + data_ptr += data_len; + } +} + +template <int V> +void Qr<V>::add_data(uint8_t *data, uint8_t *patterns) { + int data_pos = 0; + + for (int x = SIDE - 1; x >= 1; x -= 2) { + if (x == 6) x = 5; + + for (int i = 0; i < SIDE; ++i) { + int y = !((x + 1) & 2) ? SIDE - 1 - i : i; + int coord = y * SIDE + x; + + if (!get_arr_bit(patterns, coord)) { + if (get_bit_r(data, data_pos)) set_arr_bit(code, coord); + + ++data_pos; + } + + if (!get_arr_bit(patterns, coord - 1)) { + if (get_bit_r(data, data_pos)) set_arr_bit(code, coord - 1); + + ++data_pos; + } + } + } +} + +template <int V> +void Qr<V>::add_patterns() { + // White bounds inside finders + draw_bound<false>(1, 1, 5, 5, code); + draw_bound<false>(1, SIDE - 6, 5, 5, code); + draw_bound<false>(SIDE - 6, 1, 5, 5, code); + + // Finish alignment patterns + for (int i = 0; i < N_ALIGN; ++i) { + for (int j = 0; j < N_ALIGN; ++j) { + if ((!i && !j) || (!i && j == N_ALIGN - 1) || (!j && i == N_ALIGN - 1)) + continue; + draw_bound<false>(ALIGN_POS[V][i] - 1, ALIGN_POS[V][j] - 1, 3, 3, code); + } + } + + // Draw white separators + draw_rect<false>(7, 0, 1, 8, code); + draw_rect<false>(0, 7, 8, 1, code); + draw_rect<false>(SIDE - 8, 0, 1, 8, code); + draw_rect<false>(SIDE - 8, 7, 8, 1, code); + draw_rect<false>(7, SIDE - 8, 1, 8, code); + draw_rect<false>(0, SIDE - 8, 8, 1, code); + + // Perforate timing patterns + for (int i = 7; i < SIDE - 7; i += 2) { + clr_arr_bit(code, 6 * SIDE + i); + clr_arr_bit(code, i * SIDE + 6); + } +} + +template <int V> +void Qr<V>::add_version() { + if (V < 7) return; + + uint32_t rem = V; + + for (uint8_t i = 0; i < 12; ++i) rem = (rem << 1) ^ ((rem >> 11) * 0x1F25); + + uint32_t data = V << 12 | rem; + + for (int x = 0; x < 6; ++x) { + for (int j = 0; j < 3; ++j) { + int y = SIDE - 11 + j; + + bool black = (data >> (x * 3 + j)) & 1; + + if (!black) { + clr_arr_bit(code, y * SIDE + x); + clr_arr_bit(code, y + SIDE * x); + } + } + } +} + +template <int V> +void Qr<V>::add_format(Ecc ecc, int mask) { + int data = (ecc ^ 1) << 3 | mask; + int rem = data; + + for (int i = 0; i < 10; i++) rem = (rem << 1) ^ ((rem >> 9) * 0b10100110111); + + int res = (data << 10 | rem) ^ 0b101010000010010; + + for (int i = 0; i < 6; ++i) { + if ((res >> i) & 1) { + set_arr_bit(code, SIDE * 8 + SIDE - 1 - i); + set_arr_bit(code, SIDE * i + 8); + } else { + clr_arr_bit(code, SIDE * 8 + SIDE - 1 - i); + clr_arr_bit(code, SIDE * i + 8); + } + } + + for (int i = 6; i < 8; ++i) { + if ((res >> i) & 1) { + set_arr_bit(code, SIDE * 8 + SIDE - 1 - i); + set_arr_bit(code, SIDE * (i + 1) + 8); + } else { + clr_arr_bit(code, SIDE * 8 + SIDE - 1 - i); + clr_arr_bit(code, SIDE * (i + 1) + 8); + } + } + + if ((res >> 8) & 1) { + set_arr_bit(code, SIDE * 8 + 7); + set_arr_bit(code, SIDE * (SIDE - 7) + 8); + } else { + clr_arr_bit(code, SIDE * 8 + 7); + clr_arr_bit(code, SIDE * (SIDE - 7) + 8); + } + + for (int i = 9, j = 5; i < 15; ++i, --j) { + if ((res >> i) & 1) { + set_arr_bit(code, SIDE * 8 + j); + set_arr_bit(code, SIDE * (SIDE - 1 - j) + 8); + } else { + clr_arr_bit(code, SIDE * 8 + j); + clr_arr_bit(code, SIDE * (SIDE - 1 - j) + 8); + } + } +} + +template <int V> +template <bool B> +void Qr<V>::draw_rect(int y, int x, int height, int width, uint8_t *out) { + if (B) { + for (int dy = y * SIDE; dy < (y + height) * SIDE; dy += SIDE) + for (int dx = x; dx < x + width; ++dx) set_arr_bit(out, dy + dx); + } else { + for (int dy = y * SIDE; dy < (y + height) * SIDE; dy += SIDE) + for (int dx = x; dx < x + width; ++dx) clr_arr_bit(out, dy + dx); + } +} + +template <int V> +template <bool B> +void Qr<V>::draw_bound(int y, int x, int height, int width, uint8_t *out) { + if (B) { + for (int i = y * SIDE + x; i < y * SIDE + x + width; ++i) + set_arr_bit(out, i); + for (int i = (y + height - 1) * SIDE + x; + i < (y + height - 1) * SIDE + x + width; ++i) + set_arr_bit(out, i); + for (int i = (y + 1) * SIDE + x; i < (y + height - 1) * SIDE + x; i += SIDE) + set_arr_bit(out, i); + for (int i = (y + 1) * SIDE + x + width - 1; + i < (y + height - 1) * SIDE + x + width - 1; i += SIDE) + set_arr_bit(out, i); + } else { + for (int i = y * SIDE + x; i < y * SIDE + x + width; ++i) + clr_arr_bit(out, i); + for (int i = (y + height - 1) * SIDE + x; + i < (y + height - 1) * SIDE + x + width; ++i) + clr_arr_bit(out, i); + for (int i = (y + 1) * SIDE + x; i < (y + height - 1) * SIDE + x; i += SIDE) + clr_arr_bit(out, i); + for (int i = (y + 1) * SIDE + x + width - 1; + i < (y + height - 1) * SIDE + x + width - 1; i += SIDE) + clr_arr_bit(out, i); + } +} + +template <int V> +void Qr<V>::reserve_patterns(uint8_t *out) { + draw_rect<true>(0, 6, SIDE, 1, out); + draw_rect<true>(6, 0, 1, SIDE, out); + + draw_rect<true>(0, 0, 9, 9, out); + draw_rect<true>(SIDE - 8, 0, 8, 9, out); + draw_rect<true>(0, SIDE - 8, 9, 8, out); + + for (int i = 0; i < N_ALIGN; ++i) { + for (int j = 0; j < N_ALIGN; ++j) { + if ((!i && !j) || (!i && j == N_ALIGN - 1) || (!j && i == N_ALIGN - 1)) + continue; + draw_rect<true>(ALIGN_POS[V][i] - 2, ALIGN_POS[V][j] - 2, 5, 5, out); + } + } + + if (V >= 7) { + draw_rect<true>(SIDE - 11, 0, 3, 6, out); + draw_rect<true>(0, SIDE - 11, 6, 3, out); + } +} + +template <int V> +template <bool H> +int Qr<V>::rule_1_3_score() { + constexpr int y_max = H ? N_BITS : SIDE; + constexpr int x_max = H ? SIDE : N_BITS; + constexpr int y_step = H ? SIDE : 1; + constexpr int x_step = H ? 1 : SIDE; + + int res = 0; + + for (int y = 0; y < y_max; y += y_step) { + bool color = get_arr_bit(code, y); + int finder = color; + int cnt = 1; + for (int x = 1; x < x_max; x += x_step) { + if (get_arr_bit(code, y + x) == color) { + ++cnt; + if (cnt == 5) res += 3; + if (cnt > 5) ++res; + } else { + color = !color; + cnt = 1; + } + // Finder-like + finder = ((finder << 1) & 0x7ff) | color; + if (x >= x_step * 10) { + if (finder == 0x05d || finder == 0x5d0) res += 40; + } + } + } + return res; +} + +template <int V> +int Qr<V>::penalty_score() { + int res = 0; + + res += rule_1_3_score<true>(); + res += rule_1_3_score<false>(); + + for (int y = 0; y < N_BITS - SIDE; y += SIDE) { + for (int x = 0; x < SIDE - 1; ++x) { + bool c = get_arr_bit(code, y + x); + + if (c == get_arr_bit(code, y + x + 1) && + c == get_arr_bit(code, y + x + SIDE) && + c == get_arr_bit(code, y + x + SIDE + 1)) + res += 3; + } + } + + int black = 0; + for (int y = 0; y < N_BITS; y += SIDE) { + for (int x = 0; x < SIDE; ++x) black += get_arr_bit(code, y + x); + } + res += abs((black * 100) / N_BITS - 50) / 5 * 10; + + return res; +} + +template <int V> +int Qr<V>::select_mask(Ecc ecc, uint8_t *patterns) { + unsigned min_score = -1; + unsigned score = 0; + uint8_t mask = 0; + + for (int i = 0; i < 8; ++i) { + add_format(ecc, i); + apply_mask(i, patterns); + score = penalty_score(); + if (score < min_score) { + mask = i; + min_score = score; + } + apply_mask(i, patterns); + } + return mask; +} + +template <int V> +void Qr<V>::apply_mask(int mask, uint8_t *patterns) { + for (int y = 0, dy = 0; y < SIDE; ++y, dy += SIDE) { + for (int x = 0; x < SIDE; ++x) { + int coord = dy + x; + + if (get_arr_bit(patterns, coord)) continue; + + bool keep = true; + + switch (mask) { + case 0: + keep = (x + y) & 1; + break; + case 1: + keep = y & 1; + break; + case 2: + keep = x % 3; + break; + case 3: + keep = (x + y) % 3; + break; + case 4: + keep = (y / 2 + x / 3) & 1; + break; + case 5: + keep = x * y % 2 + x * y % 3; + break; + case 6: + keep = (x * y % 2 + x * y % 3) & 1; + break; + case 7: + keep = ((x + y) % 2 + x * y % 3) & 1; + break; + } + + if (!keep) { + if (get_arr_bit(code, coord)) + clr_arr_bit(code, coord); + else + set_arr_bit(code, coord); + } + } + } +} + +/// @brief QR code encoder class. +class QrDelegate final { +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 { + return subject.draw(x, y); + } + +}; +} // namespace qr + +namespace NewOS::Qr { + using namespace qr; +} // namespace NewOS + +#endif diff --git a/Private/NewBoot/BootKit/Vendor/QrPrelude.hxx b/Private/NewBoot/BootKit/Vendor/QrPrelude.hxx new file mode 100644 index 00000000..31bd93da --- /dev/null +++ b/Private/NewBoot/BootKit/Vendor/QrPrelude.hxx @@ -0,0 +1 @@ +#include <BootKit/BitManip.hxx> diff --git a/Private/NewBoot/BootKit/Vendor/QrVendor/base.h b/Private/NewBoot/BootKit/Vendor/QrVendor/base.h new file mode 100644 index 00000000..d8261d1e --- /dev/null +++ b/Private/NewBoot/BootKit/Vendor/QrVendor/base.h @@ -0,0 +1,25 @@ +#ifndef UTL_BASE_H +#define UTL_BASE_H + +#include <cstdint> +#include <cstddef> +#include <cassert> + +namespace utl { + +/** + * @brief Helper to get number of elements in array. + * + * @tparam T Auto-deduced element type + * @tparam N Auto-deduced number of elements + * @return Array size + */ +template<class T, size_t N> +constexpr size_t countof(T(&)[N]) +{ + return N; +} + +} + +#endif
\ No newline at end of file diff --git a/Private/NewBoot/BootKit/Vendor/QrVendor/bit.h b/Private/NewBoot/BootKit/Vendor/QrVendor/bit.h new file mode 100644 index 00000000..646151b6 --- /dev/null +++ b/Private/NewBoot/BootKit/Vendor/QrVendor/bit.h @@ -0,0 +1,245 @@ +#ifndef UTL_BIT_H +#define UTL_BIT_H + +#include <bit> + +namespace utl { + +/** + * @brief Size of object in terms of bits. + * + * @tparam T Object type + * @return Number of bits + */ +template<class T> +constexpr auto bit_size() +{ + return sizeof(T) * 8; +} + +/** + * @brief Integer with all bits set to 1. + * + * @tparam T Integer type + * @return All set integer + */ +template<class T> +constexpr T bit_full() +{ + return T(-1); +} + +/** + * @brief Wrap around mask for power of two number of bits + * within given integer type. For example: + * [ bit_wrap<uint8_t> = 8 - 1 = 0b111 ] + * [ bit_wrap<uint16_t> = 16 - 1 = 0b1111 ] + * [ bit_wrap<uint32_t> = 32 - 1 = 0b11111 ] + * + * @tparam T Integer type + * @return Wrap around mask for number of bits + */ +template<class T> +constexpr T bit_wrap() +{ + return bit_size<T>() - 1; +} + +/** + * @brief Number of bits to fit bit_wrap<T> result, in other words + * bit width of (sizeof(T) * 8 - 1). For example: + * [ bit_shft<uint8_t> = bit_width(0b111) = 3 ] + * [ bit_shft<uint16_t> = bit_width(0b1111) = 4 ] + * [ bit_shft<uint32_t> = bit_width(0b11111) = 5 ] + * + * @tparam T Integer type + * @return Number of bits to shift to divide by sizeof(T) * 8 + */ +template<class T> +constexpr auto bit_shft() +{ + return std::bit_width(bit_wrap<T>()); +} + +/** + * @brief Round up division by number of bits within given integer type, + * which sizeof(T) * 8 is power of two. + * + * @tparam T Inetegr type + * @param x Dividend + * @return Quotient + */ +template<class T> +constexpr auto bit_ceil(auto x) +{ + return (x + bit_wrap<T>()) >> bit_shft<T>(); +} + +/** + * @brief Count leading zeros. + * + * @param x Unsigned integer argument + * @return Number of leading zeros + */ +constexpr unsigned cntlz(auto x) +{ + if constexpr (std::is_same_v<decltype(x), int>) + return std::countl_zero(unsigned(x)); + else + return std::countl_zero(x); +} + +/** + * @brief Count trailing zeros. + * + * @param x Unsigned integer argument + * @return Number of trailing zeros + */ +constexpr unsigned cnttz(auto x) +{ + if constexpr (std::is_same_v<decltype(x), int>) + return std::countr_zero(unsigned(x)); + else + return std::countr_zero(x); +} + +/** + * @brief Get number of words (integers) required to store N bits. + * + * @tparam T Word integer type + * @param n Number of bits to store + * @return Number of words + */ +template<class T> +constexpr size_t words_in_bits(size_t n) +{ + return (n >> bit_shft<T>()) + !!(n & bit_wrap<T>()); +} + +/** + * @brief Get number of bytes required to store N bits. + * + * @param n Number of bits to store + * @return Number of bytes + */ +constexpr size_t bytes_in_bits(size_t n) +{ + return words_in_bits<uint8_t>(n); +} + +/** + * @brief Make integer with bit at given position. + * + * @tparam T Inetegr type + * @param n Bit position + * @return Integer with set bit + */ +template<class T = unsigned> +constexpr T bit(int n) +{ + return T(1) << n; +} + +/** + * @brief Get n-th bit of an integer. + * + * @tparam T Integer type + * @param x Integer + * @param n Bit position from LSB + * @return true if set + */ +template<class T> +constexpr bool get_bit(T x, int n) +{ + return (x >> n) & 1; +} + +/** + * @brief Set n-th bit of an integer. + * + * @tparam T Integer type + * @param x Integer + * @param n Bit position from LSB + */ +template<class T> +constexpr void set_bit(T& x, int n) +{ + x |= 1 << n; +} + +/** + * @brief Clear n-th bit of an integer. + * + * @tparam T Integer type + * @param x Integer + * @param n Bit position from LSB + */ +template<class T> +constexpr void clr_bit(T& x, int n) +{ + x &= ~(1 << n); +} + +/** + * @brief Get n-th bit in array of words (starting from LSB). + * + * @tparam T Word type + * @param p Array of words + * @param n Index of bit to get + * @return true if set + */ +template<class T> +constexpr bool get_arr_bit(const T* p, unsigned n) +{ + return get_bit(p[n >> bit_shft<T>()], n & bit_wrap<T>()); +} + +/** + * @brief Set n-th bit in array of words (starting from LSB). + * + * @tparam T Word type + * @param p Array of words + * @param n Index of bit to set + */ +template<class T> +constexpr void set_arr_bit(T* p, unsigned n) +{ + set_bit(p[n >> bit_shft<T>()], n & bit_wrap<T>()); +} + +/** + * @brief Clear n-th bit in array of words (starting from LSB). + * + * @tparam T Word type + * @param p Array of words + * @param n Index of bit to clear + */ +template<class T> +constexpr void clr_arr_bit(T* p, unsigned n) +{ + clr_bit(p[n >> bit_shft<T>()], n & bit_wrap<T>()); +} + +/** + * @brief Shift bits left in array of integer elements from least significant bit + * and considering 0-th byte as the right most. + * uint16_t example: 0b10000000'11100001 ==> 0b00000001'11000010. + * + * @tparam T Integer type + * @tparam L Length of array + * @param x Array of integers, nullptr not acceptable! + * @param len Number of elements + */ +template<class T, size_t L> +constexpr void shift_left(T (&x)[L]) +{ + for (int i = L - 1; i > 0; --i) { + x[i] <<= 1; + x[i] |= x[i - 1] >> bit_wrap<T>(); + } + x[0] <<= 1; +} + +} + +#endif diff --git a/Private/NewBoot/BootKit/Vendor/Support.hxx b/Private/NewBoot/BootKit/Vendor/Support.hxx new file mode 100644 index 00000000..4d35b4cb --- /dev/null +++ b/Private/NewBoot/BootKit/Vendor/Support.hxx @@ -0,0 +1,90 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#pragma once + +/// @file Purpose of this file is to help port libs into the bootloader. + +#include <BootKit/BootKit.hxx> + +#define LONG_MAX ((long)(~0UL>>1)) +#define LONG_MIN (~LONG_MAX) + +#define SetMem(dst, c, sz) BSetMem((CharacterTypeUTF16 *)dst, c, sz) +#define MoveMem(dst, src, sz) BCopyMem((CharacterTypeUTF16 *)dst, (CharacterTypeUTF16 *)src, sz) +#define CopyMem(dst, src, sz) BCopyMem((CharacterTypeUTF16 *)dst, (CharacterTypeUTF16 *)src, sz) + +inline int isspace(int c) { return c == ' '; } + +inline long StringToLong(const char * nptr, char ** endptr, int base) { + const char *p = nptr, *endp; + bool is_neg = 0, overflow = 0; + /* Need unsigned so (-LONG_MIN) can fit in these: */ + unsigned long n = 0UL, cutoff; + int cutlim; + if (base < 0 || base == 1 || base > 36) { + return 0L; + } + endp = nptr; + while (isspace(*p)) + p++; + if (*p == '+') { + p++; + } else if (*p == '-') { + is_neg = 1, p++; + } + if (*p == '0') { + p++; + /* For strtol(" 0xZ", &endptr, 16), endptr should point to 'x'; + * pointing to ' ' or '0' is non-compliant. + * (Many implementations do this wrong.) */ + endp = p; + if (base == 16 && (*p == 'X' || *p == 'x')) { + p++; + } else if (base == 2 && (*p == 'B' || *p == 'b')) { + /* C23 standard supports "0B" and "0b" prefixes. */ + p++; + } else if (base == 0) { + if (*p == 'X' || *p == 'x') { + base = 16, p++; + } else if (*p == 'B' || *p == 'b') { + base = 2, p++; + } else { + base = 8; + } + } + } else if (base == 0) { + base = 10; + } + cutoff = (is_neg) ? -(LONG_MIN / base) : LONG_MAX / base; + cutlim = (is_neg) ? -(LONG_MIN % base) : LONG_MAX % base; + while (1) { + int c; + if (*p >= 'A') + c = ((*p - 'A') & (~('a' ^ 'A'))) + 10; + else if (*p <= '9') + c = *p - '0'; + else + break; + if (c < 0 || c >= base) break; + endp = ++p; + if (overflow) { + /* endptr should go forward and point to the non-digit character + * (of the given base); required by ANSI standard. */ + if (endptr) continue; + break; + } + if (n > cutoff || (n == cutoff && c > cutlim)) { + overflow = 1; continue; + } + n = n * base + c; + } + if (endptr) *endptr = (char *)endp; + if (overflow) { + return ((is_neg) ? LONG_MIN : LONG_MAX); + } + return (long)((is_neg) ? -n : n); +} diff --git a/Private/NewBoot/Source/CDROM/SplashScreen.fmt b/Private/NewBoot/Source/CDROM/SplashScreen.fmt index a3dba676..857c63a1 100644 --- a/Private/NewBoot/Source/CDROM/SplashScreen.fmt +++ b/Private/NewBoot/Source/CDROM/SplashScreen.fmt @@ -1,6 +1,7 @@ -Welcome to the NeWS. +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/BootAHCI.cxx b/Private/NewBoot/Source/HEL/AMD64/BootAHCI.cxx index d736ac59..d04a94d3 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootAHCI.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootAHCI.cxx @@ -15,4 +15,7 @@ * */ + +#include <BootKit/Platform.hxx> +#include <BootKit/Protocol.hxx> #include <BootKit/HW/SATA.hxx> diff --git a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx index 4e41ba2e..8ab7dc20 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx @@ -15,8 +15,9 @@ * */ -#include <BootKit/HW/ATA.hxx> +#include <FirmwareKit/EFI.hxx> #include <BootKit/BootKit.hxx> +#include <BootKit/HW/ATA.hxx> /// bugs: 0 @@ -24,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); @@ -55,7 +56,7 @@ Void boot_ata_select(UInt16 Bus) { Boolean boot_ata_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) { - if (boot_ata_detected()) return false; + if (boot_ata_detected()) return true; BTextWriter writer; @@ -81,103 +82,60 @@ ATAInit_Retry: Out8(IO + ATA_REG_COMMAND, ATA_CMD_IDENTIFY); - BSetMem(kATAData, 0, kATADataLen); - /// fetch serial info /// model, speed, number of sectors... 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; } 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); + boot_ata_select(IO); - Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF)); - Out8(IO + ATA_REG_SEC_COUNT0, SectorSz); + 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_LBA3, (Lba) >> 24); + Out8(IO + ATA_REG_LBA4, (Lba) >> 24); 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); + boot_ata_select(IO); - Out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0xF)); - Out8(IO + ATA_REG_SEC_COUNT0, SectorSz); + 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_LBA3, (Lba) >> 24); + Out8(IO + ATA_REG_LBA4, (Lba) >> 24); Out8(IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO); @@ -203,17 +161,11 @@ Boolean boot_ata_detected(Void) { return kATADetected; } * @param void none. */ BootDeviceATA::BootDeviceATA() noexcept { - if (boot_ata_detected()) return; - if (boot_ata_init(ATA_PRIMARY_IO, true, this->Leak().mBus, this->Leak().mMaster) || 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"); } } /** @@ -236,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; @@ -257,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; @@ -268,3 +224,14 @@ 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[61] << 16)| kATAData[60]; +} + +SizeT BootDeviceATA::GetDiskSize() noexcept { + return this->GetSectorsCount() * BootDeviceATA::kSectorSize; +} diff --git a/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx b/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx index 33067380..b2d728ae 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx @@ -8,6 +8,8 @@ ------------------------------------------- */ +#include <BootKit/Platform.hxx> +#include <BootKit/Protocol.hxx> #include <BootKit/BootKit.hxx> #include <FirmwareKit/Handover.hxx> #include <cstddef> @@ -64,7 +66,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, if (efp->OpenVolume(efp, &rootFs) != kEfiOk) { mWriter.Write(L"New Boot: Fetch-Protocol: No-Such-Volume").Write(L"\r\n"); - EFI::RaiseHardError(L"NoSuchVolume", L"No Such volume."); + EFI::ThrowError(L"NoSuchVolume", L"No Such volume."); this->mErrorCode = kNotSupported; return; } @@ -76,7 +78,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, mWriter.Write(L"New Boot: Fetch-Protocol: No-Such-Path: ") .Write(mPath) .Write(L"\r\n"); - EFI::RaiseHardError(L"NoSuchPath", L"No Such file on filesystem."); + EFI::ThrowError(L"NoSuchPath", L"No Such file on filesystem."); this->mErrorCode = kNotSupported; return; } @@ -108,7 +110,7 @@ Void BFileReader::ReadAll(SizeT until, SizeT chunk) { if (auto err = BS->AllocatePool(EfiLoaderCode, until, (VoidPtr*)&mBlob) != kEfiOk) { mWriter.Write(L"*** EFI-Code: ").Write(err).Write(L" ***\r\n"); - EFI::RaiseHardError(L"NewBoot_PageError", L"Allocation error."); + EFI::ThrowError(L"OutOfMemory", L"Allocation error."); } } 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 42852b5d..68762089 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx @@ -4,19 +4,31 @@ ------------------------------------------- */ -#include <BootKit/BootKit.hxx> #include <BootKit/Rsrc/NewBoot.rsrc> #include <Builtins/Toolbox/Toolbox.hxx> +#include <FirmwareKit/EFI.hxx> #include <KernelKit/MSDOS.hpp> #include <KernelKit/PEF.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. */ +EXTERN_C Void hal_init_platform(HEL::HandoverInformationHeader* HIH); + 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. */ @@ -58,9 +70,6 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, .Write(SystemTable->FirmwareVendor) .Write(L"\r\n"); - BootDeviceATA ataDev; - Boolean isGptFound = No; - UInt32 MapKey = 0; UInt32* SizePtr = nullptr; EfiMemoryDescriptor* Descriptor = nullptr; @@ -69,7 +78,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, if (BS->AllocatePool(EfiLoaderData, sizeof(UInt32), (VoidPtr*)&SizePtr) != kEfiOk) { - EFI::RaiseHardError(L"Bad-Alloc", L"New Boot ran out of memory!"); + EFI::ThrowError(L"Bad-Alloc", L"New Boot ran out of memory!"); } /**** @@ -82,7 +91,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, if (BS->AllocatePool(EfiLoaderData, sizeof(EfiMemoryDescriptor), (VoidPtr*)&Descriptor) != kEfiOk) { - EFI::RaiseHardError(L"Bad-Alloc", L"New Boot ran out of memory!"); + EFI::ThrowError(L"Bad-Alloc", L"New Boot ran out of memory!"); } HEL::HandoverInformationHeader* handoverHdrPtr = nullptr; @@ -168,41 +177,56 @@ 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* headerKind = - reinterpret_cast<PEFContainer*>(kernelFile.Blob()); + BDiskFormatFactory<BootDeviceATA> diskFormatter; - if (headerKind->Magic[0] == kPefMagic[0] && - headerKind->Magic[1] == kPefMagic[1] && - headerKind->Magic[2] == kPefMagic[2] && - headerKind->Magic[3] == kPefMagic[3] && - headerKind->Magic[4] == kPefMagic[4]) { - if (headerKind->Abi != kPefAbi || headerKind->Cpu != kPefArchAMD64) { - EFI::RaiseHardError(L"Bad-Architecture", - L"New Boot can't run this architecture."); - } + if (!diskFormatter) { + BDiskFormatFactory<BootDeviceATA>::BFileDescriptor rootDesc{0}; - BootMainKind main = (BootMainKind) nullptr; + memcpy(rootDesc.fFileName, "/", strlen("/")); + memcpy(rootDesc.fForkName, kNewFSResourceFork, strlen(kNewFSResourceFork)); - if (!main) { - EFI::RaiseHardError(L"Bad-Exec", - L"New Boot can't recognize this executable."); - } + rootDesc.fBlobSz = BootDeviceATA::kSectorSize; + rootDesc.fBlob = new Char[rootDesc.fBlobSz]; - EFI::ExitBootServices(MapKey, ImageHandle); + memset(rootDesc.fBlob, 0, 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)); + + 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.")); + + rootDesc.fNext = &bootDesc; + rootDesc.fNext->fPrev = &rootDesc; + + diskFormatter.Format(kMachineModel, &rootDesc, 2); } - EFI::RaiseHardError(L"Invalid-PEF-Executable", L"PEF executable expected. Got something else."); + EFI::ExitBootServices(MapKey, ImageHandle); + + hal_init_platform(kHandoverHeader); + + EFI::Stop(); - return kEfiFail; + CANT_REACH(); } diff --git a/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx b/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx index d0da09b7..2ac90dd8 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootPlatform.cxx @@ -4,7 +4,12 @@ ------------------------------------------- */ +#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"); } @@ -48,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/BootString.cxx b/Private/NewBoot/Source/HEL/AMD64/BootString.cxx index 1c6b528e..ef0e4744 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootString.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootString.cxx @@ -11,6 +11,8 @@ ------------------------------------------- */ +#include <BootKit/Platform.hxx> +#include <BootKit/Protocol.hxx> #include <BootKit/BootKit.hxx> /// bugs 0 diff --git a/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx b/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx index 2ebde023..fc91a02a 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootTextWriter.cxx @@ -11,6 +11,8 @@ ------------------------------------------- */ +#include <BootKit/Platform.hxx> +#include <BootKit/Protocol.hxx> #include <BootKit/BootKit.hxx> /// BUGS: 0 @@ -30,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; @@ -73,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/HEL/AMD64/New+Delete.cxx b/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx index 1bb2d9ca..909ccca6 100644 --- a/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/New+Delete.cxx @@ -4,9 +4,13 @@ ------------------------------------------- */ +#include <BootKit/Platform.hxx> +#include <BootKit/Protocol.hxx> #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 @@ -18,6 +22,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) @@ -32,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 new file mode 100644 index 00000000..a8e2c275 --- /dev/null +++ b/Private/NewBoot/Source/HEL/AMD64/Support.cxx @@ -0,0 +1,49 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#include <FirmwareKit/EFI/EFI.hxx> +#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. +/// @param len length of of src. +EXTERN_C VoidPtr memset(void *dst, int byte, + long long unsigned int len) { + SetMem(dst, byte, len); + return dst; +} + +/// @brief memcpy definition in C++. +/// @param dst destination pointer. +/// @param src source pointer. +/// @param len length of of src. +EXTERN_C VoidPtr memcpy(void *dst, const void *src, + long long unsigned int len) { + CopyMem(dst, src, len); + 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) {} + +#endif 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/BootCoreBoot.S b/Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S index c611467d..41fc6ae2 100644 --- a/Private/NewBoot/Source/HEL/POWER/BootCoreBoot.S +++ b/Private/NewBoot/Source/HEL/POWER/CoreBootStartup.S @@ -10,7 +10,7 @@ /* NewBoot boot header begin */ boot_hdr_mag: - .ascii "LX" + .ascii "CB" boot_hdr_name: // it has to match ten bytes. .asciz "NewBoot\0\0\0" diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index 2f9e3756..8306f844 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -18,13 +18,17 @@ 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 LD_FLAGS=-e Main --subsystem=10 -OBJ=*.o +OBJ=*.o ../../Objects/*.obj REM=rm REM_FLAG=-f @@ -36,7 +40,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 @@ -46,12 +50,9 @@ 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) $(BOOT_LOADER) ../../Root/Boot/$(BOOT_LOADER) ifneq ($(DEBUG_SUPPORT), ) DEBUG = -D__DEBUG__ @@ -59,8 +60,8 @@ 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) + # $(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 run-efi-amd64: @@ -68,16 +69,21 @@ 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) 512M + qemu-img create -f qcow2 $(IMG_2) 512M .PHONY: download-edk download-edk: $(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd +BINS=*.bin +EXECUTABLES=NewBoot.exe NewKernel.exe OVMF.fd + +TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES) + .PHONY: clean clean: - $(REM) $(REM_FLAG) $(OBJ) NewBoot.exe NewKernel.exe OVMF.fd $(IMG) $(IMG_2) + $(REM) $(TARGETS) .PHONY: help help: 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/Source/ProcessScheduler.cxx b/Private/Source/ProcessScheduler.cxx index 6d766d27..69236c18 100644 --- a/Private/Source/ProcessScheduler.cxx +++ b/Private/Source/ProcessScheduler.cxx @@ -25,8 +25,10 @@ namespace NewOS { /// Exit Code stuff /***********************************************************************************/ -static Int32 kExitCode = 0; +STATIC Int32 kExitCode = 0U; +/// @brief Gets the latest exit code. +/// @note Not thread-safe. const Int32 &rt_get_exit_code() noexcept { return kExitCode; } /***********************************************************************************/ @@ -65,8 +67,8 @@ VoidPtr ProcessHeader::New(const SizeT &sz) { /* @brief checks if runtime pointer is in region. */ bool rt_in_pool_region(VoidPtr pool_ptr, VoidPtr pool, const SizeT &sz) { - Char *_pool_ptr = (Char *)pool_ptr; - Char *_pool = (Char *)pool; + UIntPtr *_pool_ptr = (UIntPtr *)pool_ptr; + UIntPtr *_pool = (UIntPtr *)pool; for (SizeT index = sz; _pool[sz] != kUserHeapMag; --index) { if (&_pool[index] > &_pool_ptr[sz]) continue; @@ -97,10 +99,13 @@ Boolean ProcessHeader::Delete(VoidPtr ptr, const SizeT &sz) { return false; } +/// @brief process name getter. const Char *ProcessHeader::GetName() { return this->Name; } +/// @brief process selector getter. const ProcessSelector &ProcessHeader::GetSelector() { return this->Selector; } +/// @brief process status getter. const ProcessStatus &ProcessHeader::GetStatus() { return this->Status; } /***********************************************************************************/ 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); +} diff --git a/Private/makefile b/Private/makefile index 41f70c81..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), ) @@ -28,10 +28,12 @@ COPY = cp # Add assembler, linker, and object files variables. ASMFLAGS = -f win64 -LDFLAGS = -e Main --subsystem=17 + +# NewOS subsystem is 17. +LDFLAGS = -e __ImageStart --subsystem=17 LDOBJ = Objects/*.obj -# This file is the kernel, responsible of task management, memory, drivers and more. +# This file is the kernel, responsible of task management and memory. KERNEL = NewKernel.exe # The kernel entrypoint @@ -39,6 +41,7 @@ SCRIPT = --script=Linker/Platforms/PC.lds .PHONY: error error: + @echo "=== ERROR ===" @echo "=> Use a specific target." MOVEALL=./MoveAll.sh @@ -56,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 |