summaryrefslogtreecommitdiffhomepage
path: root/Kernel
diff options
context:
space:
mode:
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx19
-rw-r--r--Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp58
-rw-r--r--Kernel/HALKit/AXP/README.TXT2
-rw-r--r--Kernel/KernelKit/DebugOutput.hpp2
-rw-r--r--Kernel/KernelKit/FileManager.hpp2
-rw-r--r--Kernel/KernelKit/ProcessScheduler.hpp4
-rw-r--r--Kernel/KernelRsrc.rsrc2
-rw-r--r--Kernel/Linker/16x0.json2
-rw-r--r--Kernel/Linker/32x0.json2
-rw-r--r--Kernel/Linker/64x0.json2
-rw-r--r--Kernel/NewKit/ApplicationInterface.hxx (renamed from Kernel/NewKit/Application.hxx)2
-rw-r--r--Kernel/Source/AppMain.cxx39
-rw-r--r--Kernel/Source/FileManager.cxx22
-rw-r--r--Kernel/Source/KernelCheck.cxx2
-rw-r--r--Kernel/Source/ProcessScheduler.cxx2
-rw-r--r--Kernel/Source/Variant.cxx5
-rw-r--r--Kernel/makefile5
17 files changed, 84 insertions, 88 deletions
diff --git a/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx b/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx
index f4c9226e..db82616e 100644
--- a/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx
+++ b/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx
@@ -75,7 +75,7 @@ namespace NewOS
SDT* xsdt = (SDT*)(rsdPtr->XsdtAddress >> (rsdPtr->XsdtAddress & 0xFFF));
- SizeT num = (xsdt->Length + sizeof(SDT)) / 8;
+ SizeT num = -(xsdt->Length - sizeof(SDT)) / 8;
this->fEntries = num;
@@ -83,22 +83,19 @@ namespace NewOS
kcout << "ACPI: Address of XSDT: " << hex_number((UIntPtr)xsdt) << endl;
constexpr short ACPI_SIGNATURE_LENGTH = 4;
- SizeT offsetToAdd = 0UL;
-
- for (Size index = 0; index < num; ++index)
+
+ for (Size index = 0; index < this->fEntries; ++index)
{
- SDT* sdt = &(xsdt[index]) + offsetToAdd;
+ SDT &sdt = xsdt[index];
- for (int signature_index = 0; signature_index < 4; signature_index++)
+ for (short signature_index = 0; signature_index < ACPI_SIGNATURE_LENGTH; ++signature_index)
{
- if (sdt->Signature[signature_index] != signature[signature_index])
+ if (sdt.Signature[signature_index] != signature[signature_index])
break;
- if (signature_index == 3)
- return ErrorOr<voidPtr>(reinterpret_cast<voidPtr>(sdt));
+ if (signature_index == 4)
+ return ErrorOr<voidPtr>(reinterpret_cast<voidPtr>(&sdt));
}
-
- offsetToAdd = sdt->Length;
}
return ErrorOr<voidPtr>{nullptr};
diff --git a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
index ec6d47da..470a3286 100644
--- a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
+++ b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
@@ -46,54 +46,54 @@ namespace NewOS::HAL
STATIC voidPtr kApicMadt = nullptr;
STATIC const char* kApicSignature = "APIC";
- /// @brief Multiple APIC descriptor table.
+ /// @brief Multiple APIC Descriptor Table.
struct MadtType final : public SDT
{
struct MadtAddress final
{
- UInt32 fAddress;
- UInt32 fFlags; // 1 = Dual Legacy PICs installed
-
- Char fType;
- Char fRecLen; // record length
- } fMadt[];
+ Char RecordType;
+ Char RecordLen; // record length
+
+ UInt32 Address;
+ UInt32 Flags; // 1 = Dual Legacy PICs installed
+ } MadtRecords[];
};
struct MadtProcessorLocalApic final
{
- Char fProcessorId;
- Char fApicId;
- UInt32 fFlags;
+ Char AcpiProcessorId;
+ Char Reserved;
+ UInt32 Flags;
};
struct MadtIOApic final
{
- Char fApicId;
- Char fReserved;
- UInt32 fAddress;
- UInt32 fSystemInterruptBase;
+ Char ApicId;
+ Char Reserved;
+ UInt32 Address;
+ UInt32 SystemInterruptBase;
};
struct MadtInterruptSource final
{
- Char fBusSource;
- Char fIrqSource;
- UInt32 fGSI;
- UInt16 fFlags;
+ Char BusSource;
+ Char IrqSource;
+ UInt32 GSI;
+ UInt16 Flags;
};
struct MadtInterruptNmi final
{
- Char fNmiSource;
- Char fReserved;
- UInt16 fFlags;
- UInt32 fGSI;
+ Char NmiSource;
+ Char Reserved;
+ UInt16 Flags;
+ UInt32 GSI;
};
struct MadtLocalApicAddressOverride final
{
- UInt16 fResvered;
- UIntPtr fAddress;
+ UInt16 Resvered;
+ UIntPtr Address;
};
///////////////////////////////////////////////////////////////////////////////////////
@@ -109,17 +109,13 @@ namespace NewOS::HAL
if (kApicMadt)
{
- kcout << "New OS: Successfuly fetched the cores!\r";
+ kcout << "New OS: APIC is present...\r";
kApicInfoBlock = (MadtType*)kApicMadt;
-
- kcout << "New OS: Revision: ";
- kcout.HexNumber(kApicInfoBlock->Revision).EndLine();
-
- ke_stop(RUNTIME_CHECK_BOOTSTRAP);
}
else
{
- ke_stop(RUNTIME_CHECK_BOOTSTRAP);
+ kcout << "New OS: APIC is not present! it is a vital component.\r";
+ ke_stop(RUNTIME_CHECK_FAILED);
}
}
} // namespace NewOS::HAL
diff --git a/Kernel/HALKit/AXP/README.TXT b/Kernel/HALKit/AXP/README.TXT
index 03c2b816..d4ef257d 100644
--- a/Kernel/HALKit/AXP/README.TXT
+++ b/Kernel/HALKit/AXP/README.TXT
@@ -1 +1 @@
-A Toy HAL to test the Kernel portability.
+An toy HAL to test the kernel portability.
diff --git a/Kernel/KernelKit/DebugOutput.hpp b/Kernel/KernelKit/DebugOutput.hpp
index 656fe7a9..c6eb4485 100644
--- a/Kernel/KernelKit/DebugOutput.hpp
+++ b/Kernel/KernelKit/DebugOutput.hpp
@@ -56,7 +56,7 @@ namespace NewOS
TerminalDevice& HexNumber(const Long Data) noexcept
{
- number(Data);
+ hex_number(Data);
return *this;
}
diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hpp
index d0843a5e..a5ac6a93 100644
--- a/Kernel/KernelKit/FileManager.hpp
+++ b/Kernel/KernelKit/FileManager.hpp
@@ -136,8 +136,6 @@ namespace NewOS
NewFSParser* GetImpl() noexcept;
private:
- Char fDataFork[kNewFSForkNameLen] = {0};
- Char fRsrcFork[kNewFSForkNameLen] = {0};
NewFSParser* fImpl{nullptr};
};
diff --git a/Kernel/KernelKit/ProcessScheduler.hpp b/Kernel/KernelKit/ProcessScheduler.hpp
index ba34f9cb..243857ae 100644
--- a/Kernel/KernelKit/ProcessScheduler.hpp
+++ b/Kernel/KernelKit/ProcessScheduler.hpp
@@ -163,7 +163,7 @@ namespace NewOS
enum
{
- kUserKind = 3,
+ kAppKind = 3,
kLibKind = 3,
kDriverKind = 0,
kKindCount,
@@ -178,7 +178,7 @@ namespace NewOS
ProcessTime PTime;
PID ProcessId{kSchedInvalidPID};
Int32 Ring{kRingDriverKind};
- Int32 Kind{kUserKind};
+ Int32 Kind{kAppKind};
public:
//! @brief boolean operator, check status.
diff --git a/Kernel/KernelRsrc.rsrc b/Kernel/KernelRsrc.rsrc
index d8fc6473..6689d10c 100644
--- a/Kernel/KernelRsrc.rsrc
+++ b/Kernel/KernelRsrc.rsrc
@@ -15,7 +15,7 @@ BEGIN
VALUE "FileVersion", KERNEL_VERSION
VALUE "InternalName", "NewKernel"
VALUE "LegalCopyright", "SoftwareLabs"
- VALUE "OriginalFilename", "NewKernel.exe"
+ VALUE "OriginalFilename", "NewOSKrnl.exe"
VALUE "ProductName", "NewKernel"
VALUE "ProductVersion", KERNEL_VERSION
END
diff --git a/Kernel/Linker/16x0.json b/Kernel/Linker/16x0.json
index 5851a2d3..40cee7c9 100644
--- a/Kernel/Linker/16x0.json
+++ b/Kernel/Linker/16x0.json
@@ -1,6 +1,6 @@
{
"executable_type": "kernel",
- "output_name": "NewKernel.exe",
+ "output_name": "NewOSKrnl.exe",
"start_proc": "__ImageStart",
"format": "PEF"
}
diff --git a/Kernel/Linker/32x0.json b/Kernel/Linker/32x0.json
index 5851a2d3..40cee7c9 100644
--- a/Kernel/Linker/32x0.json
+++ b/Kernel/Linker/32x0.json
@@ -1,6 +1,6 @@
{
"executable_type": "kernel",
- "output_name": "NewKernel.exe",
+ "output_name": "NewOSKrnl.exe",
"start_proc": "__ImageStart",
"format": "PEF"
}
diff --git a/Kernel/Linker/64x0.json b/Kernel/Linker/64x0.json
index 5851a2d3..40cee7c9 100644
--- a/Kernel/Linker/64x0.json
+++ b/Kernel/Linker/64x0.json
@@ -1,6 +1,6 @@
{
"executable_type": "kernel",
- "output_name": "NewKernel.exe",
+ "output_name": "NewOSKrnl.exe",
"start_proc": "__ImageStart",
"format": "PEF"
}
diff --git a/Kernel/NewKit/Application.hxx b/Kernel/NewKit/ApplicationInterface.hxx
index 19a892d6..09d2c901 100644
--- a/Kernel/NewKit/Application.hxx
+++ b/Kernel/NewKit/ApplicationInterface.hxx
@@ -8,7 +8,7 @@
///
/// @brief Application object, given by the OS to the process. interact with the OS.
-/// @file Application.hxx
+/// @file ApplicationInterface.hxx
/// @author Amlal EL Mahrouss
///
diff --git a/Kernel/Source/AppMain.cxx b/Kernel/Source/AppMain.cxx
index 4f5de11f..028e70e5 100644
--- a/Kernel/Source/AppMain.cxx
+++ b/Kernel/Source/AppMain.cxx
@@ -179,25 +179,50 @@ namespace Detail
}
};
- STATIC NewOS::Void AppWatchdogThread(NewOS::Void)
+ /// @brief System loader entrypoint.
+ /// @param void no parameters.
+ /// @return void no return value.
+ STATIC NewOS::Void AppSystemLoader(NewOS::Void)
{
- NewOS::kcout << "SystemSanityThread: Exiting process...";
+ NewOS::PEFLoader coreGraphicsShLib("/System/CoreGraphics");
+
+ if (!coreGraphicsShLib.IsLoaded())
+ {
+ NewOS::ke_stop(RUNTIME_CHECK_FAILED);
+ }
+
+ NewOS::Utils::execute_from_image(coreGraphicsShLib,
+ NewOS::ProcessHeader::kLibKind);
+
+ NewOS::PEFLoader logonService("/System/Login");
+
+ if (!logonService.IsLoaded())
+ {
+ NewOS::ke_stop(RUNTIME_CHECK_FAILED);
+ }
+
+ NewOS::Utils::execute_from_image(logonService,
+ NewOS::ProcessHeader::kAppKind);
+
+ NewOS::kcout << "SystemLoader: Exiting process, we're done initializing stuff...";
+
NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Exit(0);
}
} // namespace Detail
-/// @file Main microkernel entrypoint.
-
+/// @brief Application entrypoint.
+/// @param Void
+/// @return Void
EXTERN_C NewOS::Void AppMain(NewOS::Void)
{
/// Now run kernel loop, until no process are running.
Detail::FilesystemWizard wizard; // automatic.
- auto cWatchdogThreadName = "SystemSanityThread";
- NewOS::execute_from_image((NewOS::MainKind)Detail::AppWatchdogThread, cWatchdogThreadName);
+ auto cLoaderName = "SystemLoader";
+ NewOS::execute_from_image(Detail::AppSystemLoader, cLoaderName);
while (NewOS::ProcessScheduler::Shared().Leak().Run() > 0)
{
- ;
+ NewOS::kcout << "New OS: sleeping...\r";
}
}
diff --git a/Kernel/Source/FileManager.cxx b/Kernel/Source/FileManager.cxx
index 72ea15a1..ed90dab8 100644
--- a/Kernel/Source/FileManager.cxx
+++ b/Kernel/Source/FileManager.cxx
@@ -90,11 +90,11 @@ namespace NewOS
NEWOS_UNUSED(flags);
- const char* cReadAllFork = fDataFork;
-
+ auto dataForkName = "FileData";
+
if ((reinterpret_cast<NewCatalog*>(node))->Kind == kNewFSCatalogKindFile)
fImpl->WriteCatalog(reinterpret_cast<NewCatalog*>(node), data, size,
- cReadAllFork);
+ dataForkName);
}
/// @brief Read from filesystem fork.
@@ -112,11 +112,11 @@ namespace NewOS
NEWOS_UNUSED(flags);
- const char* cReadAllFork = fDataFork;
+ auto dataForkName = "FileData";
if ((reinterpret_cast<NewCatalog*>(node))->Kind == kNewFSCatalogKindFile)
return fImpl->ReadCatalog(reinterpret_cast<NewCatalog*>(node), sz,
- cReadAllFork);
+ dataForkName);
return nullptr;
}
@@ -167,17 +167,5 @@ namespace NewOS
{
return fImpl;
}
-
- void NewFilesystemManager::SetResourceFork(const char* forkName)
- {
- if (!forkName) return;
- rt_copy_memory((VoidPtr)forkName, (VoidPtr)fRsrcFork, rt_string_len(forkName));
- }
-
- void NewFilesystemManager::SetDataFork(const char* forkName)
- {
- if (!forkName) return;
- rt_copy_memory((VoidPtr)forkName, (VoidPtr)fDataFork, rt_string_len(forkName));
- }
#endif // __FSKIT_NEWFS__
} // namespace NewOS
diff --git a/Kernel/Source/KernelCheck.cxx b/Kernel/Source/KernelCheck.cxx
index e7c43650..5df52248 100644
--- a/Kernel/Source/KernelCheck.cxx
+++ b/Kernel/Source/KernelCheck.cxx
@@ -26,7 +26,7 @@ namespace NewOS
void ke_stop(const NewOS::Int& id)
{
kcout << "*** STOP *** \r";
- kcout << "*** NewKernel.exe has trigerred a runtime stop. *** \r";
+ kcout << "*** Kernel has trigerred a runtime stop. *** \r";
switch (id)
{
diff --git a/Kernel/Source/ProcessScheduler.cxx b/Kernel/Source/ProcessScheduler.cxx
index 859ce657..555dfe07 100644
--- a/Kernel/Source/ProcessScheduler.cxx
+++ b/Kernel/Source/ProcessScheduler.cxx
@@ -218,7 +218,7 @@ namespace NewOS
kcout << "ProcessScheduler::Add(Ref<ProcessHeader>& process)\r";
/// Create heap according to type of process.
- if (process.Leak().Kind == ProcessHeader::kUserKind)
+ if (process.Leak().Kind == ProcessHeader::kAppKind)
process.Leak().HeapPtr = rt_new_heap(kUserHeapUser | kUserHeapRw);
else if (process.Leak().Kind == ProcessHeader::kLibKind)
process.Leak().HeapPtr = rt_new_heap(kUserHeapUser | kUserHeapRw | kUserHeapShared);
diff --git a/Kernel/Source/Variant.cxx b/Kernel/Source/Variant.cxx
index afe66624..1a09718b 100644
--- a/Kernel/Source/Variant.cxx
+++ b/Kernel/Source/Variant.cxx
@@ -10,11 +10,6 @@ namespace NewOS
{
const Char* Variant::ToString()
{
- if (fPtr == nullptr)
- {
- return ("Memory:{Nullptr}");
- }
-
switch (fKind)
{
case VariantKind::kString:
diff --git a/Kernel/makefile b/Kernel/makefile
index 61eb9dfe..74365a60 100644
--- a/Kernel/makefile
+++ b/Kernel/makefile
@@ -37,10 +37,7 @@ LDFLAGS = -e __ImageStart --subsystem=17
LDOBJ = Objects/*.obj
# This file is the kernel, responsible of task management and memory.
-KERNEL = NewKernel.exe
-
-# The kernel entrypoint
-SCRIPT = --script=Linker/Platforms/PC.lds
+KERNEL = NewOSKrnl.exe
.PHONY: error
error:
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 20:40:20 +0000