From d82c082256f5ad3cc0f7b2b3842072b6d036ee05 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 3 May 2024 22:58:36 -0500 Subject: [PATCH 1/2] [buildcore] Add error message to pybb debug for missing debugger --- deps/buildcore/scripts/pybb.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deps/buildcore/scripts/pybb.py b/deps/buildcore/scripts/pybb.py index 1036d7e4..42860895 100755 --- a/deps/buildcore/scripts/pybb.py +++ b/deps/buildcore/scripts/pybb.py @@ -98,6 +98,9 @@ def debug(paths: List[str]) -> int: args = ['gdb', '--args'] elif shutil.which('lldb') is not None: args = ['lldb', '--'] + else: + sys.stderr.write('debug: could not find a supported debugger\n') + return 1 args.extend(paths) return subprocess.run(args).returncode From 47a6a410c4baabf8700bd271a303232dd2e0d3e9 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 3 May 2024 23:41:16 -0500 Subject: [PATCH 2/2] [ox/std] Update Vector memory map for preloader --- deps/ox/src/ox/std/serialize.hpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/deps/ox/src/ox/std/serialize.hpp b/deps/ox/src/ox/std/serialize.hpp index 39b5de50..4fc8778f 100644 --- a/deps/ox/src/ox/std/serialize.hpp +++ b/deps/ox/src/ox/std/serialize.hpp @@ -19,7 +19,6 @@ namespace ox { template struct VectorMemMap { const std::size_t smallVecSize = 0; // not a map value - uint8_t allocator = 0; typename PlatSpec::size_t size = 0; typename PlatSpec::size_t cap = 0; typename PlatSpec::PtrType items = 0; @@ -34,10 +33,8 @@ constexpr auto sizeOf(const VectorMemMap *t) noexcept { std::size_t size = 0; if (t->smallVecSize) { size += t->smallVecSize; - size += padding(size, PlatSpec::alignOf(t->allocator)); + size += padding(size, PlatSpec::alignOf(t->size)); } - size += sizeof(t->allocator); - size += padding(size, PlatSpec::alignOf(t->size)); size += sizeof(t->size); size += padding(size, PlatSpec::alignOf(t->cap)); size += sizeof(t->cap); @@ -67,8 +64,6 @@ constexpr ox::Error pad(Writer_c auto &w, const T *v) noexcept { template constexpr ox::Error serialize(Writer_c auto &w, const VectorMemMap &vm) noexcept { oxReturnError(w.write(nullptr, vm.smallVecSize)); - oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.allocator))); - oxReturnError(pad(w, &vm.size)); oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.size))); oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.cap))); oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.items)));