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

Merge branch 'urcrypt' into puck

Browse Source
This commit is contained in:
Alex Shelkovnykov 2023-11-22 13:52:27 -03:00
commit de4224b2a2
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,26 +418,6 @@ pub fn interpret(context: &mut Context, mut subject: Noun, formula: Noun) -> Res
push_formula(&mut context.stack, vale.formula, false)?; push_formula(&mut context.stack, vale.formula, false)?;
} }
Todo2::ComputeResult => { Todo2::ComputeResult => {
if !cfg!(feature = "sham_hints") {
if let Some((jet, _path)) = context.warm.find_jet(
&mut context.stack,
&mut vale.subject,
&mut res,
) {
match jet(context, vale.subject) {
Ok(jet_res) => {
res = jet_res;
context.stack.pop::<NockWork>();
continue;
}
Err(JetErr::Punt) => {}
Err(err) => {
break Err(err.into());
}
}
}
};
let stack = &mut context.stack; let stack = &mut context.stack;
if vale.tail { if vale.tail {
stack.pop::<NockWork>(); stack.pop::<NockWork>();

1
rust/ares/src/serf.rs
View File

@ -270,6 +270,7 @@ pub fn serf() -> io::Result<()> {
// XX: Such data should go in the PMA once that's available // XX: Such data should go in the PMA once that's available
unsafe { unsafe {
let stack = &mut context.nock_context.stack; let stack = &mut context.nock_context.stack;
stack.preserve(&mut context.arvo);
stack.preserve(&mut context.nock_context.cold); stack.preserve(&mut context.nock_context.cold);
stack.preserve(&mut context.nock_context.warm); stack.preserve(&mut context.nock_context.warm);
stack.frame_pop(); stack.frame_pop();