guard page and bail:meme

rust/ares/Cargo.toml

@@ -18,8 +18,8 @@ ares_macros = { path = "../ares_macros" }
 # ares_pma = { path = "../ares_pma", features=["debug_prints"] }
 ares_pma = { path = "../ares_pma" }
 # use this when debugging requires allocation (e.g. eprintln)
-# assert_no_alloc = { path = "../assert-no-alloc", features=["warn_debug"] }
-assert_no_alloc = { path = "../assert-no-alloc" }
+# assert_no_alloc = { path = "../rust-assert-no-alloc", features=["warn_debug"] }
+assert_no_alloc = { path = "../rust-assert-no-alloc" }
 bitvec = "1.0.0"
 criterion = "0.4"
 either = "1.9.0"

rust/ares/src/serf.rs

@@ -1,4 +1,3 @@
-use crate::guard::call_with_guard;
 use crate::hamt::Hamt;
 use crate::interpreter;
 use crate::interpreter::{inc, interpret, Error, Mote};
@@ -403,27 +402,7 @@ fn slam(context: &mut Context, axis: u64, ovo: Noun) -> Result<Noun, Error> {
     let fol = T(stack, &[D(8), pul, D(9), D(2), D(10), sam, D(0), D(2)]);
     let sub = T(stack, &[arvo, ovo]);
 
-    let frame_p = stack.get_frame_pointer();
-    let stack_pp = stack.get_stack_pointer_pointer();
-    let alloc_pp = stack.get_alloc_pointer_pointer();
-
-    let res = call_with_guard(
-        stack_pp as *const *const u64,
-        alloc_pp as *const *const u64,
-        &mut || interpret(&mut context.nock_context, sub, fol),
-    );
-
-    if let Err(Error::NonDeterministic(Mote::Meme, _)) = res {
-        unsafe {
-            let stack = &mut context.nock_context.stack;
-            assert_no_alloc::reset_counters();
-            while stack.get_frame_pointer() != frame_p {
-                stack.frame_pop();
-            }
-        }
-    }
-
-    res
+    interpret(&mut context.nock_context, sub, fol)
 }
 
 fn peek(context: &mut Context, ovo: Noun) -> Noun {
@@ -626,7 +605,7 @@ fn work_swap(context: &mut Context, job: Noun, goof: Noun) {
             context.work_swap(ovo, fec);
         }
         Err(goof_crud) => {
-            eprintln!("\r serf: bail");
+            eprintln!("\rserf: bail");
             let stack = &mut context.nock_context.stack;
             let lud = T(stack, &[goof_crud, goof, D(0)]);
             context.work_bail(lud);

rust/ares_crypto/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 # use this when debugging requires allocation (e.g. eprintln)
-# assert_no_alloc = {version="1.1.2", features=["warn_debug"]}
-assert_no_alloc = "1.1.2"
+# assert_no_alloc = { path = "../rust-assert-no-alloc", features=["warn_debug"] }
+assert_no_alloc = { path = "../rust-assert-no-alloc" }
 ibig = "0.3.6"
 
 # ed25519