From 3a6711a942f7c6d945a8dc6bcbf77f4f7025caef Mon Sep 17 00:00:00 2001
From: Kearwood Gilbert <kearwood@kearwood.com>
Date: Sat, 15 Aug 2026 15:25:50 -0700
Subject: [PATCH] Added more Heap allocator stub functions. Moved platform api
 includes into mimir_impl.h

---
 include/heap.h   | 11 +++++++++++
 src/arena.cpp    | 13 -------------
 src/block.cpp    |  8 --------
 src/heap.cpp     | 36 +++++++++++++++++++++++-------------
 src/mimir.cpp    |  1 -
 src/mimir_impl.h |  8 ++++++++
 6 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/include/heap.h b/include/heap.h
index e3134f0..bd5e0ca 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -39,6 +39,17 @@ class Heap
 public:
   Heap();
   ~Heap();
+
+  bool init(size_t minSize = 1ULL << 24, size_t maxSize = 1ULL << 32);
+
+  // Allocate `size` bytes
+  std::byte* alloc(size_t size);
+
+  // Allocate `size` bytes, aligned to 16 bytes and padded to next 16-byte offset.
+  std::byte* allocA16(size_t size);
+
+  // Allocate `size` bytes, aligned to 64 bytes and padded to next 64-byte offset.
+  std::byte* allocA64(size_t size);
 };
 
 } // namespace mimir
diff --git a/src/arena.cpp b/src/arena.cpp
index b28491f..e3bfa5c 100644
--- a/src/arena.cpp
+++ b/src/arena.cpp
@@ -32,19 +32,6 @@
 #include "../include/mimir.h"
 #include "mimir_impl.h"
 
-#if defined(__unix__) || defined(__APPLE__) || defined(ANDROID)
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
-#include <Windows.h>
-#include <memoryapi.h>
-#endif
-
-#include <errno.h>
 #include <cassert>
 #include <cstring>
 #include <bit>
diff --git a/src/block.cpp b/src/block.cpp
index b64128d..966056e 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -32,14 +32,6 @@
 #include "../include/mimir.h"
 #include "mimir_impl.h"
 
-#if defined(__unix__) || defined(__APPLE__) || defined(ANDROID)
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
-#include <errno.h>
 #include <cassert>
 #include <cstring>
 
diff --git a/src/heap.cpp b/src/heap.cpp
index b15e41c..d8b2550 100644
--- a/src/heap.cpp
+++ b/src/heap.cpp
@@ -32,19 +32,6 @@
 #include "../include/mimir.h"
 #include "mimir_impl.h"
 
-#if defined(__unix__) || defined(__APPLE__) || defined(ANDROID)
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
-#include <Windows.h>
-#include <memoryapi.h>
-#endif
-
-#include <errno.h>
 #include <cassert>
 #include <cstring>
 #include <bit>
@@ -59,4 +46,27 @@ Heap::~Heap()
 {
 }
 
+bool Heap::init(size_t minSize, size_t maxSize)
+{
+  return false; // not implemented
+}
+
+// Allocate `size` bytes
+std::byte* Heap::alloc(size_t size)
+{
+  return nullptr; // not implemented
+}
+
+// Allocate `size` bytes, aligned to 16 bytes and padded to next 16-byte offset.
+std::byte* Heap::allocA16(size_t size)
+{
+  return nullptr; // not implemented
+}
+
+// Allocate `size` bytes, aligned to 64 bytes and padded to next 64-byte offset.
+std::byte* Heap::allocA64(size_t size)
+{
+  return nullptr; // not implemented
+}
+
 } // namespace mimir
diff --git a/src/mimir.cpp b/src/mimir.cpp
index a955741..fdba90a 100644
--- a/src/mimir.cpp
+++ b/src/mimir.cpp
@@ -39,7 +39,6 @@
 #include <fcntl.h>
 #endif
 
-#include <errno.h>
 #include <cassert>
 #include <cstring>
 
diff --git a/src/mimir_impl.h b/src/mimir_impl.h
index 66e4dd9..1882f81 100644
--- a/src/mimir_impl.h
+++ b/src/mimir_impl.h
@@ -31,8 +31,16 @@
 
 #pragma once
 
+#if defined(__unix__) || defined(__APPLE__) || defined(ANDROID)
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
+
 #if defined(_WIN32) || defined(_WIN64)
 #include <Windows.h>
+#include <memoryapi.h>
 #endif
 
 namespace mimir {