imxyy1soope1/nixjit
1
0
Fork 0
Code Issues Pull Requests Actions Projects 1 Releases Activity

feat: better builtins implementaion

Browse Source 
get rid of circular references
This commit is contained in:
imxyy_soope_
2025-05-17 18:31:36 +08:00
parent 8480e0891b
commit ff9afd0cc1
19 changed files with 191 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/vm/mod.rs
View File

@@ -4,7 +4,7 @@ use std::pin::Pin;
use std::rc::Rc;
use crate::builtins::env;
use crate::bytecode::{BinOp, OpCode, OpCodes, Program, UnOp, Func as F};
use crate::bytecode::{BinOp, Func as F, OpCode, OpCodes, Program, UnOp};
use crate::error::*;
use crate::ty::internal::*;
use crate::ty::public::{self as p, Symbol};
@@ -31,11 +31,13 @@ pub fn run(prog: Program, jit: Pin<Box<JITContext<'_>>>) -> Result<p::Value> {
RefCell::new(prog.symbols),
RefCell::new(prog.symmap),
prog.consts,
jit
jit,
);
let env = env(&vm);
let mut seen = HashSet::new();
let value = vm.eval(prog.top_level.into_iter(), env)?.to_public(&vm, &mut seen);
let value = vm
.eval(prog.top_level.into_iter(), env)?
.to_public(&vm, &mut seen);
Ok(value)
}
@@ -46,7 +48,7 @@ pub struct VM<'jit> {
symbols: RefCell<Vec<EcoString>>,
symmap: RefCell<HashMap<EcoString, usize>>,
consts: Box<[Const]>,
jit: Pin<Box<JITContext<'jit>>>
jit: Pin<Box<JITContext<'jit>>>,
}
impl<'vm, 'jit: 'vm> VM<'jit> {
@@ -58,7 +60,7 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
&self.funcs[idx]
}
pub fn get_sym(&self, idx: usize) -> Symbol{
pub fn get_sym(&self, idx: usize) -> Symbol {
self.symbols.borrow()[idx].clone().into()
}
@@ -67,13 +69,19 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
if let Some(&idx) = self.symmap.borrow().get(&sym) {
idx
} else {
self.symmap.borrow_mut().insert(sym.clone(), self.symbols.borrow().len());
self.symmap
.borrow_mut()
.insert(sym.clone(), self.symbols.borrow().len());
self.symbols.borrow_mut().push(sym);
self.symbols.borrow().len() - 1
}
}
pub fn eval(&'vm self, opcodes: impl Iterator<Item = OpCode>, env: Rc<Env<'vm>>) -> Result<Value<'vm>> {
pub fn eval(
&'vm self,
opcodes: impl Iterator<Item = OpCode>,
env: Rc<Env<'vm>>,
) -> Result<Value<'vm>> {
let mut stack = Stack::<_, STACK_SIZE>::new();
let mut iter = opcodes.into_iter();
while let Some(opcode) = iter.next() {
@@ -101,12 +109,10 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
OpCode::LoadThunk { idx } => {
stack.push(Value::Thunk(Thunk::new(self.get_thunk(idx)).into()))?
}
OpCode::CaptureEnv => {
match stack.tos()? {
Value::Thunk(thunk) => thunk.capture(env.clone()),
_ => ()
}
}
OpCode::CaptureEnv => match stack.tos()? {
Value::Thunk(thunk) => thunk.capture(env.clone()),
_ => (),
},
OpCode::ForceValue => {
stack.tos_mut()?.force(self)?;
}
@@ -181,12 +187,16 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
stack.push(Value::AttrSet(AttrSet::empty().into()))?;
}
OpCode::FinalizeRec => {
env.enter(stack.tos()?.clone().unwrap_attr_set().as_inner().clone());
stack
.tos_mut()?
.as_mut()
.unwrap_attr_set()
.capture(env);
env.enter(
stack
.tos()?
.clone()
.unwrap_attr_set()
.as_inner()
.iter()
.map(|(k, v)| (k.clone(), v.clone())),
);
stack.tos_mut()?.as_mut().unwrap_attr_set().capture(env);
}
OpCode::PushStaticAttr { name } => {
let val = stack.pop();
@@ -237,13 +247,12 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
stack.tos_mut()?.force(self)?.has_attr(sym);
}
OpCode::LookUp { sym } => {
stack.push(
env.lookup(sym)
.ok_or_else(|| Error::EvalError(format!("{} not found", self.get_sym(sym))))?,
)?;
stack.push(env.lookup(sym).ok_or_else(|| {
Error::EvalError(format!("{} not found", self.get_sym(sym)))
})?)?;
}
OpCode::EnterEnv => match stack.pop() {
Value::AttrSet(attrs) => env.enter(attrs.as_inner().clone()),
Value::AttrSet(attrs) => env.enter_with(attrs),
_ => unreachable!(),
},