summaryrefslogtreecommitdiffhomepage
path: root/src/kernel/KernelKit
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/KernelKit')
-rw-r--r--src/kernel/KernelKit/TraceSrv.h1
-rw-r--r--src/kernel/KernelKit/UserProcessScheduler.inl16
-rw-r--r--src/kernel/KernelKit/ZXD.h8
3 files changed, 12 insertions, 13 deletions
diff --git a/src/kernel/KernelKit/TraceSrv.h b/src/kernel/KernelKit/TraceSrv.h
index df188ea2..4af5e2ae 100644
--- a/src/kernel/KernelKit/TraceSrv.h
+++ b/src/kernel/KernelKit/TraceSrv.h
@@ -17,6 +17,7 @@ namespace Detail {
inline constexpr auto kDebugVersion = 0x0100;
inline constexpr auto kDebugDelim = ';';
inline constexpr auto kDebugEnd = '\r';
+
typedef UInt64 dk_socket_type;
} // namespace Detail
} // namespace Kernel \ No newline at end of file
diff --git a/src/kernel/KernelKit/UserProcessScheduler.inl b/src/kernel/KernelKit/UserProcessScheduler.inl
index 3d3659d6..e8a57212 100644
--- a/src/kernel/KernelKit/UserProcessScheduler.inl
+++ b/src/kernel/KernelKit/UserProcessScheduler.inl
@@ -7,7 +7,7 @@
======================================== */
-/// @brief USER_PROCESS inline definitions.
+/// @brief UPS inline definitions.
/// @author Amlal El Mahrouss (amlal@nekernel.org)
/// @date Tue Apr 22 22:01:07 CEST 2025
@@ -25,7 +25,7 @@ BOOL USER_PROCESS::Delete(ErrorOr<T*> ptr) {
if (!ptr) return No;
if (!this->HeapTree) {
- kout << "USER_PROCESS's heap is empty.\r";
+ kout << "USER_PROCESS: Heap is empty.\r";
return No;
}
@@ -36,20 +36,16 @@ BOOL USER_PROCESS::Delete(ErrorOr<T*> ptr) {
this->UsedMemory -= entry->EntrySize;
#ifdef __NE_AMD64__
- auto pd = hal_read_cr3();
+ auto page_dir = hal_read_cr3();
hal_write_cr3(this->VMRegister);
-
auto ret = mm_free_ptr(entry->Entry);
-
- hal_write_cr3(pd);
-
- return ret == kErrorSuccess;
+ hal_write_cr3(page_dir);
#else
- Bool ret = mm_free_ptr(ptr.Leak().Leak());
+ auto ret = mm_free_ptr(ptr.Leak().Leak());
+#endif
return ret == kErrorSuccess;
-#endif
}
entry = entry->Next;
diff --git a/src/kernel/KernelKit/ZXD.h b/src/kernel/KernelKit/ZXD.h
index a4b07bfa..81df0ade 100644
--- a/src/kernel/KernelKit/ZXD.h
+++ b/src/kernel/KernelKit/ZXD.h
@@ -16,9 +16,11 @@ struct ZXD_EXEC_HEADER;
struct ZXD_STUB_HEADER;
enum ZXD_FLAGS {
- kZXDFlagsInvalid,
- kZXDFlagsDriver,
- kZXDFlagsCount,
+ kZXDFlagsInvalid = 0,
+ kZXDFlagsDriver = 120,
+ kZXDFlagsBoot,
+ kZXDFlagsKernel,
+ kZXDFlagsCount = kZXDFlagsKernel - kZXDFlagsDriver + 1,
};
/// @brief ZXD executable header