summaryrefslogtreecommitdiffhomepage
path: root/dev/Kernel/src
diff options
context:
space:
mode:
Diffstat (limited to 'dev/Kernel/src')
-rw-r--r--dev/Kernel/src/BitMapMgr.cc6
-rw-r--r--dev/Kernel/src/CxxAbi-AMD64.cc4
-rw-r--r--dev/Kernel/src/CxxAbi-ARM64.cc10
-rw-r--r--dev/Kernel/src/DriveMgr.cc4
-rw-r--r--dev/Kernel/src/FS/NeFS+FileMgr.cc8
-rw-r--r--dev/Kernel/src/FS/NeFS.cc6
-rw-r--r--dev/Kernel/src/KernelMain.cc10
-rw-r--r--dev/Kernel/src/Network/IPCMsg.cc4
-rw-r--r--dev/Kernel/src/New+Delete.cc2
-rw-r--r--dev/Kernel/src/PEFCodeMgr.cc10
-rw-r--r--dev/Kernel/src/PageMgr.cc10
-rw-r--r--dev/Kernel/src/Pmm.cc8
-rw-r--r--dev/Kernel/src/UserProcessScheduler.cc18
-rw-r--r--dev/Kernel/src/Utils.cc2
14 files changed, 51 insertions, 51 deletions
diff --git a/dev/Kernel/src/BitMapMgr.cc b/dev/Kernel/src/BitMapMgr.cc
index c232fa4f..1e9c3827 100644
--- a/dev/Kernel/src/BitMapMgr.cc
+++ b/dev/Kernel/src/BitMapMgr.cc
@@ -6,9 +6,9 @@
#include <ArchKit/ArchKit.h>
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
#include <HALKit/AMD64/Paging.h>
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
#include <HALKit/ARM64/Paging.h>
#endif
@@ -35,7 +35,7 @@ namespace Kernel
explicit IBitMapProxy() = default;
~IBitMapProxy() = default;
- ZKA_COPY_DELETE(IBitMapProxy);
+ NE_COPY_DELETE(IBitMapProxy);
auto IsBitMap(VoidPtr page_ptr) -> Bool
{
diff --git a/dev/Kernel/src/CxxAbi-AMD64.cc b/dev/Kernel/src/CxxAbi-AMD64.cc
index 9065ece5..fa300316 100644
--- a/dev/Kernel/src/CxxAbi-AMD64.cc
+++ b/dev/Kernel/src/CxxAbi-AMD64.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
#include <KernelKit/DebugOutput.h>
#include <NewKit/CxxAbi.h>
@@ -87,4 +87,4 @@ namespace cxxabiv1
}
} // namespace cxxabiv1
-#endif // ifdef __ZKA_AMD64__
+#endif // ifdef __NE_AMD64__
diff --git a/dev/Kernel/src/CxxAbi-ARM64.cc b/dev/Kernel/src/CxxAbi-ARM64.cc
index 127e12c6..2535e0a7 100644
--- a/dev/Kernel/src/CxxAbi-ARM64.cc
+++ b/dev/Kernel/src/CxxAbi-ARM64.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#ifdef __ZKA_ARM64__
+#ifdef __NE_ARM64__
#include <KernelKit/DebugOutput.h>
#include <NewKit/CxxAbi.h>
@@ -89,19 +89,19 @@ EXTERN_C Kernel::Void _purecall(void* self)
EXTERN_C Kernel::Void _Init_thread_footer(Kernel::Int* thread_obj)
{
- ZKA_UNUSED(thread_obj);
+ NE_UNUSED(thread_obj);
}
EXTERN_C Kernel::Void _Init_thread_epoch(Kernel::Void)
{
- ZKA_UNUSED(0);
+ NE_UNUSED(0);
}
EXTERN_C Kernel::Void _Init_thread_header(Kernel::Int* thread_obj)
{
- ZKA_UNUSED(0);
+ NE_UNUSED(0);
}
EXTERN_C Kernel::Int _tls_index = 0UL;
-#endif // ifdef __ZKA_ARM64__
+#endif // ifdef __NE_ARM64__
diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc
index e405cc96..3ac3d69a 100644
--- a/dev/Kernel/src/DriveMgr.cc
+++ b/dev/Kernel/src/DriveMgr.cc
@@ -113,7 +113,7 @@ namespace Kernel
return "AHCI";
}
#endif
-#ifdef __ZKA_MINIMAL_OS__
+#ifdef __NE_MINIMAL_OS__
const Char* io_drv_kind(Void)
{
return "Not Loaded";
@@ -124,7 +124,7 @@ namespace Kernel
/// @param pckt the packet to read.
Void io_drv_unimplemented(DriveTrait::DrivePacket pckt) noexcept
{
- ZKA_UNUSED(pckt);
+ NE_UNUSED(pckt);
}
/// @brief Makes a new drive.
diff --git a/dev/Kernel/src/FS/NeFS+FileMgr.cc b/dev/Kernel/src/FS/NeFS+FileMgr.cc
index ebf03078..f1661938 100644
--- a/dev/Kernel/src/FS/NeFS+FileMgr.cc
+++ b/dev/Kernel/src/FS/NeFS+FileMgr.cc
@@ -7,7 +7,7 @@
#include <KernelKit/FileMgr.h>
#include <KernelKit/MemoryMgr.h>
-#ifndef __ZKA_MINIMAL_OS__
+#ifndef __NE_MINIMAL_OS__
#ifdef __FSKIT_INCLUDES_NEFS__
/// @brief NeFS File manager.
@@ -166,7 +166,7 @@ namespace Kernel
if (!data)
return;
- ZKA_UNUSED(flags);
+ NE_UNUSED(flags);
if ((reinterpret_cast<NFS_CATALOG_STRUCT*>(node))->Kind == kNeFSCatalogKindFile)
mParser->WriteCatalog(reinterpret_cast<NFS_CATALOG_STRUCT*>(node)->Name, (flags & kFileFlagRsrc ? true : false), data, size,
@@ -184,7 +184,7 @@ namespace Kernel
if (!sz)
return nullptr;
- ZKA_UNUSED(flags);
+ NE_UNUSED(flags);
if ((reinterpret_cast<NFS_CATALOG_STRUCT*>(node))->Kind == kNeFSCatalogKindFile)
return mParser->ReadCatalog(reinterpret_cast<NFS_CATALOG_STRUCT*>(node), (flags & kFileFlagRsrc ? true : false), sz,
@@ -242,4 +242,4 @@ namespace Kernel
} // namespace Kernel
#endif // ifdef __FSKIT_INCLUDES_NEFS__
-#endif // ifndef __ZKA_MINIMAL_OS__
+#endif // ifndef __NE_MINIMAL_OS__
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index ecfafab4..2b62710c 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -24,7 +24,7 @@
using namespace Kernel;
-#ifdef __ZKA_NO_BUILTIN__
+#ifdef __NE_NO_BUILTIN__
/***********************************************************************************/
/**
Define those external symbols, to make the editor shutup
@@ -452,7 +452,7 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char*
/// @return If it was sucessful, see err_global_get().
bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLba, _Input const Int32 flags, const Char* part_name)
{
-#ifdef ZKA_EPM_SUPPORT
+#ifdef NE_EPM_SUPPORT
if (*part_name == 0 ||
endLba == 0)
return false;
@@ -609,7 +609,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L
drive->fInput(&drive->fPacket);
}
-#endif // ZKA_EPM_SUPPORT
+#endif // NE_EPM_SUPPORT
return false;
}
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index 7168453d..d4a9e126 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -24,7 +24,7 @@
#include <CFKit/Property.h>
#include <KernelKit/Timer.h>
-#ifdef __ZKA_AUTO_FORMAT__
+#ifdef __NE_AUTO_FORMAT__
namespace Kernel::Detail
{
/// @brief Filesystem auto formatter, additional checks are also done by the class.
@@ -85,18 +85,18 @@ namespace Kernel::Detail
mNeFS = nullptr;
}
- ZKA_COPY_DEFAULT(NeFilesystemInstaller);
+ NE_COPY_DEFAULT(NeFilesystemInstaller);
};
} // namespace Kernel::Detail
-#endif // ifdef __ZKA_AUTO_FORMAT__
+#endif // ifdef __NE_AUTO_FORMAT__
/// @brief Kernel entrypoint.
/// @param Void
/// @return Void
EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len)
{
-#ifdef __ZKA_AUTO_FORMAT__
+#ifdef __NE_AUTO_FORMAT__
Kernel::NeFS::fs_init_nefs();
Kernel::Detail::NeFilesystemInstaller installer{};
-#endif // __ZKA_AUTO_FORMAT__
+#endif // __NE_AUTO_FORMAT__
}
diff --git a/dev/Kernel/src/Network/IPCMsg.cc b/dev/Kernel/src/Network/IPCMsg.cc
index ef888ed6..46c96900 100644
--- a/dev/Kernel/src/Network/IPCMsg.cc
+++ b/dev/Kernel/src/Network/IPCMsg.cc
@@ -14,7 +14,7 @@ namespace Kernel
/// @brief The internal sanitize function.
Bool ipc_int_sanitize_packet(IPC_MSG* pckt)
{
- auto endian = rtl_deduce_endianess(pckt, ((Char*)pckt)[0]);
+ auto endian = RTL_ENDIAN(pckt, ((Char*)pckt)[0]);
switch (endian)
{
@@ -83,7 +83,7 @@ namespace Kernel
if (*pckt_in)
{
- const auto endianess = rtl_deduce_endianess((*pckt_in), ((Char*)(*pckt_in))[0]);
+ const auto endianess = RTL_ENDIAN((*pckt_in), ((Char*)(*pckt_in))[0]);
(*pckt_in)->IpcHeaderMagic = kIPCHeaderMagic;
diff --git a/dev/Kernel/src/New+Delete.cc b/dev/Kernel/src/New+Delete.cc
index 87efeb57..f9b92b23 100644
--- a/dev/Kernel/src/New+Delete.cc
+++ b/dev/Kernel/src/New+Delete.cc
@@ -44,7 +44,7 @@ void operator delete(void* ptr, size_t sz)
if (ptr == nullptr)
return;
- ZKA_UNUSED(sz);
+ NE_UNUSED(sz);
Kernel::mm_delete_heap(ptr);
}
diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc
index b512f2ed..a1d527cf 100644
--- a/dev/Kernel/src/PEFCodeMgr.cc
+++ b/dev/Kernel/src/PEFCodeMgr.cc
@@ -27,15 +27,15 @@ namespace Kernel
/***********************************************************************************/
UInt32 ldr_get_platform(void) noexcept
{
-#if defined(__ZKA_32X0__)
+#if defined(__NE_32X0__)
return kPefArch32x0;
-#elif defined(__ZKA_64X0__)
+#elif defined(__NE_64X0__)
return kPefArch64x0;
-#elif defined(__ZKA_AMD64__)
+#elif defined(__NE_AMD64__)
return kPefArchAMD64;
-#elif defined(__ZKA_PPC64__)
+#elif defined(__NE_PPC64__)
return kPefArchPowerPC;
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
return kPefArchARM64;
#else
return kPefArchInvalid;
diff --git a/dev/Kernel/src/PageMgr.cc b/dev/Kernel/src/PageMgr.cc
index 9ba0ed4a..1a73fdcb 100644
--- a/dev/Kernel/src/PageMgr.cc
+++ b/dev/Kernel/src/PageMgr.cc
@@ -7,11 +7,11 @@
#include <KernelKit/DebugOutput.h>
#include <NewKit/PageMgr.h>
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
#include <HALKit/AMD64/Paging.h>
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
#include <HALKit/ARM64/Paging.h>
-#endif // ifdef __ZKA_AMD64__ || defined(__ZKA_ARM64__)
+#endif // ifdef __NE_AMD64__ || defined(__NE_ARM64__)
namespace Kernel
{
@@ -34,9 +34,9 @@ namespace Kernel
/// @param VirtAddr
Void PageMgr::FlushTLB()
{
-#ifndef __ZKA_MINIMAL_OS__
+#ifndef __NE_MINIMAL_OS__
hal_flush_tlb();
-#endif // !__ZKA_MINIMAL_OS__
+#endif // !__NE_MINIMAL_OS__
}
/// @brief Reclaim freed page.
diff --git a/dev/Kernel/src/Pmm.cc b/dev/Kernel/src/Pmm.cc
index ffe58a26..8a719e1f 100644
--- a/dev/Kernel/src/Pmm.cc
+++ b/dev/Kernel/src/Pmm.cc
@@ -7,13 +7,13 @@
#include <KernelKit/DebugOutput.h>
#include <NewKit/Pmm.h>
-#if defined(__ZKA_ARM64__)
+#if defined(__NE_ARM64__)
#include <HALKit/ARM64/Processor.h>
-#endif // defined(__ZKA_ARM64__)
+#endif // defined(__NE_ARM64__)
-#if defined(__ZKA_AMD64__)
+#if defined(__NE_AMD64__)
#include <HALKit/AMD64/Processor.h>
-#endif // defined(__ZKA_AMD64__)
+#endif // defined(__NE_AMD64__)
namespace Kernel
{
diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc
index 9626296f..7758dbb2 100644
--- a/dev/Kernel/src/UserProcessScheduler.cc
+++ b/dev/Kernel/src/UserProcessScheduler.cc
@@ -107,7 +107,7 @@ namespace Kernel
ErrorOr<VoidPtr> UserProcess::New(const SizeT& sz, const SizeT& pad_amount)
{
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
auto vm_register = hal_read_cr3();
hal_write_cr3(this->VMRegister);
@@ -207,7 +207,7 @@ namespace Kernel
auto memory_heap_list = this->ProcessMemoryHeap;
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
auto pd = hal_read_cr3();
hal_write_cr3(this->VMRegister);
#endif
@@ -220,7 +220,7 @@ namespace Kernel
MUST_PASS(mm_delete_heap(memory_heap_list->MemoryEntry));
}
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
hal_write_cr3(pd);
#endif
@@ -298,7 +298,7 @@ namespace Kernel
rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(name)), process.Name, rt_string_len(name));
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
process.VMRegister = new PDE();
if (!process.VMRegister)
@@ -312,7 +312,7 @@ namespace Kernel
flags |= HAL::kMMFlagsUser;
HAL::mm_map_page((VoidPtr)process.VMRegister, flags);
-#endif // __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#endif // __NE_VIRTUAL_MEMORY_SUPPORT__
process.StackFrame = new HAL::StackFrame();
@@ -322,13 +322,13 @@ namespace Kernel
return kErrorProcessFault;
}
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
flags = HAL::kMMFlagsPresent;
flags |= HAL::kMMFlagsWr;
flags |= HAL::kMMFlagsUser;
HAL::mm_map_page((VoidPtr)process.StackFrame, flags);
-#endif // __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#endif // __NE_VIRTUAL_MEMORY_SUPPORT__
// React according to process kind.
switch (process.Kind)
@@ -351,13 +351,13 @@ namespace Kernel
return kErrorProcessFault;
}
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
flags = HAL::kMMFlagsPresent;
flags |= HAL::kMMFlagsWr;
flags |= HAL::kMMFlagsUser;
HAL::mm_map_page((VoidPtr)process.StackReserve, flags);
-#endif // __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#endif // __NE_VIRTUAL_MEMORY_SUPPORT__
process.ProcessParentTeam = &mTeam;
diff --git a/dev/Kernel/src/Utils.cc b/dev/Kernel/src/Utils.cc
index c5a82305..07e57aef 100644
--- a/dev/Kernel/src/Utils.cc
+++ b/dev/Kernel/src/Utils.cc
@@ -161,7 +161,7 @@ namespace Kernel
Bool rt_to_string(Char* str, UInt64 base, Int32 limit)
{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
auto i = 0;
auto final_number = base;
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 05:24:23 +0000