From 09d50a07349df2a5fc1c62452d0f924549db83e6 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 26 Oct 2025 17:51:30 +0100 Subject: feat: new ErrorOr API for NeCTI. Signed-off-by: Amlal El Mahrouss --- dev/DebuggerKit/CommonCLI.inl | 2 +- dev/DebuggerKit/POSIXMachContract.h | 10 +++++----- dev/DebuggerKit/src/NeKernelContract.cc | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'dev/DebuggerKit') 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/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/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"; -- cgit v1.2.3