urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-12-23 21:31:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from urbit/as/mook

Browse Source 
jets: fix `+mook` jet mismatches and simplify logic
This commit is contained in:
Edward Amsden 2023-11-28 17:14:36 -06:00 committed by GitHub
commit d7173bf7ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rust/ares/src/interpreter.rs
View File

@ -1390,8 +1390,10 @@ mod hint {
}
tas!(b"hela") => {
// XX: This only prints the trace down to the bottom of THIS
// interpret call. We'll need to recursively work down
// frames to get the stack trace all the way to the root.
// interpret call, making this neither a %nara nor a %hela
// hint, as Vere understands them. We'll need to
// recursively work down frames to get the stack trace all
// the way to the root.
let mean = unsafe { *(context.stack.local_noun_pointer(0)) };
let tone = Cell::new(&mut context.stack, D(2), mean);
@ -1401,6 +1403,9 @@ mod hint {
let newt = &mut context.newt;
if unsafe { !toon.head().raw_equals(D(2)) } {
// +mook will only ever return a $toon with non-%2 head if that's what it was given as
// input. Since we control the input for this call exactly, there must exist a programming
// error in Ares if this occurs.
panic!("serf: %hela: mook returned invalid tone");
}
@ -1422,9 +1427,9 @@ mod hint {
}
}
Err(_) => {
let stack = &mut context.stack;
let tape = tape(stack, "serf: %hela: mook error");
slog_leaf(stack, &mut context.newt, tape);
// +mook should only ever bail if the input is not [%2 (list)]. Since we control the input
// for this call exactly, there must exist a programming error in Ares if this occurs.
panic!("serf: unrecoverable stack trace error");
}
}
}

38
rust/ares/src/jets/nock.rs
View File

@ -194,13 +194,7 @@ pub mod util {
let tag = tone.head().as_direct()?;
let original_list = tone.tail();
match tag.data() {
x if x < 2 => return Ok(tone),
x if x > 2 => return Err(JetErr::Fail(Error::Deterministic(D(0)))),
_ => {}
}
if unsafe { original_list.raw_equals(D(0)) } {
if (tag.data() != 2) | unsafe { original_list.raw_equals(D(0)) } {
return Ok(tone);
} else if original_list.atom().is_some() {
return Err(JetErr::Fail(Error::Deterministic(D(0))));
@ -210,23 +204,10 @@ pub mod util {
unsafe {
let mut res = D(0);
let mut dest = &mut res as *mut Noun;
let mut list = original_list;
// Unused if flopping
let (mut new_cell, mut new_memory) = Cell::new_raw_mut(&mut context.stack);
let mut memory = new_memory;
// loop guaranteed to run at least once
loop {
if list.raw_equals(D(0)) {
break;
} else if !flop && res.raw_equals(D(0)) {
res = new_cell.as_noun();
} else if !flop {
(new_cell, new_memory) = Cell::new_raw_mut(&mut context.stack);
(*memory).tail = new_cell.as_noun();
memory = new_memory
}
while !list.raw_equals(D(0)) {
let cell = list.as_cell()?;
let trace = cell.head().as_cell()?;
let tag = trace.head().as_direct()?;
@ -366,15 +347,16 @@ pub mod util {
if flop {
res = T(&mut context.stack, &[tank, res]);
} else {
(*memory).head = tank;
let (new_cell, new_memory) = Cell::new_raw_mut(&mut context.stack);
(*new_memory).head = tank;
*dest = new_cell.as_noun();
dest = &mut (*new_memory).tail;
}
list = cell.tail();
}
if !flop {
(*memory).tail = D(0);
}
*dest = D(0);
let toon = Cell::new(&mut context.stack, D(2), res);
Ok(toon)
}