summaryrefslogtreecommitdiffhomepage
path: root/dev/DebuggerKit
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@nekernel.org>2025-11-22 09:59:41 +0100
committerAmlal El Mahrouss <amlal@nekernel.org>2025-11-22 09:59:41 +0100
commitb5adf16a96b9cbb80c74cf30404ed5bcff03ac34 (patch)
treee1be4c79f2c7e878d162c23d5c0518c350b00724 /dev/DebuggerKit
parentb8e6e1492ed14e270b1061809b0569b8d2f4c0ec (diff)
chore: DebuggerKit cleanup.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/DebuggerKit')
-rw-r--r--dev/DebuggerKit/CommonCLI.inl13
-rw-r--r--dev/DebuggerKit/DebuggerContract.h14
-rw-r--r--dev/DebuggerKit/NeKernelContract.h7
-rw-r--r--dev/DebuggerKit/POSIXMachContract.h25
-rw-r--r--dev/DebuggerKit/Platform.h31
-rw-r--r--dev/DebuggerKit/src/NeKernelContract.cc11
-rw-r--r--dev/DebuggerKit/src/NeKernelContractCLI.cc11
-rw-r--r--dev/DebuggerKit/src/POSIXMachContractCLI.cc25
8 files changed, 69 insertions, 68 deletions
diff --git a/dev/DebuggerKit/CommonCLI.inl b/dev/DebuggerKit/CommonCLI.inl
index a118634..e06a9b9 100644
--- a/dev/DebuggerKit/CommonCLI.inl
+++ b/dev/DebuggerKit/CommonCLI.inl
@@ -1,9 +1,8 @@
-/***
- DebuggerKit
- (C) 2025 Amlal El Mahrouss
- File: CommonCLI.inl
- Purpose: Common Debugger symbols.
-*/
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#define kBlank "\e[0;30m"
#define kRed "\e[0;31m"
@@ -16,7 +15,7 @@ static Bool kKeepRunning = false;
#ifdef DK_NEKERNEL_DEBUGGER
static DebuggerKit::NeKernel::NeKernelContract kKernelDebugger;
#else
-static DebuggerKit::POSIX::POSIXMachContract kDebugger;
+static DebuggerKit::POSIX::POSIXMachContract kUserDebugger;
#endif
static DebuggerKit::ProcessID kPID = 0L;
diff --git a/dev/DebuggerKit/DebuggerContract.h b/dev/DebuggerKit/DebuggerContract.h
index d1c8ed1..2114041 100644
--- a/dev/DebuggerKit/DebuggerContract.h
+++ b/dev/DebuggerKit/DebuggerContract.h
@@ -1,12 +1,12 @@
-/***
- (C) 2025 Amlal El Mahrouss
- */
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#pragma once
-#include <cstdint>
-#include <string>
-#include <unordered_map>
+#include <DebuggerKit/Platform.h>
#define DK_DEBUGGER_CONTRACT : public ::DebuggerKit::DebuggerContract
@@ -46,7 +46,7 @@ class DebuggerContract {
virtual std::unordered_map<uintptr_t, uintptr_t>& Get() { return m_breakpoints; }
protected:
- ProcessID m_pid;
+ ProcessID m_pid{(ProcessID)~0};
std::unordered_map<uintptr_t, uintptr_t> m_breakpoints;
};
} // namespace DebuggerKit
diff --git a/dev/DebuggerKit/NeKernelContract.h b/dev/DebuggerKit/NeKernelContract.h
index 582741a..d048303 100644
--- a/dev/DebuggerKit/NeKernelContract.h
+++ b/dev/DebuggerKit/NeKernelContract.h
@@ -1,7 +1,8 @@
+/* ========================================
-/***
- (C) 2025 Amlal El Mahrouss, licensed under Apache-2.0.
- */
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#ifndef DK_NEKERNEL_CONTRACT_H
#define DK_NEKERNEL_CONTRACT_H
diff --git a/dev/DebuggerKit/POSIXMachContract.h b/dev/DebuggerKit/POSIXMachContract.h
index b1c0e0a..5bd4ba8 100644
--- a/dev/DebuggerKit/POSIXMachContract.h
+++ b/dev/DebuggerKit/POSIXMachContract.h
@@ -1,6 +1,8 @@
-/***
- (C) 2025 Amlal El Mahrouss, licensed under Apache-2.0.
- */
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#pragma once
@@ -9,25 +11,8 @@
/// @file POSIXMachContract.h
/// @brief POSIX Mach debugger.
-#include <CompilerKit/Defines.h>
#include <DebuggerKit/DebuggerContract.h>
-#include <stdint.h>
-#include <sys/ptrace.h>
-#include <sys/types.h>
-#include <sys/user.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <filesystem>
-#include <iostream>
-
-#include <dlfcn.h>
-#include <mach-o/dyld.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <signal.h>
-
CK_IMPORT_C kern_return_t mach_vm_write(vm_map_t target_task, mach_vm_address_t address,
vm_offset_t data, mach_msg_type_number_t dataCnt);
diff --git a/dev/DebuggerKit/Platform.h b/dev/DebuggerKit/Platform.h
index 26f47ff..f878845 100644
--- a/dev/DebuggerKit/Platform.h
+++ b/dev/DebuggerKit/Platform.h
@@ -1,9 +1,8 @@
-/***
- DebuggerKit
- (C) 2025 Amlal El Mahrouss, licensed under Apache-2.0.
- File: Platform.h
- Purpose: NeCTI Debugger Platform headers.
-*/
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#pragma once
@@ -11,8 +10,28 @@
/// @author Amlal El Mahrouss
/// =========================================================== ///
+#include <CompilerKit/Defines.h>
+
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
+
+#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <sys/wait.h>
#include <unistd.h>
+
+#include <filesystem>
+#include <iostream>
+
+#include <dlfcn.h>
+#include <mach-o/dyld.h>
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <signal.h>
+
+#include <cstdint>
+#include <string>
+#include <unordered_map> \ No newline at end of file
diff --git a/dev/DebuggerKit/src/NeKernelContract.cc b/dev/DebuggerKit/src/NeKernelContract.cc
index a062493..38f327d 100644
--- a/dev/DebuggerKit/src/NeKernelContract.cc
+++ b/dev/DebuggerKit/src/NeKernelContract.cc
@@ -1,9 +1,8 @@
-/***
- DebuggerKit
- (C) 2025 Amlal El Mahrouss
- File: NeKernelContract.cc
- Purpose: NeCTI Debugger
-*/
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#ifdef DK_NEKERNEL_DEBUGGER
diff --git a/dev/DebuggerKit/src/NeKernelContractCLI.cc b/dev/DebuggerKit/src/NeKernelContractCLI.cc
index fe8181f..fc13a53 100644
--- a/dev/DebuggerKit/src/NeKernelContractCLI.cc
+++ b/dev/DebuggerKit/src/NeKernelContractCLI.cc
@@ -1,9 +1,8 @@
-/***
- DebuggerKit
- (C) 2025 Amlal El Mahrouss
- File: NeKernelContract.cc
- Purpose: NeCTI Debugger CLI.
-*/
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#ifdef DK_NEKERNEL_DEBUGGER
diff --git a/dev/DebuggerKit/src/POSIXMachContractCLI.cc b/dev/DebuggerKit/src/POSIXMachContractCLI.cc
index 22a626d..77fe844 100644
--- a/dev/DebuggerKit/src/POSIXMachContractCLI.cc
+++ b/dev/DebuggerKit/src/POSIXMachContractCLI.cc
@@ -1,9 +1,8 @@
-/***
- DebuggerKit
- (C) 2025 Amlal El Mahrouss
- File: POSIXMachContract.cc
- Purpose: OS X/Darwin Debugger
-*/
+/* ========================================
+
+ Copyright (C) 2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+
+======================================== */
#ifdef DK_MACH_DEBUGGER
@@ -19,7 +18,7 @@ static void dbgi_ctrlc_handler(std::int32_t _) {
return;
}
- kDebugger.Break();
+ kUserDebugger.Break();
pfd::notify("Debugger Event", "Breakpoint hit!");
@@ -33,7 +32,7 @@ NECTI_MODULE(DebuggerMachPOSIX) {
if (argc >= 3 && std::string(argv[1]) == "-p" && argv[2] != nullptr) {
kPath = argv[2];
- kDebugger.SetPath(kPath);
+ kUserDebugger.SetPath(kPath);
kStdOut << "[+] Image set to: " << kPath << "\n";
} else {
@@ -54,7 +53,7 @@ NECTI_MODULE(DebuggerMachPOSIX) {
if (!std::getline(std::cin, cmd)) break;
if (cmd == "c" || cmd == "cont" || cmd == "continue") {
- if (kDebugger.Continue()) {
+ if (kUserDebugger.Continue()) {
kKeepRunning = true;
kStdOut << "[+] Continuing...\n";
@@ -63,17 +62,17 @@ NECTI_MODULE(DebuggerMachPOSIX) {
}
}
- if (cmd == "d" || cmd == "detach") kDebugger.Detach();
+ if (cmd == "d" || cmd == "detach") kUserDebugger.Detach();
if (cmd == "start") {
kStdOut << "[?] Enter a argument to use: ";
std::getline(std::cin, cmd);
- kDebugger.Attach(kPath, cmd, kPID);
+ kUserDebugger.Attach(kPath, cmd, kPID);
}
if (cmd == "exit") {
- if (kPID > 0) kDebugger.Detach();
+ if (kPID > 0) kUserDebugger.Detach();
break;
}
@@ -83,7 +82,7 @@ NECTI_MODULE(DebuggerMachPOSIX) {
std::getline(std::cin, cmd);
- if (kDebugger.BreakAt(cmd)) {
+ if (kUserDebugger.BreakAt(cmd)) {
pfd::notify("Debugger Event", "Add BreakAt at: " + cmd);
}
}