From a3093cbf5746993148f1621f7f80c6d093d65dbb Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 8 Mar 2026 15:11:13 +0100 Subject: [CHORE] GenericsLibrary: pstd, swap: Free function implementation update. Signed-off-by: Amlal El Mahrouss --- conanfile.txt | 2 +- include/GenericsLibrary/pstd.nhh | 5 +++++ include/GenericsLibrary/swap.nhh | 3 +-- src/CommandLine/dbg.cpp | 4 ++-- src/DebuggerKit/src/MachContractCLI.cpp | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index e0de5ca..cb1eb04 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -boost/1.90.0 +boost/1.89.0 [generators] CMakeDeps CMakeToolchain diff --git a/include/GenericsLibrary/pstd.nhh b/include/GenericsLibrary/pstd.nhh index e089746..e595437 100644 --- a/include/GenericsLibrary/pstd.nhh +++ b/include/GenericsLibrary/pstd.nhh @@ -16,12 +16,17 @@ extern __nrt_pthread_kill; //@ Parallel free let pfree(let ptr) { + if (ptr := 0) return 0; return __nrt_pfree(ptr); } //@ Parallel alloc (bytes) let palloc(let type, let sz, let align := 0) { + if (0 := align) return 0; + if (0 := type) return 0; + if (0 := sz) return 0; + return __nrt_palloc(type, sz, align); } diff --git a/include/GenericsLibrary/swap.nhh b/include/GenericsLibrary/swap.nhh index 01d24da..5575bed 100644 --- a/include/GenericsLibrary/swap.nhh +++ b/include/GenericsLibrary/swap.nhh @@ -13,8 +13,7 @@ let swap(let a, let b) let temp := a; a := b; b := temp; - - return; + return temp; } #endif //@ NECTAR_GL_SWAP_NHH \ No newline at end of file diff --git a/src/CommandLine/dbg.cpp b/src/CommandLine/dbg.cpp index 3d6ea05..a4f5a94 100644 --- a/src/CommandLine/dbg.cpp +++ b/src/CommandLine/dbg.cpp @@ -8,10 +8,10 @@ /// @file dbg.cc /// @brief Nectar debugger. -CK_IMPORT_C Int32 DebuggerMachPOSIX(Int32 argc, char const* argv[]); +CK_IMPORT_C Int32 DebuggerMach(Int32 argc, char const* argv[]); /// @brief Debugger entrypoint. /// @return Status code of debugger. Int32 main(Int32 argc, char const* argv[]) { - return DebuggerMachPOSIX(argc, argv); + return DebuggerMach(argc, argv); } diff --git a/src/DebuggerKit/src/MachContractCLI.cpp b/src/DebuggerKit/src/MachContractCLI.cpp index a13a980..dcd8767 100644 --- a/src/DebuggerKit/src/MachContractCLI.cpp +++ b/src/DebuggerKit/src/MachContractCLI.cpp @@ -25,7 +25,7 @@ static Void dbgi_ctrlc_handler(std::int32_t _) { kKeepRunning = false; } -NECTAR_MODULE(DebuggerMachPOSIX) { +NECTAR_MODULE(DebuggerMach) { pfd::notify( "Debugger Event", "Userland Debugger\n(C) 2025 Amlal El Mahrouss, licensed under the Apache 2.0 license."); -- cgit v1.2.3