diff options
| -rw-r--r-- | Boot/amd64-efi.make | 10 | ||||
| -rw-r--r-- | Kernel/KernelKit/DebugOutput.hpp | 10 | ||||
| -rw-r--r-- | Kernel/KernelKit/ProcessScheduler.hxx | 10 | ||||
| -rw-r--r-- | Kernel/Sources/FS/NewFS.cxx | 2 |
4 files changed, 17 insertions, 15 deletions
diff --git a/Boot/amd64-efi.make b/Boot/amd64-efi.make index 7439ebf3..2bbe2a2c 100644 --- a/Boot/amd64-efi.make +++ b/Boot/amd64-efi.make @@ -12,12 +12,12 @@ ADD_FILE=touch COPY=cp HTTP_GET=wget -# Select this for UNIX distributions -ifneq ($(shell uname), CYGWIN_NT-10.0-19045) -EMU=qemu-system-x86_64 +# Select this for Windows. +ifneq ($(findstring CYGWIN_NT-10.0,$(shell uname)), ) +EMU=qemu-system-x86_64w.exe else # this for NT distributions -EMU=qemu-system-x86_64w.exe +EMU=qemu-system-x86_64 endif ifeq ($(NEWS_MODEL), ) @@ -50,7 +50,7 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__KERNEL__ -D__NEWBOOT__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I./ -c -nostdlib -fno-rtti -fno-exceptions \ - -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./ + -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__NEWOS_AMD64__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./ BOOT_LOADER=newosldr.exe KERNEL=newoskrnl.exe diff --git a/Kernel/KernelKit/DebugOutput.hpp b/Kernel/KernelKit/DebugOutput.hpp index f5c402db..05865661 100644 --- a/Kernel/KernelKit/DebugOutput.hpp +++ b/Kernel/KernelKit/DebugOutput.hpp @@ -125,10 +125,10 @@ namespace NewOS if (y < 0) y = -y; - const char NUMBERS[11] = "0123456789"; + const char cNumbers[11] = "0123456789"; Char buf[2]; - buf[0] = NUMBERS[h]; + buf[0] = cNumbers[h]; buf[1] = 0; term << buf; @@ -153,10 +153,10 @@ namespace NewOS if (y < 0) y = -y; - const char NUMBERS[17] = "0123456789ABCDEF"; + const char cNumbers[17] = "0123456789ABCDEF"; Char buf[2]; - buf[0] = NUMBERS[h]; + buf[0] = cNumbers[h]; buf[1] = 0; term << buf; @@ -186,7 +186,9 @@ namespace NewOS inline TerminalDevice& get_console_in(Char* buf) { TerminalDevice& selfTerm = TerminalDevice::The(); + selfTerm >> buf; + return selfTerm; } diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx index 51a1563f..b8ac2aae 100644 --- a/Kernel/KernelKit/ProcessScheduler.hxx +++ b/Kernel/KernelKit/ProcessScheduler.hxx @@ -262,7 +262,7 @@ namespace NewOS SizeT Run() noexcept; public: - static Ref<ProcessScheduler&> The(); + STATIC Ref<ProcessScheduler&> The(); private: ProcessTeam mTeam; @@ -275,10 +275,10 @@ namespace NewOS class ProcessHelper final { public: - static bool Switch(HAL::StackFrame* newStack, const PID& newPid); - static bool CanBeScheduled(Ref<ProcessHeader>& process); - static PID& TheCurrentPID(); - static SizeT StartScheduling(); + STATIC bool Switch(HAL::StackFrame* newStack, const PID& newPid); + STATIC bool CanBeScheduled(Ref<ProcessHeader>& process); + STATIC PID& TheCurrentPID(); + STATIC SizeT StartScheduling(); }; const Int32& rt_get_exit_code() noexcept; diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx index 5ede2ef7..79121018 100644 --- a/Kernel/Sources/FS/NewFS.cxx +++ b/Kernel/Sources/FS/NewFS.cxx @@ -561,7 +561,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NewCatalog* catalog, voidPtr data, drive->fInput(&drive->fPacket); - kcout << "newoskrnl: forkName: " << forkData->ForkName << endl; + kcout << "newoskrnl: fork name: " << forkData->ForkName << endl; /// sanity check the fork. if (forkData->DataOffset <= kNewFSCatalogStartAddress) |