maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): implement OpGetUpvalue in the VM

Browse source 
This resolves an upvalue at runtime by pushing it on the stack from
the closure's upvalue vector.

Change-Id: Ic3e7a7ecd9f7032f679114a1995e5bbf83062fcf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6294
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-08-27 02:15:22 +03:00 • committed by tazjin
parent 3d8888a13e
commit 0f06d0ca33
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tvix/eval/src/vm.rs
View file

@ -6,7 +6,7 @@ use std::rc::Rc;
use crate::{ use crate::{
chunk::Chunk, chunk::Chunk,
errors::{ErrorKind, EvalResult}, errors::{ErrorKind, EvalResult},
opcode::{Count, JumpOffset, OpCode, StackIdx}, opcode::{Count, JumpOffset, OpCode, StackIdx, UpvalueIdx},
value::{Closure, Lambda, NixAttrs, NixList, Value}, value::{Closure, Lambda, NixAttrs, NixList, Value},
}; };
@ -320,8 +320,7 @@ impl VM {
OpCode::OpGetLocal(StackIdx(local_idx)) => { OpCode::OpGetLocal(StackIdx(local_idx)) => {
let idx = self.frame().stack_offset + local_idx; let idx = self.frame().stack_offset + local_idx;
let value = self.stack[idx].clone(); self.push(self.stack[idx].clone());
self.push(value)
} }
OpCode::OpPushWith(StackIdx(idx)) => self.with_stack.push(idx), OpCode::OpPushWith(StackIdx(idx)) => self.with_stack.push(idx),
@ -367,8 +366,11 @@ impl VM {
}; };
} }
OpCode::OpGetUpvalue(_) => todo!("getting upvalues"),
OpCode::OpClosure(_) => todo!("creating closure objects"), OpCode::OpClosure(_) => todo!("creating closure objects"),
OpCode::OpGetUpvalue(UpvalueIdx(upv_idx)) => {
let value = self.frame().closure.upvalues[upv_idx].clone();
self.push(value);
}
// Data-carrying operands should never be executed, // Data-carrying operands should never be executed,
// that is a critical error in the VM. // that is a critical error in the VM.