summaryrefslogtreecommitdiffhomepage
path: root/src/kernel/HALKit
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/HALKit')
-rw-r--r--src/kernel/HALKit/AMD64/CxxAbi.cpp2
-rw-r--r--src/kernel/HALKit/AMD64/HalKernelMain.cpp8
-rw-r--r--src/kernel/HALKit/AMD64/HalKernelPanic.cpp11
-rw-r--r--src/kernel/HALKit/AMD64/Paging.h4
-rw-r--r--src/kernel/HALKit/ARM64/CxxAbi.cpp1
-rw-r--r--src/kernel/HALKit/ARM64/Paging.h16
6 files changed, 21 insertions, 21 deletions
diff --git a/src/kernel/HALKit/AMD64/CxxAbi.cpp b/src/kernel/HALKit/AMD64/CxxAbi.cpp
index 50b6ccf2..c2487f85 100644
--- a/src/kernel/HALKit/AMD64/CxxAbi.cpp
+++ b/src/kernel/HALKit/AMD64/CxxAbi.cpp
@@ -11,7 +11,7 @@
#define kAtExitMaxDestructors (128U)
atexit_func_entry_t __atexit_funcs[kAtExitMaxDestructors];
-uarch_t __atexit_func_count;
+uarch_t __atexit_func_count;
/// @brief dynamic shared object Handle.
Kernel::UIntPtr __dso_handle;
diff --git a/src/kernel/HALKit/AMD64/HalKernelMain.cpp b/src/kernel/HALKit/AMD64/HalKernelMain.cpp
index 57f980c6..fabeb077 100644
--- a/src/kernel/HALKit/AMD64/HalKernelMain.cpp
+++ b/src/kernel/HALKit/AMD64/HalKernelMain.cpp
@@ -158,9 +158,11 @@ EXTERN_C Kernel::Void hal_real_init(Kernel::Void) {
PEFLoader ldr("/system/init.out");
- if (ldr.IsLoaded()) rtl_create_user_process(ldr, UserProcess::ExecutableKind::kExecutableKind);
- else ke_panic(RUNTIME_CHECK_PROCESS, "RuntimeCheck: Invalid Process Data!");
-
+ if (ldr.IsLoaded())
+ rtl_create_user_process(ldr, UserProcess::ExecutableKind::kExecutableKind);
+ else
+ ke_panic(RUNTIME_CHECK_PROCESS, "RuntimeCheck: Invalid Process Data!");
+
UserProcessScheduler::The().SwitchTeam(kMidUserTeam);
#ifdef __HALKIT_INCLUDES_BNID__
diff --git a/src/kernel/HALKit/AMD64/HalKernelPanic.cpp b/src/kernel/HALKit/AMD64/HalKernelPanic.cpp
index d9afa204..a5f0b8bc 100644
--- a/src/kernel/HALKit/AMD64/HalKernelPanic.cpp
+++ b/src/kernel/HALKit/AMD64/HalKernelPanic.cpp
@@ -45,19 +45,18 @@ Void RecoveryFactory::Recover() {
HAL::rt_cli();
HAL::rt_halt();
}
-
+
alreadyDumped = YES;
-
- HeFileSystemMgr mgr;
- auto node = mgr.Open("/system/dump.dmp", "wb");
+ HeFileSystemMgr mgr;
+ auto node = mgr.Open("/system/dump.dmp", "wb");
if (node && hal_read_cr2()) mgr.Write(node, hal_read_cr2(), 0, 0x100);
if (node) mm_free_ptr(node);
-
+
node = nullptr;
#endif
-
+
while (YES) {
HAL::rt_cli();
HAL::rt_halt();
diff --git a/src/kernel/HALKit/AMD64/Paging.h b/src/kernel/HALKit/AMD64/Paging.h
index f6ec0bf4..7b64835a 100644
--- a/src/kernel/HALKit/AMD64/Paging.h
+++ b/src/kernel/HALKit/AMD64/Paging.h
@@ -57,7 +57,9 @@ namespace Detail {
kPageEnable = 31,
};
- inline UInt8 control_register_cast(ControlRegisterBits reg) { return static_cast<UInt8>(reg); }
+ inline UInt8 control_register_cast(ControlRegisterBits reg) {
+ return static_cast<UInt8>(reg);
+ }
} // namespace Detail
auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page, SizeT pad = 0) -> VoidPtr;
diff --git a/src/kernel/HALKit/ARM64/CxxAbi.cpp b/src/kernel/HALKit/ARM64/CxxAbi.cpp
index 3c7c7952..7f8c8245 100644
--- a/src/kernel/HALKit/ARM64/CxxAbi.cpp
+++ b/src/kernel/HALKit/ARM64/CxxAbi.cpp
@@ -3,7 +3,6 @@
// Licensed under the Apache License, Version 2.0 (see LICENSE file)
// Official repository: https://github.com/ne-foss-org/nekernel
-
#include <KernelKit/DebugOutput.h>
#include <KernelKit/KPC.h>
#include <NeKit/CxxAbi.h>
diff --git a/src/kernel/HALKit/ARM64/Paging.h b/src/kernel/HALKit/ARM64/Paging.h
index 71e663ae..fd04c2da 100644
--- a/src/kernel/HALKit/ARM64/Paging.h
+++ b/src/kernel/HALKit/ARM64/Paging.h
@@ -41,14 +41,10 @@
/// Long format address range
-#define cPageMAll \
- { 0b000, 0b000 }
-#define cPageMToMax(M) \
- { M, 0b000 }
-#define cPageMaxToM(M) \
- { 0b000, M }
-#define cPageMToN(M, N) \
- { M, N }
+#define cPageMAll {0b000, 0b000}
+#define cPageMToMax(M) {M, 0b000}
+#define cPageMaxToM(M) {0b000, M}
+#define cPageMToN(M, N) {M, N}
namespace Kernel::HAL {
struct PACKED PTE_4KB final {
@@ -86,7 +82,9 @@ namespace Detail {
PageEnable = 31,
};
- inline UInt8 control_register_cast(ControlRegisterBits reg) { return static_cast<UInt8>(reg); }
+ inline UInt8 control_register_cast(ControlRegisterBits reg) {
+ return static_cast<UInt8>(reg);
+ }
} // namespace Detail
struct PDE_4KB final {