crates/sel4-static-heap: Remove

Signed-off-by: Nick Spinale <nick@nickspinale.com>

Cargo.toml

@@ -137,7 +137,6 @@ members = [
     "crates/sel4-shared-ring-buffer/bookkeeping",
     "crates/sel4-shared-ring-buffer/smoltcp",
     "crates/sel4-stack",
-    "crates/sel4-static-heap",
     "crates/sel4-sync",
     "crates/sel4-sync/trivial",
     "crates/sel4-synthetic-elf",

crates/sel4-dlmalloc/Cargo.nix

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
-{ mk, versions, localCrates }:
+{ mk, versions }:
 
 mk {
   package.name = "sel4-dlmalloc";
@@ -13,8 +13,5 @@ mk {
     inherit (versions)
       lock_api
     ;
-    inherit (localCrates)
-      sel4-static-heap
-    ;
   };
 }

crates/sel4-dlmalloc/Cargo.toml

@@ -19,4 +19,3 @@ license = "BSD-2-Clause"
 [dependencies]
 dlmalloc = "0.2.3"
 lock_api = "0.4.12"
-sel4-static-heap = { path = "../sel4-static-heap" }

crates/sel4-dlmalloc/src/lib.rs

@@ -7,15 +7,13 @@
 #![no_std]
 
 use core::alloc::{GlobalAlloc, Layout};
-use core::cell::RefCell;
+use core::cell::{RefCell, UnsafeCell};
 use core::mem;
 use core::ptr;
 
 use dlmalloc::{Allocator as DlmallocAllocator, Dlmalloc};
 use lock_api::{Mutex, RawMutex};
 
-pub use sel4_static_heap::StaticHeap;
-
 pub type StaticDlmallocGlobalAlloc<R, T> = DlmallocGlobalAlloc<R, StaticDlmallocAllocator<T>>;
 
 impl<R, T> StaticDlmallocGlobalAlloc<R, T> {
@@ -186,8 +184,31 @@ impl<T: FnOnce() -> StaticHeapBounds> GetStaticHeapBounds for T {
     }
 }
 
+#[repr(C)]
+pub struct StaticHeap<const N: usize, A = ()> {
+    _alignment: [A; 0],
+    space: UnsafeCell<[u8; N]>,
+}
+
+unsafe impl<const N: usize, A> Sync for StaticHeap<N, A> {}
+
+impl<const N: usize, A> StaticHeap<N, A> {
+    pub const fn new() -> Self {
+        Self {
+            _alignment: [],
+            space: UnsafeCell::new([0; N]),
+        }
+    }
+}
+
+impl<const N: usize, A> Default for StaticHeap<N, A> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<const N: usize> GetStaticHeapBounds for &StaticHeap<N> {
     fn bounds(self) -> StaticHeapBounds {
-        StaticHeapBounds::new(self.start(), self.size())
+        StaticHeapBounds::new(self.space.get().cast(), N)
     }
 }