summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlalelmahrouss@icloud.com>2024-02-07 11:17:27 +0100
committerAmlal El Mahrouss <amlalelmahrouss@icloud.com>2024-02-07 11:17:27 +0100
commit6e0378ee5f78691fe3326dc128aaf0a31d99960e (patch)
tree2d8deb19b69c0e19eda0761264f3695d7096cd84
parent607f56b53178c73bcbf26f93172dc8be37549ac7 (diff)
Code bump.
Signed-off-by: Amlal El Mahrouss <amlalelmahrouss@icloud.com>
-rw-r--r--Private/EFIKit/Api.hxx1
-rw-r--r--Private/NewBoot/Source/FileReader.cxx4
-rw-r--r--Private/NewBoot/Source/RuntimeMain.cxx13
-rw-r--r--Private/NewBoot/Source/TextWriter.cxx2
-rw-r--r--Private/NewBoot/Source/Utils.cxx2
-rw-r--r--Private/NewBoot/Source/makefile8
-rw-r--r--Private/Source/FileManager.cxx1
-rw-r--r--Private/Source/IndexableProperty.cxx2
-rw-r--r--Private/Source/NewFS.cxx2
9 files changed, 15 insertions, 20 deletions
diff --git a/Private/EFIKit/Api.hxx b/Private/EFIKit/Api.hxx
index b39c4991..0297ad96 100644
--- a/Private/EFIKit/Api.hxx
+++ b/Private/EFIKit/Api.hxx
@@ -35,7 +35,6 @@ inline void ExitBootServices(UInt64 MapKey, EfiHandlePtr ImageHandle) noexcept {
/// The MapKey may be invalid.
/// If so, then hang the computer.
if (ST->BootServices->ExitBootServices(ImageHandle, MapKey) != kEfiOk) {
- ST->ConOut->OutputString(ST->ConOut, L"HCoreLdr: Hanging...\r\n");
EFI::Stop();
}
}
diff --git a/Private/NewBoot/Source/FileReader.cxx b/Private/NewBoot/Source/FileReader.cxx
index 2bed60ef..b26c4d78 100644
--- a/Private/NewBoot/Source/FileReader.cxx
+++ b/Private/NewBoot/Source/FileReader.cxx
@@ -16,9 +16,7 @@
#include <EFIKit/Api.hxx>
#include <EFIKit/Handover.hxx>
-#include "EFIKit/EFI.hxx"
-#include "NewKit/Defines.hpp"
-#include "NewKit/Macros.hpp"
+/// BUGS: 0
////////////////////////////////////////////////////////////////////////////////////////////////////
//
diff --git a/Private/NewBoot/Source/RuntimeMain.cxx b/Private/NewBoot/Source/RuntimeMain.cxx
index aeaf013a..40d9e819 100644
--- a/Private/NewBoot/Source/RuntimeMain.cxx
+++ b/Private/NewBoot/Source/RuntimeMain.cxx
@@ -16,7 +16,7 @@
#include <NewKit/Ref.hpp>
namespace Detail {
-constexpr Int32 kReadSz = 2048;
+constexpr Int32 kBufferReadSz = 2048;
auto FindPEHeader(DosHeaderPtr ptrDos) -> ExecHeaderPtr {
if (!ptrDos) return nullptr;
@@ -50,7 +50,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
BFileReader img(L"HCOREKRNL.EXE", ImageHandle);
- img.Size() = Detail::kReadSz;
+ img.Size() = Detail::kBufferReadSz;
img.ReadAll();
if (img.Error() == BFileReader::kOperationOkay) {
@@ -64,8 +64,6 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
if (ptrHdr->mNumberOfSections > 1) {
UInt64 MapKey = 0;
- writer.WriteString(L"HCoreLdr: Booting...").WriteString(L"\r\n");
-
EFI::ExitBootServices(MapKey, ImageHandle);
// Launch PE app.
@@ -74,14 +72,11 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
return kEfiOk;
} else {
- writer.WriteString(
- L"HCoreLdr: Error! HCOREKRNL.EXE is missing critical "
- L"components!\r\n");
+ writer.WriteString(L"HCoreLdr: Error-Code: HLDR-0001\r\n");
}
}
} else {
- writer.WriteString(
- L"HCoreLdr: Error! HCOREKRNL.EXE is not an executable!\r\n");
+ writer.WriteString(L"HCoreLdr: Error-Code: HLDR-0002\r\n");
}
EFI::Stop();
diff --git a/Private/NewBoot/Source/TextWriter.cxx b/Private/NewBoot/Source/TextWriter.cxx
index c885f317..0ea3a972 100644
--- a/Private/NewBoot/Source/TextWriter.cxx
+++ b/Private/NewBoot/Source/TextWriter.cxx
@@ -14,7 +14,7 @@
#include <BootKit/BootKit.hxx>
#include <EFIKit/Api.hxx>
-/// bugs 0
+/// BUGS: 0
/////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Private/NewBoot/Source/Utils.cxx b/Private/NewBoot/Source/Utils.cxx
index 8d2242cd..4165af2e 100644
--- a/Private/NewBoot/Source/Utils.cxx
+++ b/Private/NewBoot/Source/Utils.cxx
@@ -11,4 +11,6 @@
#include <EFIKit/Api.hxx>
#include <EFIKit/EFI.hxx>
+/// BUGS: 0
+
/// @brief EFI API
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index cc550bdd..62a48abf 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -24,12 +24,8 @@ bootloader-amd64:
cp HCoreLdr.exe CDROM/EFI/BOOT/BOOTX64.EFI
cp ../../HCoreKrnl.exe CDROM/HCOREKRNL.EXE
-.PHONY: make-disk
-make-disk:
- qemu-img create -f qcow2 os.epm 1M
-
-.PHONY: run-efi-debug
-run-efi-debug:
+.PHONY: run-efi-amd64
+run-efi-amd64:
wget https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
qemu-system-x86_64 -net none -smp 2 -m 4G -M q35 -bios OVMF.fd -drive file=os.epm,index=0,if=ide,format=qcow2 -drive file=fat:rw:CDROM,index=1,format=raw -serial stdio
diff --git a/Private/Source/FileManager.cxx b/Private/Source/FileManager.cxx
index e4639c0c..860a8808 100644
--- a/Private/Source/FileManager.cxx
+++ b/Private/Source/FileManager.cxx
@@ -11,6 +11,7 @@
#include <NewKit/ErrorID.hpp>
#include <NewKit/Utils.hpp>
+/// BUGS: 0
//! @brief File manager for HCore.
namespace HCore {
diff --git a/Private/Source/IndexableProperty.cxx b/Private/Source/IndexableProperty.cxx
index 674db861..778acd19 100644
--- a/Private/Source/IndexableProperty.cxx
+++ b/Private/Source/IndexableProperty.cxx
@@ -14,6 +14,8 @@
#include <NewKit/MutableArray.hpp>
#include <NewKit/Utils.hpp>
+/// BUGS: 0
+
#define kMaxLenIndexer 256
namespace HCore {
diff --git a/Private/Source/NewFS.cxx b/Private/Source/NewFS.cxx
index 64c13e11..b0ba37c6 100644
--- a/Private/Source/NewFS.cxx
+++ b/Private/Source/NewFS.cxx
@@ -11,6 +11,8 @@
#ifdef __USE_NEWFS__
+/// BUGS: 0
+
namespace HCore {
NewFilesystemManager::NewFilesystemManager() = default;