Fix

raviqqe · Jul 14, 2024 · 7eb36ed · 7eb36ed
1 parent 4749ce1
commit 7eb36ed
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,7 @@ members = [
   "process_context",
   "profiler",
   "sac",
+  "util",
   "vm",
   "wasm",
 ]

diff --git a/cmd/minimal/Cargo.lock b/cmd/minimal/Cargo.lock
diff --git a/cmd/minimal/Cargo.toml b/cmd/minimal/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["interpret", "run", "util"]
+members = ["interpret", "run"]
 
 [workspace.package]
 edition = "2021"

diff --git a/cmd/minimal/interpret/Cargo.toml b/cmd/minimal/interpret/Cargo.toml
@@ -10,7 +10,7 @@ repository.workspace = true
 
 [dependencies]
 libc = { version = "0.2", default-features = false }
-mstak-util = { version = "0.1.18", path = "../util" }
+stak-util = { version = "0.1.18", path = "../../../util" }
 stak-device = { version = "0.2.24", path = "../../../device", features = [
   "libc",
 ] }

diff --git a/cmd/minimal/interpret/src/main.rs b/cmd/minimal/interpret/src/main.rs
@@ -10,11 +10,11 @@
 #![cfg_attr(not(test), no_main)]
 
 use core::{ffi::CStr, mem::size_of, slice};
-use mstak_util::Mmap;
 use stak_device::libc::{ReadWriteDevice, Stderr, Stdin, Stdout};
 use stak_file::LibcFileSystem;
 use stak_primitive::SmallPrimitiveSet;
 use stak_process_context::VoidProcessContext;
+use stak_util::Mmap;
 use stak_vm::{Value, Vm};
 
 const HEAP_SIZE: usize = 1 << 19;

diff --git a/sac/Cargo.toml b/sac/Cargo.toml
@@ -9,7 +9,7 @@ readme.workspace = true
 repository.workspace = true
 
 [features]
-libc = ["dep:libc", "stak-device/libc", "stak-file/libc"]
+libc = ["dep:libc", "dep:stak-util", "stak-device/libc", "stak-file/libc"]
 std = [
   "dep:clap",
   "stak-device/std",
@@ -29,4 +29,5 @@ stak-file = { version = "0.4.0", path = "../file" }
 stak-macro = { version = "0.1.43", path = "../macro" }
 stak-primitive = { version = "0.5.0", path = "../primitive" }
 stak-process-context = { version = "0.2.0", path = "../process_context" }
+stak-util = { version = "0.1.18", path = "../util", optional = true }
 stak-vm = { version = "0.5.0", path = "../vm" }
diff --git a/sac/src/lib.rs b/sac/src/lib.rs
@@ -19,6 +19,8 @@ pub mod __private {
     pub use stak_macro;
     pub use stak_primitive;
     pub use stak_process_context;
+    #[cfg(feature = "libc")]
+    pub use stak_util;
     pub use stak_vm;
     #[cfg(feature = "std")]
     pub use std;
@@ -99,6 +101,7 @@ macro_rules! libc_main {
             stak_macro::include_r7rs,
             stak_primitive::SmallPrimitiveSet,
             stak_process_context::VoidProcessContext,
+            stak_util::Heap,
             stak_vm::Vm,
         };
 
@@ -110,9 +113,9 @@ macro_rules! libc_main {
 
         #[cfg_attr(not(test), no_mangle)]
         unsafe extern "C" fn main(argc: isize, argv: *const *const i8) -> isize {
-            let mut heap = [Default::default(); $heap_size];
+            let mut heap = Heap::new(DEFAULT_HEAP_SIZE, Default::default);
             let mut vm = Vm::new(
-                &mut heap,
+                heap.as_slice_mut(),
                 SmallPrimitiveSet::new(
                     ReadWriteDevice::new(Stdin::new(), Stdout::new(), Stderr::new()),
                     LibcFileSystem::new(),

diff --git a/cmd/minimal/util/Cargo.toml → util/Cargo.toml b/cmd/minimal/util/Cargo.toml → util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "mstak-util"
-description = "Minimal Stak Scheme utilities"
+name = "stak-util"
+description = "Stak Scheme utilities"
 version = "0.1.18"
 edition.workspace = true
 keywords.workspace = true

diff --git a/cmd/minimal/util/src/heap.rs → util/src/heap.rs b/cmd/minimal/util/src/heap.rs → util/src/heap.rs
diff --git a/cmd/minimal/util/src/lib.rs → util/src/lib.rs b/cmd/minimal/util/src/lib.rs → util/src/lib.rs
diff --git a/cmd/minimal/util/src/mmap.rs → util/src/mmap.rs b/cmd/minimal/util/src/mmap.rs → util/src/mmap.rs
diff --git a/cmd/minimal/util/src/validate.rs → util/src/validate.rs b/cmd/minimal/util/src/validate.rs → util/src/validate.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ members = [ @@
       "process_context",
       "profiler",
       "sac",
+      "util",
       "vm",
       "wasm",
     ]
@@ Expand Down @@