diff options
| -rw-r--r-- | Boot/Sources/ProgramLoader.cxx | 5 | ||||
| -rw-r--r-- | Kernel/ArchKit/ArchKit.hxx | 4 | ||||
| -rw-r--r-- | Kernel/FirmwareKit/Handover.hxx | 4 | ||||
| -rw-r--r-- | Kernel/HALKit/AMD64/HalKernelMain.cxx | 2 | ||||
| -rw-r--r-- | Kernel/HALKit/AMD64/Processor.hxx | 2 | ||||
| -rw-r--r-- | Kernel/KernelKit/DebugOutput.hxx | 18 | ||||
| -rw-r--r-- | Kernel/Sources/ProcessScheduler.cxx | 2 |
7 files changed, 8 insertions, 29 deletions
diff --git a/Boot/Sources/ProgramLoader.cxx b/Boot/Sources/ProgramLoader.cxx index bdd54383..3b24d97b 100644 --- a/Boot/Sources/ProgramLoader.cxx +++ b/Boot/Sources/ProgramLoader.cxx @@ -80,13 +80,10 @@ namespace Boot writer.Write("newosldr: offset ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write(".\r"); + SetMem((VoidPtr)(loadStartAddress + sect->mVirtualAddress), 0, sect->mSizeOfRawData); CopyMem((VoidPtr)(loadStartAddress + sect->mVirtualAddress), (VoidPtr)((UIntPtr)fBlob + sect->mPointerToRawData), sect->mSizeOfRawData); } - EfiPhysicalAddress start = (EfiPhysicalAddress)fStartAddress; - - BS->AllocatePages(AllocateAddress, EfiLoaderData, 1, &start); - // ================================ // // Allocate stack. // ================================ // diff --git a/Kernel/ArchKit/ArchKit.hxx b/Kernel/ArchKit/ArchKit.hxx index 85b0668f..de4c9b5b 100644 --- a/Kernel/ArchKit/ArchKit.hxx +++ b/Kernel/ArchKit/ArchKit.hxx @@ -68,11 +68,11 @@ namespace Kernel { if (i % 16 == 0) { - kcout.HexNumber((UIntPtr)ptr + i); + kcout << hex_number((UIntPtr)ptr + i); } else { - kcout.HexNumber(ptr[i]); + kcout << hex_number(ptr[i]); } kcout << " "; diff --git a/Kernel/FirmwareKit/Handover.hxx b/Kernel/FirmwareKit/Handover.hxx index 7dc9e7c5..23d92e59 100644 --- a/Kernel/FirmwareKit/Handover.hxx +++ b/Kernel/FirmwareKit/Handover.hxx @@ -24,7 +24,7 @@ #define kHandoverMagic 0xBADCC #define kHandoverVersion 0x113 -#define cMaxCmdLine 8 +#define kHandoverMaxCmdLine 8 #define kHandoverStructSz sizeof(HEL::HandoverHeader) @@ -92,7 +92,7 @@ it tells us more about it and IS format independent. } f_GOP; UInt64 f_FirmwareSpecific[8]; - Char f_CommandLine[255][cMaxCmdLine]; + Char f_CommandLine[255][kHandoverMaxCmdLine]; }; enum diff --git a/Kernel/HALKit/AMD64/HalKernelMain.cxx b/Kernel/HALKit/AMD64/HalKernelMain.cxx index e3bcb20c..3cefe1d3 100644 --- a/Kernel/HALKit/AMD64/HalKernelMain.cxx +++ b/Kernel/HALKit/AMD64/HalKernelMain.cxx @@ -233,7 +233,7 @@ void hal_real_init(void) kTextOffsetY += 10; cg_write_text("LOADING SMP...", kTextOffsetY, 10, RGB(0x00, 0x00, 0x00)); - for (size_t i = 0; i < cMaxCmdLine; i++) + for (Kernel::SizeT i = 0; i < kHandoverMaxCmdLine; i++) { if (Kernel::rt_string_cmp(kHandoverHeader->f_CommandLine[i], "/AutoFormat", Kernel::rt_string_len("/AutoFormat")) == 0) { diff --git a/Kernel/HALKit/AMD64/Processor.hxx b/Kernel/HALKit/AMD64/Processor.hxx index 79c5794c..53addd46 100644 --- a/Kernel/HALKit/AMD64/Processor.hxx +++ b/Kernel/HALKit/AMD64/Processor.hxx @@ -40,7 +40,7 @@ EXTERN_C #define kTaskGate (0b10001100) #define kGdtCodeSelector (0x08) #define kGdtUserCodeSelector (0x10) -#define cHeapStartOffset (0x10000000) +#define cHeapStartOffset (0x4000000) namespace Kernel { diff --git a/Kernel/KernelKit/DebugOutput.hxx b/Kernel/KernelKit/DebugOutput.hxx index 6183c18d..f0c4565a 100644 --- a/Kernel/KernelKit/DebugOutput.hxx +++ b/Kernel/KernelKit/DebugOutput.hxx @@ -44,24 +44,6 @@ namespace Kernel virtual ~TerminalDevice() = default; - TerminalDevice& Number(const Long Data) noexcept - { - number(Data); - return *this; - } - - TerminalDevice& HexNumber(const Long Data) noexcept - { - hex_number(Data); - return *this; - } - - TerminalDevice& EndLine() noexcept - { - end_line(); - return *this; - } - /// @brief returns device name (terminal name) /// @return string type (const char*) virtual const char* Name() const override diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx index c004e932..7c839a74 100644 --- a/Kernel/Sources/ProcessScheduler.cxx +++ b/Kernel/Sources/ProcessScheduler.cxx @@ -45,7 +45,7 @@ namespace Kernel void PROCESS_HEADER_BLOCK::Crash() { kcout << (*this->Name == 0 ? "Kernel" : this->Name) << ": crashed. (id = "; - kcout.Number(kErrorProcessFault); + kcout << number(kErrorProcessFault); kcout << ")\r"; if (Kernel::ProcessScheduler::The().Leak().CurrentTeam().AsArray().Count() < 1) |