summaryrefslogtreecommitdiffhomepage
path: root/Private/NewBoot/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Private/NewBoot/Source')
-rw-r--r--Private/NewBoot/Source/HEL/AMD64/BootKit.cxx2
-rw-r--r--Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx10
-rw-r--r--Private/NewBoot/Source/HEL/AMD64/Platform.cxx12
-rw-r--r--Private/NewBoot/Source/makefile2
4 files changed, 17 insertions, 9 deletions
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx b/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx
index b59c0140..e0dd5172 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx
@@ -2,7 +2,7 @@
* ========================================================
*
* NewBoot
- * Copyright 2024 Mahrouss Logic, all rights reserved.
+ * Copyright Mahrouss Logic, all rights reserved.
*
* ========================================================
*/
diff --git a/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx b/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx
index 5a34572b..7fd55ec1 100644
--- a/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx
@@ -2,7 +2,7 @@
* ========================================================
*
* NewBoot
- * Copyright 2024 Mahrouss Logic, all rights reserved.
+ * Copyright Mahrouss Logic, all rights reserved.
*
* ========================================================
*/
@@ -18,13 +18,19 @@ EFI_EXTERN_C int EfiMain(EfiHandlePtr ImageHandle,
EfiSystemTable* SystemTable) {
KeInitEFI(SystemTable);
+ SystemTable->ConOut->ClearScreen(SystemTable->ConOut);
+ SystemTable->ConOut->SetAttribute(SystemTable->ConOut, kEFIYellow);
+
BTextWriter writer;
- writer.WriteString(L"HCoreLdr: Booting from disk...").WriteString(L"\r\n");
+ writer.WriteString(L"HCoreLdr: Booting from \\Volume0\\...")
+ .WriteString(L"\r\n");
UInt64 mapKey = 0;
// TODO: Jump Code
+ KeRuntimeStop(L"HCoreLdr", L"Couldn't find HCoreKrnl.exe! Aborting...");
+
EFI::ExitBootServices(SystemTable, mapKey, ImageHandle);
EFI::Stop();
diff --git a/Private/NewBoot/Source/HEL/AMD64/Platform.cxx b/Private/NewBoot/Source/HEL/AMD64/Platform.cxx
index 729320b8..9b26f517 100644
--- a/Private/NewBoot/Source/HEL/AMD64/Platform.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/Platform.cxx
@@ -2,7 +2,7 @@
* ========================================================
*
* NewBoot
- * Copyright 2024 Mahrouss Logic, all rights reserved.
+ * Copyright Mahrouss Logic, all rights reserved.
*
* ========================================================
*/
@@ -16,10 +16,12 @@
#include <BootKit/Platform.hxx>
-extern "C" void rt_halt(void) { asm volatile("hlt"); }
+extern "C" void rt_halt() { asm volatile("hlt"); }
-extern "C" void rt_cli(void) { asm volatile("cli"); }
+extern "C" void rt_cli() { asm volatile("cli"); }
-extern "C" void rt_sti(void) { asm volatile("sti"); }
+extern "C" void rt_sti() { asm volatile("sti"); }
-extern "C" void rt_cld(void) { asm volatile("cld"); }
+extern "C" void rt_cld() { asm volatile("cld"); }
+
+extern "C" void rt_std() { asm volatile("std"); }
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 74ab7878..4e8f17d2 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -10,7 +10,7 @@ FLAG_GNU=-fshort-wchar -fPIC -D__DBG__ -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I.
.PHONY: invalid-recipe
invalid-recipe:
- @echo "invalid-recipe: Use make arch-<arch> all instead."
+ @echo "invalid-recipe: Use make bootloader-<arch> all instead."
.PHONY: bootloader-amd64
bootloader-amd64: