From bd416f82e25f1b710ab2b7890274571dd3fcd53d Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 3 May 2024 23:42:00 -0500
Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 227f3cd9..47a6a410

47a6a410 [ox/std] Update Vector memory map for preloader
d82c0822 [buildcore] Add error message to pybb debug for missing debugger

git-subtree-dir: deps/nostalgia
git-subtree-split: 47a6a410c4baabf8700bd271a303232dd2e0d3e9
---
 deps/buildcore/scripts/pybb.py   | 3 +++
 deps/ox/src/ox/std/serialize.hpp | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/deps/buildcore/scripts/pybb.py b/deps/buildcore/scripts/pybb.py
index 1036d7e..4286089 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
 
diff --git a/deps/ox/src/ox/std/serialize.hpp b/deps/ox/src/ox/std/serialize.hpp
index 39b5de5..4fc8778 100644
--- a/deps/ox/src/ox/std/serialize.hpp
+++ b/deps/ox/src/ox/std/serialize.hpp
@@ -19,7 +19,6 @@ namespace ox {
 template<typename PlatSpec>
 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<PlatSpec> *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<typename PlatSpec>
 constexpr ox::Error serialize(Writer_c auto &w, const VectorMemMap<PlatSpec> &vm) noexcept {
 	oxReturnError(w.write(nullptr, vm.smallVecSize));
-	oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.allocator)));
-	oxReturnError(pad<PlatSpec>(w, &vm.size));
 	oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.size)));
 	oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.cap)));
 	oxReturnError(serialize(w, PlatSpec::correctEndianness(vm.items)));