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

refactor: builtins, value

Browse Source
This commit is contained in:
imxyy_soope_
2025-05-03 17:04:28 +08:00
parent 030c61df52
commit 3f0cb2c2fa
9 changed files with 123 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vm/vm.rs
View File

@@ -1,16 +1,15 @@
use anyhow::Result;
use rpds::{HashTrieMap, HashTrieMapSync, Vector};
use crate::builtins::env;
use crate::bytecode::{self, *};
use crate::value::{Const, Value};
use crate::value::{Const, Value as Value_};
use super::env::Env;
use super::stack::{STACK_SIZE, Stack};
use super::value::{self as vmValue, *};
use super::vmthunk::*;
pub fn run(prog: Program) -> Result<Value> {
pub fn run(prog: Program) -> Result<Value_> {
let vm = VM::new(prog.thunks);
Ok(vm.eval(prog.top_level, &mut env())?.to_value(&vm))
}
@@ -28,11 +27,11 @@ impl VM {
VM { thunks }
}
pub fn get_thunk_value(&self, idx: usize, env: &mut Env) -> Result<VmValue> {
pub fn get_thunk_value(&self, idx: usize, env: &mut Env) -> Result<Value> {
self.thunks.get(idx).unwrap().force(self, env)
}
pub fn eval(&self, opcodes: OpCodes, env: &mut Env) -> Result<VmValue> {
pub fn eval(&self, opcodes: OpCodes, env: &mut Env) -> Result<Value> {
let mut stack = Stack::<STACK_SIZE>::new();
let mut iter = opcodes.into_iter();
while let Some(opcode) = iter.next() {
@@ -54,8 +53,8 @@ impl VM {
) -> Result<usize> {
match opcode {
OpCode::NoOp => (),
OpCode::Const { value } => stack.push(VmValue::Const(value))?,
OpCode::LoadThunk { idx } => stack.push(VmValue::Thunk(vmValue::Thunk::new(idx)))?,
OpCode::Const { value } => stack.push(Value::Const(value))?,
OpCode::LoadThunk { idx } => stack.push(Value::Thunk(vmValue::Thunk::new(idx)))?,
OpCode::LoadValue { idx } => {
stack.push(self.get_thunk_value(idx, env)?)?;
}
@@ -64,12 +63,12 @@ impl VM {
}
OpCode::Jmp { step } => return Ok(step),
OpCode::JmpIfTrue { step } => {
if let VmValue::Const(Const::Bool(true)) = stack.pop()? {
if let Value::Const(Const::Bool(true)) = stack.pop()? {
return Ok(step);
}
}
OpCode::JmpIfFalse { step } => {
if let VmValue::Const(Const::Bool(false)) = stack.pop()? {
if let Value::Const(Const::Bool(false)) = stack.pop()? {
return Ok(step);
}
}
@@ -106,14 +105,14 @@ impl VM {
stack.tos_mut()?.concat_string(rhs);
}
OpCode::List => {
stack.push(VmValue::List(List::new(Vector::new_sync())))?;
stack.push(Value::List(List::empty()))?;
}
OpCode::PushElem => {
let elem = stack.pop()?;
stack.tos_mut()?.push(elem);
}
OpCode::AttrSet => {
stack.push(VmValue::AttrSet(AttrSet::new(HashTrieMap::new_sync())))?;
stack.push(Value::AttrSet(AttrSet::empty()))?;
}
OpCode::PushStaticAttr { name } => {
let val = stack.pop()?;
@@ -138,7 +137,7 @@ impl VM {
OpCode::SelectOrEmpty { sym } => {
stack.tos_mut()?.select_with_default(
Symbol::new(sym),
VmValue::AttrSet(AttrSet::new(HashTrieMapSync::new_sync())),
Value::AttrSet(AttrSet::empty()),
);
}
OpCode::SelectDynamic => {
@@ -160,7 +159,7 @@ impl VM {
let sym = val.unwrap_const().unwrap_string().into();
stack.tos_mut()?.select_with_default(
sym,
VmValue::AttrSet(AttrSet::new(HashTrieMapSync::new_sync())),
Value::AttrSet(AttrSet::empty()),
);
}
OpCode::HasAttr { sym } => {