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

feat: get rid of gc and cyclic thunk

Browse Source
This commit is contained in:
imxyy_soope_
2025-06-05 16:43:47 +08:00
parent 51f8df9cca
commit 484cfa4610
17 changed files with 342 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/builtins/mod.rs
View File

@@ -1,12 +1,11 @@
use std::rc::Rc;
use gc_arena::{Gc, Mutation};
use hashbrown::HashMap;
use crate::env::VmEnv;
use crate::ir::{DowngradeContext, Ir};
use crate::ty::common::Const;
use crate::ty::internal::{AttrSet, PrimOp, Value};
use crate::ty::internal::{PrimOp, Value};
use crate::vm::VM;
pub fn ir_env(ctx: &mut DowngradeContext) -> HashMap<usize, Ir> {
@@ -17,16 +16,16 @@ pub fn ir_env(ctx: &mut DowngradeContext) -> HashMap<usize, Ir> {
map
}
pub fn vm_env<'gc>(vm: &VM, mc: &Mutation<'gc>) -> Gc<'gc, VmEnv<'gc>> {
pub fn vm_env<'gc>(vm: &VM) -> Rc<VmEnv<'gc>> {
let primops = [
PrimOp::new("add", 2, |args, _, mc| {
PrimOp::new("add", 2, |args, _| {
let Ok([mut first, second]): Result<[Value; 2], _> = args.try_into() else {
unreachable!()
};
first.add(second);
first.ok()
}),
PrimOp::new("sub", 2, |args, _, mc| {
PrimOp::new("sub", 2, |args, _| {
let Ok([mut first, mut second]): Result<[Value; 2], _> = args.try_into() else {
unreachable!()
};
@@ -34,39 +33,39 @@ pub fn vm_env<'gc>(vm: &VM, mc: &Mutation<'gc>) -> Gc<'gc, VmEnv<'gc>> {
first.add(second);
first.ok()
}),
PrimOp::new("mul", 2, |args, _, _| {
PrimOp::new("mul", 2, |args, _| {
let Ok([mut first, second]): Result<[Value; 2], _> = args.try_into() else {
unreachable!()
};
first.mul(second);
first.ok()
}),
PrimOp::new("div", 2, |args, _, _| {
PrimOp::new("div", 2, |args, _| {
let Ok([mut first, second]): Result<[Value; 2], _> = args.try_into() else {
unreachable!()
};
first.div(second)?;
first.ok()
}),
PrimOp::new("lessThan", 2, |args, _, _| {
PrimOp::new("lessThan", 2, |args, _| {
let Ok([mut first, second]): Result<[Value; 2], _> = args.try_into() else {
unreachable!()
};
first.lt(second);
first.ok()
}),
/* PrimOp::new("seq", 2, |args, vm, mc| {
let Ok([mut first, second]): Result<[_; 2], _> = args.try_into() else {
/* PrimOp::new("seq", 2, |args, vm| {
let Ok([mut first, second]): Result<[_; 2]> = args.try_into() else {
unreachable!()
};
first.force(vm, mc).unwrap();
first.force(vm).unwrap();
second.ok()
}),
PrimOp::new("deepSeq", 2, |args, vm, mc| {
let Ok([mut first, second]): Result<[_; 2], _> = args.try_into() else {
PrimOp::new("deepSeq", 2, |args, vm| {
let Ok([mut first, second]): Result<[_; 2]> = args.try_into() else {
unreachable!()
};
first.force_deep(vm, mc).unwrap();
first.force_deep(vm).unwrap();
second.ok()
}), */
];
@@ -85,16 +84,16 @@ pub fn vm_env<'gc>(vm: &VM, mc: &Mutation<'gc>) -> Gc<'gc, VmEnv<'gc>> {
map.insert(vm.new_sym(primop.name), Value::PrimOp(primop));
}
let sym = vm.new_sym("builtins");
/* let mut attrs = CoW::new(AttrSet::new(map), mc);
/* let mut attrs = CoW::new(AttrSet::new(map));
unsafe {
attrs.make_cyclic(|attrs, this| {
let _ = attrs.push_attr(sym, Value::AttrSet(this));
}, mc);
});
}
let builtins = Value::AttrSet(attrs);
env_map.insert(sym, builtins); */
// TODO:
// VmEnv::new(Gc::new(mc, env_map), mc)
VmEnv::new(Vec::new(), mc)
// VmEnv::new(Gc::new(mc, env_map))
VmEnv::new(Vec::new())
}