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

feat(env): move env out of vm,

Browse Source
This commit is contained in:
imxyy_soope_
2025-05-23 19:19:20 +08:00
parent 5291e49313
commit b41fd38bcc
10 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtins/mod.rs
View File

@@ -2,9 +2,10 @@ use std::rc::Rc;
use hashbrown::HashMap;
use crate::env::VmEnv;
use crate::ty::common::Const;
use crate::ty::internal::{AttrSet, PrimOp, Value};
use crate::vm::{VM, VmEnv};
use crate::vm::VM;
pub fn env<'jit, 'vm>(vm: &'vm VM<'jit>) -> VmEnv<'jit, 'vm> {
let primops = [
@@ -50,7 +51,6 @@ pub fn env<'jit, 'vm>(vm: &'vm VM<'jit>) -> VmEnv<'jit, 'vm> {
env_map.insert(vm.new_sym("true"), Value::Const(Const::Bool(true)));
env_map.insert(vm.new_sym("false"), Value::Const(Const::Bool(false)));
let mut map = HashMap::new();
for primop in primops {
let primop = Rc::new(primop);

16
src/vm/env.rs → src/env.rs
View File

@@ -1,8 +1,8 @@
use std::fmt::Debug;
use std::hash::Hash;
use hashbrown::{DefaultHashBuilder, HashMap};
use bumpalo::Bump;
use hashbrown::{DefaultHashBuilder, HashMap};
use crate::ty::internal::Value;
@@ -70,7 +70,7 @@ impl<'bump, K: Hash + Eq + Clone, V: Clone> Env<'bump, K, V> {
map: None,
last: None,
}),
last: None
last: None,
}
}
@@ -85,7 +85,7 @@ impl<'bump, K: Hash + Eq + Clone, V: Clone> Env<'bump, K, V> {
&*bump.alloc(Env {
let_: self.let_.enter_arg(ident, val, bump),
with: self.with,
last: Some(self)
last: Some(self),
})
}
@@ -93,7 +93,7 @@ impl<'bump, K: Hash + Eq + Clone, V: Clone> Env<'bump, K, V> {
&*bump.alloc(Env {
let_: self.let_.enter_let(map, bump),
with: self.with,
last: Some(self)
last: Some(self),
})
}
@@ -101,7 +101,7 @@ impl<'bump, K: Hash + Eq + Clone, V: Clone> Env<'bump, K, V> {
&*bump.alloc(Env {
let_: self.let_,
with: self.with.enter(map, bump),
last: Some(self)
last: Some(self),
})
}
@@ -138,14 +138,14 @@ impl<'bump, K: Hash + Eq + Clone, V: Clone> LetEnv<'bump, K, V> {
pub fn enter_arg(&'bump self, ident: K, val: V, bump: &'bump Bump) -> &'bump Self {
&*bump.alloc(Self {
map: LetNode::SingleArg(ident, val),
last: Some(self)
last: Some(self),
})
}
pub fn enter_let(&'bump self, map: &'bump Map<'bump, K, V>, bump: &'bump Bump) -> &'bump Self {
&*bump.alloc(Self {
map: LetNode::Let(map),
last: Some(self)
last: Some(self),
})
}
}
@@ -161,7 +161,7 @@ impl<'bump, K: Hash + Eq + Clone, V: Clone> With<'bump, K, V> {
pub fn enter(&'bump self, map: &'bump Map<'bump, K, V>, bump: &'bump Bump) -> &'bump Self {
&*bump.alloc(Self {
map: Some(map),
last: Some(self)
last: Some(self),
})
}
}

15
src/jit/helpers.rs
View File

@@ -5,9 +5,10 @@ use inkwell::module::Module;
use inkwell::types::{FloatType, FunctionType, IntType, PointerType, StructType};
use inkwell::values::{BasicValueEnum, FunctionValue};
use crate::env::VmEnv;
use crate::jit::JITValueData;
use crate::ty::internal::{Thunk, Value};
use crate::vm::{VM, VmEnv};
use crate::vm::VM;
use super::{JITValue, ValueTag};
@@ -91,11 +92,7 @@ impl<'ctx> Helpers<'ctx> {
let call = module.add_function(
"call",
value_type.fn_type(
&[
value_type.into(),
value_type.into(),
ptr_type.into(),
],
&[value_type.into(), value_type.into(), ptr_type.into()],
false,
),
None,
@@ -311,11 +308,7 @@ extern "C" fn helper_or(lhs: JITValue, rhs: JITValue) -> JITValue {
}
}
extern "C" fn helper_call<'jit>(
func: JITValue,
arg: JITValue,
vm: *const VM<'jit>,
) -> JITValue {
extern "C" fn helper_call<'jit>(func: JITValue, arg: JITValue, vm: *const VM<'jit>) -> JITValue {
use ValueTag::*;
match func.tag {
Function => {

9
src/jit/mod.rs
View File

@@ -8,11 +8,12 @@ use inkwell::module::Module;
use inkwell::values::{BasicValueEnum, FunctionValue, PointerValue};
use crate::bytecode::{Func, OpCode, UnOp};
use crate::env::VmEnv;
use crate::error::*;
use crate::stack::Stack;
use crate::ty::common::Const;
use crate::ty::internal::{Thunk, Value};
use crate::vm::{VM, VmEnv};
use crate::vm::VM;
mod helpers;
@@ -408,11 +409,7 @@ impl<'vm, 'ctx: 'vm> JITContext<'ctx> {
.builder
.build_direct_call(
self.helpers.call,
&[
func.into(),
arg.into(),
self.new_ptr(vm).into(),
],
&[func.into(), arg.into(), self.new_ptr(vm).into()],
"call",
)?
.try_as_basic_value()

1
src/lib.rs
View File

@@ -4,6 +4,7 @@
mod builtins;
mod bytecode;
mod env;
mod stack;
mod ty;

3
src/ty/internal/attrset.rs
View File

@@ -5,8 +5,9 @@ use hashbrown::{HashMap, HashSet};
use derive_more::Constructor;
use itertools::Itertools;
use crate::env::VmEnv;
use crate::error::Result;
use crate::vm::{VM, VmEnv};
use crate::vm::VM;
use super::super::public as p;
use super::Value;

6
src/ty/internal/func.rs
View File

@@ -6,11 +6,12 @@ use inkwell::execution_engine::JitFunction;
use itertools::Itertools;
use crate::bytecode::Func as BFunc;
use crate::env::VmEnv;
use crate::error::Result;
use crate::ir;
use crate::jit::JITFunc;
use crate::ty::internal::{Thunk, Value};
use crate::vm::{VM, VmEnv};
use crate::vm::VM;
#[derive(Debug, Clone)]
pub enum Param {
@@ -63,7 +64,8 @@ impl<'vm, 'jit: 'vm> Func<'jit, 'vm> {
alias,
} => {
let arg = arg.unwrap_attr_set();
let mut new = HashMap::with_capacity_in(formals.len() + alias.iter().len(), &vm.bump);
let mut new =
HashMap::with_capacity_in(formals.len() + alias.iter().len(), &vm.bump);
if !ellipsis
&& arg
.as_inner()

5
src/ty/internal/mod.rs
View File

@@ -10,8 +10,9 @@ use super::common::*;
use super::public as p;
use crate::bytecode::OpCodes;
use crate::env::VmEnv;
use crate::error::*;
use crate::vm::{VM, VmEnv};
use crate::vm::VM;
mod attrset;
mod func;
@@ -241,7 +242,7 @@ impl<'jit, 'vm> Value<'jit, 'vm> {
(_, x @ Value::Catchable(_)) => {
*self = x;
return;
},
}
_ => todo!(),
}))
}

40
src/vm/mod.rs
View File

@@ -5,6 +5,7 @@ use std::cell::{Cell, OnceCell, RefCell};
use crate::builtins::env;
use crate::bytecode::{BinOp, Func as F, OpCode, OpCodes, Program, UnOp};
use crate::env::VmEnv;
use crate::error::*;
use crate::jit::{JITContext, JITFunc};
use crate::stack::Stack;
@@ -14,9 +15,6 @@ use crate::ty::public::{self as p, Symbol};
use derive_more::Constructor;
use ecow::EcoString;
pub use env::VmEnv;
mod env;
#[cfg(test)]
mod test;
@@ -156,7 +154,7 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
Sub => {
rhs.neg();
lhs.add(rhs);
},
}
Mul => lhs.mul(rhs),
Div => lhs.div(rhs)?,
And => lhs.and(rhs),
@@ -187,7 +185,17 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
}
OpCode::FinalizeRec => {
let new = self.bump.alloc(HashMap::new_in(&self.bump));
*env = env.enter_let(stack.tos().as_ref().unwrap_attr_set().as_inner().iter().map(|(&k, v)| (k, v.clone())).collect_into(new), &self.bump);
*env = env.enter_let(
stack
.tos()
.as_ref()
.unwrap_attr_set()
.as_inner()
.iter()
.map(|(&k, v)| (k, v.clone()))
.collect_into(new),
&self.bump,
);
stack.tos_mut().as_mut().unwrap_attr_set().capture(env);
}
OpCode::PushStaticAttr { name } => {
@@ -249,12 +257,30 @@ impl<'vm, 'jit: 'vm> VM<'jit> {
}
OpCode::EnterLetEnv => {
let new = self.bump.alloc(HashMap::new_in(&self.bump));
*env = env.enter_let(stack.pop().unwrap_attr_set().into_inner().iter().map(|(&k, v)| (k, v.clone())).collect_into(new), &self.bump);
*env = env.enter_let(
stack
.pop()
.unwrap_attr_set()
.into_inner()
.iter()
.map(|(&k, v)| (k, v.clone()))
.collect_into(new),
&self.bump,
);
}
OpCode::LeaveLetEnv => *env = env.leave(),
OpCode::EnterWithEnv => {
let new = self.bump.alloc(HashMap::new_in(&self.bump));
*env = env.enter_with(stack.pop().unwrap_attr_set().into_inner().iter().map(|(&k, v)| (k, v.clone())).collect_into(new), &self.bump);
*env = env.enter_with(
stack
.pop()
.unwrap_attr_set()
.into_inner()
.iter()
.map(|(&k, v)| (k, v.clone()))
.collect_into(new),
&self.bump,
);
}
OpCode::LeaveWithEnv => *env = env.leave(),
OpCode::Assert => {