diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 11:00:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-17 11:00:30 +0100 |
| commit | 2e9741a0af3ffcc613101b47ba39b883e26e39ea (patch) | |
| tree | 73c05e9d2e51488d895e9d899eaf29640265e552 /dev/DebuggerKit | |
| parent | 215f6fc35253a2326888b49a618f5cb758813977 (diff) | |
| parent | 0cca08fb5a26a9c50632d2a2a7cd49e8db55badc (diff) | |
Merge pull request #18 from nekernel-org/dev
version: v0.0.7
Diffstat (limited to 'dev/DebuggerKit')
| -rw-r--r-- | dev/DebuggerKit/CommonCLI.inl | 2 | ||||
| -rw-r--r-- | dev/DebuggerKit/NeKernelContract.h | 1 | ||||
| -rw-r--r-- | dev/DebuggerKit/POSIXMachContract.h | 10 | ||||
| -rw-r--r-- | dev/DebuggerKit/Version.h | 4 | ||||
| -rw-r--r-- | dev/DebuggerKit/src/NeKernelContract.cc | 10 | ||||
| -rw-r--r-- | dev/DebuggerKit/src/POSIXMachContractCLI.cc | 2 |
6 files changed, 15 insertions, 14 deletions
diff --git a/dev/DebuggerKit/CommonCLI.inl b/dev/DebuggerKit/CommonCLI.inl index cf006f5..eb56257 100644 --- a/dev/DebuggerKit/CommonCLI.inl +++ b/dev/DebuggerKit/CommonCLI.inl @@ -15,7 +15,7 @@ #define kStdOut (std::cout << kRed << "dbg: " << kWhite) -static BOOL kKeepRunning = false; +static Bool kKeepRunning = false; #ifdef DK_NEKERNEL_DEBUGGER static DebuggerKit::NeKernel::NeKernelContract kKernelDebugger; diff --git a/dev/DebuggerKit/NeKernelContract.h b/dev/DebuggerKit/NeKernelContract.h index 7488cad..9acde7f 100644 --- a/dev/DebuggerKit/NeKernelContract.h +++ b/dev/DebuggerKit/NeKernelContract.h @@ -11,6 +11,7 @@ #ifdef DK_NEKERNEL_DEBUGGER +#include <CompilerKit/Defines.h> #include <DebuggerKit/DebuggerContract.h> namespace DebuggerKit::NeKernel { diff --git a/dev/DebuggerKit/POSIXMachContract.h b/dev/DebuggerKit/POSIXMachContract.h index 931852a..a2b507c 100644 --- a/dev/DebuggerKit/POSIXMachContract.h +++ b/dev/DebuggerKit/POSIXMachContract.h @@ -54,7 +54,7 @@ class POSIXMachContract : public DebuggerContract { POSIXMachContract(const POSIXMachContract&) = default; public: - BOOL Attach(std::string path, std::string argv, ProcessID& pid) noexcept override { + Bool Attach(std::string path, std::string argv, ProcessID& pid) noexcept override { pid = fork(); if (pid == 0) { @@ -90,7 +90,7 @@ class POSIXMachContract : public DebuggerContract { m_path = path; } - BOOL BreakAt(std::string symbol) noexcept override { + Bool BreakAt(std::string symbol) noexcept override { if (!m_path.empty() && std::filesystem::exists(m_path) && std::filesystem::is_regular_file(m_path)) { auto handle = dlopen(m_path.c_str(), RTLD_LAZY); @@ -120,7 +120,7 @@ class POSIXMachContract : public DebuggerContract { return false; } - BOOL Break() noexcept override { + Bool Break() noexcept override { task_read_t task; task_for_pid(mach_task_self(), m_pid, &task); @@ -129,7 +129,7 @@ class POSIXMachContract : public DebuggerContract { return ret == KERN_SUCCESS; } - BOOL Continue() noexcept override { + Bool Continue() noexcept override { task_read_t task; task_for_pid(mach_task_self(), m_pid, &task); @@ -138,7 +138,7 @@ class POSIXMachContract : public DebuggerContract { return ret == KERN_SUCCESS; } - BOOL Detach() noexcept override { + Bool Detach() noexcept override { this->Continue(); task_read_t task; diff --git a/dev/DebuggerKit/Version.h b/dev/DebuggerKit/Version.h index 4159191..da911f3 100644 --- a/dev/DebuggerKit/Version.h +++ b/dev/DebuggerKit/Version.h @@ -1,12 +1,12 @@ /* ------------------------------------------- - Copyright (C) 2025 Amlal EL Mahrouss, all rights reserved + Copyright (C) 2025 Amlal EL Mahrouss, Licensed under Apache 2.0 ------------------------------------------- */ #pragma once -#define kDistVersion "v0.0.1-libdebugger" +#define kDistVersion "v0.0.6-debuggerkit" #define kDistVersionBCD 0x0001 #define ToString(X) Stringify(X) diff --git a/dev/DebuggerKit/src/NeKernelContract.cc b/dev/DebuggerKit/src/NeKernelContract.cc index 53017d6..ae041fc 100644 --- a/dev/DebuggerKit/src/NeKernelContract.cc +++ b/dev/DebuggerKit/src/NeKernelContract.cc @@ -22,7 +22,7 @@ NeKernelContract::NeKernelContract() = default; NeKernelContract::~NeKernelContract() = default; -BOOL NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLString argv, +Bool NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLString argv, ProcessID& pid) noexcept { if (path.empty() || argv.empty()) return NO; @@ -48,7 +48,7 @@ BOOL NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLStrin return ret; } -BOOL NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept { +Bool NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept { CompilerKit::STLString pkt = Detail::kDebugMagic; pkt += ";SYM="; pkt += symbol; @@ -60,7 +60,7 @@ BOOL NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept { return ret; } -BOOL NeKernelContract::Break() noexcept { +Bool NeKernelContract::Break() noexcept { CompilerKit::STLString pkt = Detail::kDebugMagic; pkt += ";BRK=1;\r"; @@ -68,7 +68,7 @@ BOOL NeKernelContract::Break() noexcept { return ret; } -BOOL NeKernelContract::Continue() noexcept { +Bool NeKernelContract::Continue() noexcept { CompilerKit::STLString pkt = Detail::kDebugMagic; pkt += ";CONT=1;\r"; @@ -77,7 +77,7 @@ BOOL NeKernelContract::Continue() noexcept { return NO; } -BOOL NeKernelContract::Detach() noexcept { +Bool NeKernelContract::Detach() noexcept { CompilerKit::STLString pkt = Detail::kDebugMagic; pkt += ";DTCH=1;\r"; diff --git a/dev/DebuggerKit/src/POSIXMachContractCLI.cc b/dev/DebuggerKit/src/POSIXMachContractCLI.cc index 2b2ebc5..5edd65e 100644 --- a/dev/DebuggerKit/src/POSIXMachContractCLI.cc +++ b/dev/DebuggerKit/src/POSIXMachContractCLI.cc @@ -28,7 +28,7 @@ static void dbgi_ctrlc_handler(std::int32_t _) { NECTI_MODULE(DebuggerMachPOSIX) { pfd::notify("Debugger Event", - "Userland Debugger\n(C) 2025 Amlal El Mahrouss, all rights reserved."); + "Userland Debugger\n(C) 2025 Amlal El Mahrouss, Licensed under Apache 2.0."); if (argc >= 3 && std::string(argv[1]) == "-p" && argv[2] != nullptr) { kPath = argv[2]; |
