chore

Cargo.lock

@@ -445,22 +445,18 @@ name = "fix"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bumpalo",
  "clap",
  "criterion",
  "ere",
- "fix-abstract-vm",
- "fix-builtins",
- "fix-codegen",
- "fix-common",
+ "fix-bytecode",
+ "fix-compiler",
  "fix-error",
- "fix-ir",
+ "fix-lang",
+ "fix-runtime",
  "fix-vm",
- "ghost-cell",
  "hashbrown 0.16.1",
  "miette",
  "mimalloc",
- "rnix",
  "rustyline",
  "string-interner",
  "tempfile",
@@ -471,51 +467,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "fix-abstract-vm"
-version = "0.1.0"
-dependencies = [
- "fix-builtins",
- "fix-codegen",
- "fix-common",
- "fix-error",
- "gc-arena",
- "hashbrown 0.16.1",
- "likely_stable",
- "num_enum",
- "smallvec",
- "sptr",
- "string-interner",
-]
-
-[[package]]
-name = "fix-builtins"
-version = "0.1.0"
-dependencies = [
- "gc-arena",
- "num_enum",
-]
-
-[[package]]
-name = "fix-codegen"
+name = "fix-bytecode"
 version = "0.1.0"
 dependencies = [
  "colored",
- "fix-builtins",
- "fix-common",
- "fix-ir",
- "hashbrown 0.16.1",
+ "fix-lang",
  "num_enum",
- "rnix",
  "string-interner",
 ]
 
 [[package]]
-name = "fix-common"
+name = "fix-compiler"
 version = "0.1.0"
 dependencies = [
- "ere",
- "gc-arena",
+ "bumpalo",
+ "colored",
+ "fix-bytecode",
+ "fix-error",
+ "fix-lang",
+ "fix-runtime",
+ "ghost-cell",
+ "hashbrown 0.16.1",
+ "rnix",
+ "rowan",
  "string-interner",
+ "tracing",
 ]
 
 [[package]]
@@ -528,34 +504,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "fix-ir"
+name = "fix-lang"
 version = "0.1.0"
 dependencies = [
- "bumpalo",
- "fix-builtins",
- "fix-common",
- "fix-error",
- "ghost-cell",
- "hashbrown 0.16.1",
+ "ere",
+ "gc-arena",
  "num_enum",
- "rnix",
- "rowan",
  "string-interner",
 ]
 
 [[package]]
-name = "fix-primops"
+name = "fix-runtime"
 version = "0.1.0"
 dependencies = [
- "fix-abstract-vm",
- "fix-builtins",
- "fix-codegen",
- "fix-common",
+ "fix-bytecode",
  "fix-error",
+ "fix-lang",
  "gc-arena",
  "hashbrown 0.16.1",
- "num_enum",
  "smallvec",
+ "sptr",
  "string-interner",
 ]
 
@@ -563,19 +531,13 @@ dependencies = [
 name = "fix-vm"
 version = "0.1.0"
 dependencies = [
- "fix-abstract-vm",
- "fix-builtins",
- "fix-codegen",
- "fix-common",
+ "fix-bytecode",
  "fix-error",
- "fix-primops",
+ "fix-lang",
+ "fix-runtime",
  "gc-arena",
  "hashbrown 0.16.1",
- "likely_stable",
- "num_enum",
  "smallvec",
- "sptr",
- "string-interner",
  "sysinfo",
 ]
 
@@ -773,15 +735,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "likely_stable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61f7017d8abea1fc23ff7f01a8147b2656dea3aeb24d519aab6e2177eaf671c"
-dependencies = [
- "rustc_version",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -1158,15 +1111,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.4"

Cargo.toml

@@ -2,41 +2,41 @@
 resolver = "3"
 members = [
   "fix",
-    "fix-abstract-vm",
-    "fix-builtins",
-    "fix-codegen",
-    "fix-common",
+  "fix-bytecode",
+  "fix-compiler",
   "fix-error",
-    "fix-ir",
-    "fix-primops",
+  "fix-lang",
+  "fix-runtime",
   "fix-vm",
 ]
 
-[profile.profiling]
-inherits = "release"
-debug = true
-
-[profile.lto]
-inherits = "release"
-lto = true
-
 [workspace.dependencies]
-bumpalo = { version = "3.20", features = [
+bumpalo = {
+  version = "3.20",
+  features = [
     "allocator-api2",
     "boxed",
     "collections",
-] }
+  ]
+}
+ere = "0.2"
 ghost-cell = "0.2"
 hashbrown = "0.16"
 num_enum = "0.7.5"
-smallvec = { version = "1.15", features = ["const_new", "const_generics"] }
-ere = "0.2"
-string-interner = "0.19"
 rnix = "0.14"
 rowan = "0.16"
-likely_stable = "0.1"
+smallvec = { version = "1.15", features = ["const_generics", "const_new"] }
+string-interner = "0.19"
 
 [workspace.dependencies.gc-arena]
 git = "https://github.com/kyren/gc-arena"
 rev = "75671ae03f53718357b741ed4027560f14e90836"
 features = ["allocator-api2", "hashbrown", "smallvec"]
+
+[profile.lto]
+inherits = "release"
+lto = true
+
+[profile.profiling]
+inherits = "release"
+debug = true

fix-abstract-vm/src/bytecode_reader.rs

@@ -1,142 +0,0 @@
-#![allow(dead_code)]
-
-use fix_codegen::OperandType;
-use fix_common::StringId;
-use num_enum::TryFromPrimitive;
-use string_interner::Symbol as _;
-
-use crate::{OperandData, VmRuntimeCtx};
-
-pub struct BytecodeReader<'a> {
-    bytecode: &'a [u8],
-    pc: usize,
-    inst_start_pc: usize,
-}
-
-impl<'a> BytecodeReader<'a> {
-    pub fn new(bytecode: &'a [u8], pc: usize) -> Self {
-        Self {
-            bytecode,
-            pc,
-            inst_start_pc: pc,
-        }
-    }
-
-    #[inline(always)]
-    pub fn from_after_op(bytecode: &'a [u8], inst_start_pc: usize) -> Self {
-        Self {
-            bytecode,
-            pc: inst_start_pc + 1,
-            inst_start_pc,
-        }
-    }
-
-    #[inline(always)]
-    #[cfg_attr(debug_assertions, track_caller)]
-    fn read_array<const N: usize>(&mut self) -> [u8; N] {
-        let ret = self.bytecode[self.pc..self.pc + N]
-            .try_into()
-            .expect("read_array failed");
-        self.pc += N;
-        ret
-    }
-
-    #[inline(always)]
-    pub fn read_op(&mut self) -> fix_codegen::Op {
-        use fix_codegen::Op;
-        self.inst_start_pc = self.pc;
-        let byte = self.bytecode[self.pc];
-        if !likely_stable::likely((0..Op::Illegal as u8).contains(&byte)) {
-            panic!("unknown opcode: {byte:#04x}")
-        }
-        self.pc += 1;
-        unsafe { std::mem::transmute::<u8, Op>(byte) }
-    }
-
-    #[inline(always)]
-    pub fn read_u8(&mut self) -> u8 {
-        let val = self.bytecode[self.pc];
-        self.pc += 1;
-        val
-    }
-
-    #[inline(always)]
-    pub fn read_u16(&mut self) -> u16 {
-        u16::from_le_bytes(self.read_array())
-    }
-
-    #[inline(always)]
-    pub fn read_u32(&mut self) -> u32 {
-        u32::from_le_bytes(self.read_array())
-    }
-
-    #[inline(always)]
-    pub fn read_i32(&mut self) -> i32 {
-        i32::from_le_bytes(self.read_array())
-    }
-
-    #[inline(always)]
-    pub fn read_i64(&mut self) -> i64 {
-        i64::from_le_bytes(self.read_array())
-    }
-
-    #[inline(always)]
-    pub fn read_f64(&mut self) -> f64 {
-        f64::from_le_bytes(self.read_array())
-    }
-
-    #[inline(always)]
-    pub fn read_string_id(&mut self) -> StringId {
-        let raw = self.read_u32();
-        #[allow(clippy::unwrap_used)]
-        StringId(string_interner::symbol::SymbolU32::try_from_usize(raw as usize).unwrap())
-    }
-
-    #[inline(always)]
-    pub fn read_operand_data<C: VmRuntimeCtx>(&mut self, ctx: &C) -> OperandData {
-        let tag = self.read_u8();
-        let Ok(ty) = OperandType::try_from_primitive(tag)
-            .map_err(|err| panic!("unknown operand tag: {:#04x}", err.number));
-        match ty {
-            OperandType::Const => {
-                let id = self.read_u32();
-                OperandData::Const(ctx.get_const(id))
-            }
-            OperandType::BigInt => {
-                let val = self.read_i64();
-                OperandData::BigInt(val)
-            }
-            OperandType::Local => {
-                let layer = self.read_u8();
-                let idx = self.read_u32();
-                OperandData::Local { layer, idx }
-            }
-            OperandType::BuiltinConst => {
-                let id = self.read_string_id();
-                OperandData::BuiltinConst(id)
-            }
-            OperandType::Builtins => OperandData::Builtins,
-            OperandType::ReplBinding => {
-                let id = self.read_string_id();
-                OperandData::ReplBinding(id)
-            }
-            OperandType::ScopedImportBinding => {
-                let slot_id = self.read_u32();
-                let name = self.read_string_id();
-                OperandData::ScopedImportBinding { slot_id, name }
-            }
-        }
-    }
-
-    pub fn pc(&self) -> usize {
-        self.pc
-    }
-
-    pub fn set_pc(&mut self, pc: usize) {
-        self.pc = pc;
-    }
-
-    pub fn inst_start_pc(&self) -> usize {
-        self.inst_start_pc
-    }
-}

fix-builtins/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "fix-builtins"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-num_enum = { workspace = true }
-gc-arena = { workspace = true }

fix-builtins/src/lib.rs

@@ -1,399 +0,0 @@
-use gc_arena::Collect;
-use num_enum::TryFromPrimitive;
-
-macro_rules! define_builtins {
-    ($(($name:literal, $variant:ident, $arity:expr)),* $(,)?) => {
-        /// Builtin function registry.
-        /// Array index IS the PrimOp id. (name, arity) pairs.
-        pub const BUILTINS: &[(&str, u8)] = &[
-            $(($name, $arity),)*
-        ];
-
-        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, TryFromPrimitive, Collect)]
-        #[repr(u8)]
-        #[collect(require_static)]
-        pub enum BuiltinId {
-            $($variant,)*
-        }
-    };
-}
-
-define_builtins! {
-    ("abort",                    Abort,                    1),
-    ("__add",                      Add,                      2),
-    ("__addErrorContext",          AddErrorContext,           2),
-    ("__all",                      All,                      2),
-    ("__any",                      Any,                      2),
-    ("__appendContext",            AppendContext,             2),
-    ("__attrNames",                AttrNames,                1),
-    ("__attrValues",               AttrValues,               1),
-    ("baseNameOf",               BaseNameOf,               1),
-    ("__bitAnd",                   BitAnd,                   2),
-    ("__bitOr",                    BitOr,                    2),
-    ("__bitXor",                   BitXor,                   2),
-    ("break",                    Break,                    1),
-    ("__catAttrs",                 CatAttrs,                 2),
-    ("__ceil",                     Ceil,                     1),
-    ("__compareVersions",          CompareVersions,          2),
-    ("__concatLists",              ConcatLists,              1),
-    ("__concatMap",                ConcatMap,                2),
-    ("__concatStringsSep",         ConcatStringsSep,         2),
-    ("__convertHash",              ConvertHash,              1),
-    ("__deepSeq",                  DeepSeq,                  2),
-    ("derivation",               Derivation,               1),
-    ("derivationStrict",         DerivationStrict,         1),
-    ("dirOf",                    DirOf,                    1),
-    ("__div",                      Div,                      2),
-    ("__elem",                     Elem,                     2),
-    ("__elemAt",                   ElemAt,                   2),
-    ("fetchGit",                 FetchGit,                 1),
-    ("fetchMercurial",           FetchMercurial,           1),
-    ("fetchTarball",             FetchTarball,             1),
-    ("fetchTree",                FetchTree,                1),
-    ("__fetchurl",                 FetchUrl,                 1),
-    ("__filter",                   Filter,                   2),
-    ("__filterSource",             FilterSource,             2),
-    ("__findFile",                 FindFile,                 2),
-    ("__floor",                    Floor,                    1),
-    ("__foldl'",                   FoldlStrict,              3),
-    ("__fromJSON",                 FromJSON,                 1),
-    ("fromTOML",                 FromTOML,                 1),
-    ("__functionArgs",             FunctionArgs,             1),
-    ("__genList",                  GenList,                  2),
-    ("__genericClosure",           GenericClosure,           1),
-    ("__getAttr",                  GetAttr,                  2),
-    ("__getContext",               GetContext,               1),
-    ("__getEnv",                   GetEnv,                   1),
-    ("__groupBy",                  GroupBy,                  2),
-    ("__hasAttr",                  HasAttr,                  2),
-    ("__hasContext",               HasContext,               1),
-    ("__hashFile",                 HashFile,                 2),
-    ("__hashString",               HashString,               2),
-    ("__head",                     Head,                     1),
-    ("import",                   Import,                   1),
-    ("__intersectAttrs",           IntersectAttrs,           2),
-    ("__isAttrs",                  IsAttrs,                  1),
-    ("__isBool",                   IsBool,                   1),
-    ("__isFloat",                  IsFloat,                  1),
-    ("__isFunction",               IsFunction,               1),
-    ("__isInt",                    IsInt,                    1),
-    ("__isList",                   IsList,                   1),
-    ("isNull",                   IsNull,                   1),
-    ("__isPath",                   IsPath,                   1),
-    ("__isString",                 IsString,                 1),
-    ("__length",                   Length,                   1),
-    ("__lessThan",                 LessThan,                 2),
-    ("__listToAttrs",              ListToAttrs,              1),
-    ("map",                      Map,                      2),
-    ("__mapAttrs",                 MapAttrs,                 2),
-    ("__match",                    Match,                    2),
-    ("__mul",                      Mul,                      2),
-    ("__parseDrvName",             ParseDrvName,             1),
-    ("__partition",                Partition,                2),
-    ("__path",                     Path,                     1),
-    ("__pathExists",               PathExists,               1),
-    ("placeholder",              Placeholder,              1),
-    ("__readDir",                  ReadDir,                  1),
-    ("__readFile",                 ReadFile,                 1),
-    ("__readFileType",             ReadFileType,             1),
-    ("removeAttrs",              RemoveAttrs,              2),
-    ("__replaceStrings",           ReplaceStrings,           3),
-    ("scopedImport",             ScopedImport,             2),
-    ("__seq",                      Seq,                      2),
-    ("__sort",                     Sort,                     2),
-    ("__split",                    Split,                    2),
-    ("__splitVersion",             SplitVersion,             1),
-    ("__storePath",                StorePath,                1),
-    ("__stringLength",             StringLength,             1),
-    ("__sub",                      Sub,                      2),
-    ("__substring",                Substring,                3),
-    ("__tail",                     Tail,                     1),
-    ("throw",                    Throw,                    1),
-    ("__toFile",                   ToFile,                   2),
-    ("__toJSON",                   ToJSON,                   1),
-    ("__toPath",                   ToPath,                   1),
-    ("toString",                 ToString,                 1),
-    ("__toXML",                    ToXML,                    1),
-    ("__trace",                    Trace,                    2),
-    ("__tryEval",                  TryEval,                  1),
-    ("__typeOf",                   TypeOf,                   1),
-    ("__unsafeDiscardStringContext", UnsafeDiscardStringContext, 1),
-    ("__unsafeDiscardOutputDependency", UnsafeDiscardOutputDependency, 1),
-    ("__unsafeGetAttrPos",         UnsafeGetAttrPos,         2),
-    ("__warn",                     Warn,                     2),
-    ("__zipAttrsWith",             ZipAttrsWith,             2),
-}
-
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
-pub enum PrimOpPhase {
-    Abort,
-    Add,
-    AddErrorContext,
-    All,
-    Any,
-    AppendContext,
-    AttrNames,
-    AttrValues,
-    BaseNameOf,
-    BitAnd,
-    BitOr,
-    BitXor,
-    Break,
-    CatAttrs,
-    Ceil,
-    CompareVersions,
-    ConcatLists,
-    ConcatMap,
-    ConcatStringsSep,
-    ConvertHash,
-
-    DeepSeq,
-    DeepSeqPush,
-    DeepSeqLoop,
-
-    Derivation,
-    DerivationStrict,
-    DirOf,
-    Div,
-    Elem,
-    ElemAt,
-    FetchGit,
-    FetchMercurial,
-    FetchTarball,
-    FetchTree,
-    FetchUrl,
-
-    FilterForceList,
-    FilterCallPred,
-    FilterCheck,
-
-    FilterSource,
-    FindFile,
-    Floor,
-    FoldlStrict,
-    FoldlStrictEmpty,
-    FoldlStrictCall1,
-    FoldlStrictCall2,
-    FoldlStrictUpdate,
-    FromJSON,
-    FromTOML,
-    FunctionArgs,
-    GenList,
-    GenericClosure,
-    GetAttr,
-    GetContext,
-    GetEnv,
-    GroupBy,
-    HasAttr,
-    HasContext,
-    HashFile,
-    HashString,
-    Head,
-    Import,
-    IntersectAttrs,
-    IsAttrs,
-    IsBool,
-    IsFloat,
-    IsFunction,
-    IsInt,
-    IsList,
-    IsNull,
-    IsPath,
-    IsString,
-    Length,
-    LessThan,
-    ListToAttrs,
-    Map,
-    MapAttrs,
-    Match,
-    Mul,
-    ParseDrvName,
-    Partition,
-    Path,
-    PathExists,
-    Placeholder,
-    ReadDir,
-    ReadFile,
-    ReadFileType,
-    RemoveAttrs,
-    ReplaceStrings,
-    ScopedImport,
-    Seq,
-    Sort,
-    Split,
-    SplitVersion,
-    StorePath,
-    StringLength,
-    Sub,
-    Substring,
-    Tail,
-    Throw,
-    ToFile,
-    ToJSON,
-    ToPath,
-    ToString,
-    ToXML,
-    Trace,
-    TryEval,
-    TypeOf,
-    UnsafeDiscardStringContext,
-    UnsafeGetAttrPos,
-    Warn,
-    ZipAttrsWith,
-
-    ForceResultShallow,
-    ForceResultShallowPush,
-    ForceResultShallowLoop,
-    ForceResultDeepFinish,
-
-    EqStep,
-    EqForce,
-
-    // TODO: split into separate enums
-    CallPattern,
-    CallFunctor1,
-    CallFunctor2,
-
-    ImportFinalize,
-    ScopedImportFinalize,
-
-    AppendContextLoop,
-    AppendContextEntryForced,
-    AppendContextOutputsForced,
-    AppendContextOutputElementLoop,
-    AppendContextOutputElementForced,
-
-    UnsafeDiscardOutputDependency,
-
-    Illegal,
-}
-
-impl TryFrom<u8> for PrimOpPhase {
-    type Error = u8;
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        if (0..Self::Illegal as u8).contains(&value) {
-            Ok(unsafe { std::mem::transmute::<u8, Self>(value) })
-        } else {
-            Err(value)
-        }
-    }
-}
-
-impl BuiltinId {
-    #[inline(always)]
-    pub fn entry_phase(self) -> PrimOpPhase {
-        use BuiltinId::*;
-        match self {
-            Abort => PrimOpPhase::Abort,
-            Add => PrimOpPhase::Add,
-            AddErrorContext => PrimOpPhase::AddErrorContext,
-            All => PrimOpPhase::All,
-            Any => PrimOpPhase::Any,
-            AppendContext => PrimOpPhase::AppendContext,
-            AttrNames => PrimOpPhase::AttrNames,
-            AttrValues => PrimOpPhase::AttrValues,
-            BaseNameOf => PrimOpPhase::BaseNameOf,
-            BitAnd => PrimOpPhase::BitAnd,
-            BitOr => PrimOpPhase::BitOr,
-            BitXor => PrimOpPhase::BitXor,
-            Break => PrimOpPhase::Break,
-            CatAttrs => PrimOpPhase::CatAttrs,
-            Ceil => PrimOpPhase::Ceil,
-            CompareVersions => PrimOpPhase::CompareVersions,
-            ConcatLists => PrimOpPhase::ConcatLists,
-            ConcatMap => PrimOpPhase::ConcatMap,
-            ConcatStringsSep => PrimOpPhase::ConcatStringsSep,
-            ConvertHash => PrimOpPhase::ConvertHash,
-            DeepSeq => PrimOpPhase::DeepSeq,
-            Derivation => PrimOpPhase::Derivation,
-            DerivationStrict => PrimOpPhase::DerivationStrict,
-            DirOf => PrimOpPhase::DirOf,
-            Div => PrimOpPhase::Div,
-            Elem => PrimOpPhase::Elem,
-            ElemAt => PrimOpPhase::ElemAt,
-            FetchGit => PrimOpPhase::FetchGit,
-            FetchMercurial => PrimOpPhase::FetchMercurial,
-            FetchTarball => PrimOpPhase::FetchTarball,
-            FetchTree => PrimOpPhase::FetchTree,
-            FetchUrl => PrimOpPhase::FetchUrl,
-            Filter => PrimOpPhase::FilterForceList,
-            FilterSource => PrimOpPhase::FilterSource,
-            FindFile => PrimOpPhase::FindFile,
-            Floor => PrimOpPhase::Floor,
-            FoldlStrict => PrimOpPhase::FoldlStrict,
-            FromJSON => PrimOpPhase::FromJSON,
-            FromTOML => PrimOpPhase::FromTOML,
-            FunctionArgs => PrimOpPhase::FunctionArgs,
-            GenList => PrimOpPhase::GenList,
-            GenericClosure => PrimOpPhase::GenericClosure,
-            GetAttr => PrimOpPhase::GetAttr,
-            GetContext => PrimOpPhase::GetContext,
-            GetEnv => PrimOpPhase::GetEnv,
-            GroupBy => PrimOpPhase::GroupBy,
-            HasAttr => PrimOpPhase::HasAttr,
-            HasContext => PrimOpPhase::HasContext,
-            HashFile => PrimOpPhase::HashFile,
-            HashString => PrimOpPhase::HashString,
-            Head => PrimOpPhase::Head,
-            Import => PrimOpPhase::Import,
-            IntersectAttrs => PrimOpPhase::IntersectAttrs,
-            IsAttrs => PrimOpPhase::IsAttrs,
-            IsBool => PrimOpPhase::IsBool,
-            IsFloat => PrimOpPhase::IsFloat,
-            IsFunction => PrimOpPhase::IsFunction,
-            IsInt => PrimOpPhase::IsInt,
-            IsList => PrimOpPhase::IsList,
-            IsNull => PrimOpPhase::IsNull,
-            IsPath => PrimOpPhase::IsPath,
-            IsString => PrimOpPhase::IsString,
-            Length => PrimOpPhase::Length,
-            LessThan => PrimOpPhase::LessThan,
-            ListToAttrs => PrimOpPhase::ListToAttrs,
-            Map => PrimOpPhase::Map,
-            MapAttrs => PrimOpPhase::MapAttrs,
-            Match => PrimOpPhase::Match,
-            Mul => PrimOpPhase::Mul,
-            ParseDrvName => PrimOpPhase::ParseDrvName,
-            Partition => PrimOpPhase::Partition,
-            Path => PrimOpPhase::Path,
-            PathExists => PrimOpPhase::PathExists,
-            Placeholder => PrimOpPhase::Placeholder,
-            ReadDir => PrimOpPhase::ReadDir,
-            ReadFile => PrimOpPhase::ReadFile,
-            ReadFileType => PrimOpPhase::ReadFileType,
-            RemoveAttrs => PrimOpPhase::RemoveAttrs,
-            ReplaceStrings => PrimOpPhase::ReplaceStrings,
-            ScopedImport => PrimOpPhase::ScopedImport,
-            Seq => PrimOpPhase::Seq,
-            Sort => PrimOpPhase::Sort,
-            Split => PrimOpPhase::Split,
-            SplitVersion => PrimOpPhase::SplitVersion,
-            StorePath => PrimOpPhase::StorePath,
-            StringLength => PrimOpPhase::StringLength,
-            Sub => PrimOpPhase::Sub,
-            Substring => PrimOpPhase::Substring,
-            Tail => PrimOpPhase::Tail,
-            Throw => PrimOpPhase::Throw,
-            ToFile => PrimOpPhase::ToFile,
-            ToJSON => PrimOpPhase::ToJSON,
-            ToPath => PrimOpPhase::ToPath,
-            ToString => PrimOpPhase::ToString,
-            ToXML => PrimOpPhase::ToXML,
-            Trace => PrimOpPhase::Trace,
-            TryEval => PrimOpPhase::TryEval,
-            TypeOf => PrimOpPhase::TypeOf,
-            UnsafeDiscardStringContext => PrimOpPhase::UnsafeDiscardStringContext,
-            UnsafeDiscardOutputDependency => PrimOpPhase::UnsafeDiscardOutputDependency,
-            UnsafeGetAttrPos => PrimOpPhase::UnsafeGetAttrPos,
-            Warn => PrimOpPhase::Warn,
-            ZipAttrsWith => PrimOpPhase::ZipAttrsWith,
-        }
-    }
-}
-
-impl PrimOpPhase {
-    pub fn ip(self) -> u32 {
-        self as u32 * 2
-    }
-}

fix-bytecode/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "fix-bytecode"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+colored = "3.1.1"
+num_enum = { workspace = true }
+string-interner = { workspace = true }
+
+fix-lang = { path = "../fix-lang" }

fix-bytecode/src/disassembler.rs

@@ -1,10 +1,8 @@
 use std::fmt::Write;
 
-use colored::Colorize;
-use fix_builtins::BuiltinId;
-use num_enum::TryFromPrimitive;
+use colored::Colorize as _;
 
-use crate::{InstructionPtr, Op, OperandType};
+use crate::{InstructionPtr, Op, OperandType, PrimOpPhase};
 
 pub trait DisassemblerContext {
     fn resolve_string(&self, id: u32) -> &str;
@@ -82,7 +80,7 @@ impl<'a, Ctx: DisassemblerContext> Disassembler<'a, Ctx> {
     fn read_operand_data(&mut self) {
         use OperandType::*;
         let tag = self.read_u8();
-        let ty = OperandType::try_from_primitive(tag).expect("invalid operand type");
+        let ty = OperandType::try_from(tag).expect("invalid operand type");
         match ty {
             Const => {
                 self.read_u32();
@@ -202,7 +200,7 @@ impl<'a, Ctx: DisassemblerContext> Disassembler<'a, Ctx> {
     }
 
     fn decode_instruction(&mut self, op_byte: u8, current_pc: usize) -> (&'static str, String) {
-        let op = Op::try_from_primitive(op_byte).expect("invalid op code");
+        let op = Op::try_from(op_byte).expect("invalid op code");
 
         match op {
             Op::PushSmi => {
@@ -297,8 +295,8 @@ impl<'a, Ctx: DisassemblerContext> Disassembler<'a, Ctx> {
                 ("Call", "arg=?".into())
             }
             Op::DispatchPrimOp => {
-                let id = BuiltinId::try_from_primitive(self.read_u8()).expect("invalid builtin id");
-                ("DispatchPrimOp", format!("id={id:?}"))
+                let phase = PrimOpPhase::try_from(self.read_u8()).expect("invalid primop phase");
+                ("DispatchPrimOp", format!("phase={phase:?}"))
             }
 
             Op::MakeAttrs => {

fix-bytecode/src/lib.rs

@@ -0,0 +1,532 @@
+#![allow(dead_code)]
+
+use fix_lang::{BuiltinId, StringId};
+use num_enum::TryFromPrimitive;
+use string_interner::Symbol as _;
+
+pub mod disassembler;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct InstructionPtr(pub usize);
+
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, TryFromPrimitive)]
+#[allow(clippy::enum_variant_names)]
+pub enum Op {
+    PushSmi,
+    PushBigInt,
+    PushFloat,
+    PushString,
+    PushNull,
+    PushTrue,
+    PushFalse,
+
+    LoadLocal,
+    LoadOuter,
+    StoreLocal,
+    AllocLocals,
+
+    MakeThunk,
+    MakeClosure,
+    MakePatternClosure,
+
+    Call,
+    DispatchPrimOp,
+
+    MakeAttrs,
+    MakeEmptyAttrs,
+    SelectStatic,
+    SelectDynamic,
+    HasAttrPathStatic,
+    HasAttrPathDynamic,
+    HasAttrStatic,
+    HasAttrDynamic,
+    HasAttrResolve,
+    JumpIfSelectSucceeded,
+    JumpIfSelectFailed,
+
+    MakeList,
+    MakeEmptyList,
+
+    OpAdd,
+    OpSub,
+    OpMul,
+    OpDiv,
+    OpEq,
+    OpNeq,
+    OpLt,
+    OpGt,
+    OpLeq,
+    OpGeq,
+    OpConcat,
+    OpUpdate,
+
+    OpNeg,
+    OpNot,
+
+    JumpIfFalse,
+    JumpIfTrue,
+    Jump,
+
+    CoerceToString,
+
+    ConcatStrings,
+    ResolvePath,
+
+    Assert,
+
+    LookupWith,
+
+    LoadBuiltins,
+    LoadBuiltin,
+
+    LoadReplBinding,
+    LoadScopedBinding,
+
+    Return,
+
+    Illegal,
+}
+
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, TryFromPrimitive)]
+pub enum OperandType {
+    Const,
+    BigInt,
+    Local,
+    BuiltinConst,
+    Builtins,
+    ReplBinding,
+    ScopedImportBinding,
+}
+
+pub enum Const {
+    Smi(i32),
+    Float(f64),
+    Bool(bool),
+    String(StringId),
+    Path(StringId),
+    PrimOp {
+        id: BuiltinId,
+        arity: u8,
+        dispatch_ip: u32,
+    },
+    Null,
+}
+
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, TryFromPrimitive)]
+pub enum AttrKeyType {
+    Static,
+    Dynamic,
+}
+
+pub enum OperandData {
+    Const(u32),
+    BigInt(i64),
+    Local { layer: u8, idx: u32 },
+    BuiltinConst(StringId),
+    Builtins,
+    ReplBinding(StringId),
+    ScopedImportBinding { slot_id: u32, name: StringId },
+}
+
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
+pub enum PrimOpPhase {
+    Abort,
+    Add,
+    AddErrorContext,
+
+    All,
+    AllCallPred,
+    AllCheck,
+
+    Any,
+    AnyCallPred,
+    AnyCheck,
+
+    AppendContext,
+    AttrNames,
+    AttrValues,
+    BaseNameOf,
+    BitAnd,
+    BitOr,
+    BitXor,
+    Break,
+    CatAttrs,
+    Ceil,
+    CompareVersions,
+    ConcatLists,
+    ConcatMap,
+    ConcatStringsSep,
+    ConvertHash,
+
+    DeepSeq,
+    DeepSeqPush,
+    DeepSeqLoop,
+
+    Derivation,
+    DerivationStrict,
+    DirOf,
+    Div,
+    Elem,
+    ElemAt,
+    FetchGit,
+    FetchMercurial,
+    FetchTarball,
+    FetchTree,
+    FetchUrl,
+
+    FilterForceList,
+    FilterCallPred,
+    FilterCheck,
+
+    FilterSource,
+    FindFile,
+    Floor,
+    FoldlStrict,
+    FoldlStrictEmpty,
+    FoldlStrictCall1,
+    FoldlStrictCall2,
+    FoldlStrictUpdate,
+    FromJSON,
+    FromTOML,
+    FunctionArgs,
+    GenList,
+    GenericClosure,
+    GetAttr,
+    GetContext,
+    GetEnv,
+    GroupBy,
+    HasAttr,
+    HasContext,
+    HashFile,
+    HashString,
+    Head,
+    Import,
+    IntersectAttrs,
+    IsAttrs,
+    IsBool,
+    IsFloat,
+    IsFunction,
+    IsInt,
+    IsList,
+    IsNull,
+    IsPath,
+    IsString,
+    Length,
+    LessThan,
+    ListToAttrs,
+    Map,
+    MapAttrs,
+    Match,
+    Mul,
+    ParseDrvName,
+    Partition,
+    Path,
+    PathExists,
+    Placeholder,
+    ReadDir,
+    ReadFile,
+    ReadFileType,
+    RemoveAttrs,
+    ReplaceStrings,
+    ScopedImport,
+    Seq,
+    Sort,
+    Split,
+    SplitVersion,
+    StorePath,
+    StringLength,
+    Sub,
+    Substring,
+    Tail,
+    Throw,
+    ToFile,
+    ToJSON,
+    ToPath,
+    ToString,
+    ToXML,
+    Trace,
+    TryEval,
+    TypeOf,
+    UnsafeDiscardStringContext,
+    UnsafeGetAttrPos,
+    Warn,
+    ZipAttrsWith,
+
+    ForceResultShallow,
+    ForceResultShallowPush,
+    ForceResultShallowLoop,
+    ForceResultDeepFinish,
+
+    EqStep,
+    EqForce,
+
+    CallPattern,
+    CallFunctor1,
+    CallFunctor2,
+
+    ImportFinalize,
+    ScopedImportFinalize,
+
+    AppendContextLoop,
+    AppendContextEntryForced,
+    AppendContextOutputsForced,
+    AppendContextOutputElementLoop,
+    AppendContextOutputElementForced,
+
+    UnsafeDiscardOutputDependency,
+
+    Illegal,
+}
+
+impl TryFrom<u8> for PrimOpPhase {
+    type Error = u8;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        if (0..Self::Illegal as u8).contains(&value) {
+            Ok(unsafe { std::mem::transmute::<u8, Self>(value) })
+        } else {
+            Err(value)
+        }
+    }
+}
+
+impl PrimOpPhase {
+    pub fn entry_for_builtin(id: BuiltinId) -> Self {
+        use BuiltinId::*;
+        match id {
+            Abort => Self::Abort,
+            Add => Self::Add,
+            AddErrorContext => Self::AddErrorContext,
+            All => Self::All,
+            Any => Self::Any,
+            AppendContext => Self::AppendContext,
+            AttrNames => Self::AttrNames,
+            AttrValues => Self::AttrValues,
+            BaseNameOf => Self::BaseNameOf,
+            BitAnd => Self::BitAnd,
+            BitOr => Self::BitOr,
+            BitXor => Self::BitXor,
+            Break => Self::Break,
+            CatAttrs => Self::CatAttrs,
+            Ceil => Self::Ceil,
+            CompareVersions => Self::CompareVersions,
+            ConcatLists => Self::ConcatLists,
+            ConcatMap => Self::ConcatMap,
+            ConcatStringsSep => Self::ConcatStringsSep,
+            ConvertHash => Self::ConvertHash,
+            DeepSeq => Self::DeepSeq,
+            Derivation => Self::Derivation,
+            DerivationStrict => Self::DerivationStrict,
+            DirOf => Self::DirOf,
+            Div => Self::Div,
+            Elem => Self::Elem,
+            ElemAt => Self::ElemAt,
+            FetchGit => Self::FetchGit,
+            FetchMercurial => Self::FetchMercurial,
+            FetchTarball => Self::FetchTarball,
+            FetchTree => Self::FetchTree,
+            FetchUrl => Self::FetchUrl,
+            Filter => Self::FilterForceList,
+            FilterSource => Self::FilterSource,
+            FindFile => Self::FindFile,
+            Floor => Self::Floor,
+            FoldlStrict => Self::FoldlStrict,
+            FromJSON => Self::FromJSON,
+            FromTOML => Self::FromTOML,
+            FunctionArgs => Self::FunctionArgs,
+            GenList => Self::GenList,
+            GenericClosure => Self::GenericClosure,
+            GetAttr => Self::GetAttr,
+            GetContext => Self::GetContext,
+            GetEnv => Self::GetEnv,
+            GroupBy => Self::GroupBy,
+            HasAttr => Self::HasAttr,
+            HasContext => Self::HasContext,
+            HashFile => Self::HashFile,
+            HashString => Self::HashString,
+            Head => Self::Head,
+            Import => Self::Import,
+            IntersectAttrs => Self::IntersectAttrs,
+            IsAttrs => Self::IsAttrs,
+            IsBool => Self::IsBool,
+            IsFloat => Self::IsFloat,
+            IsFunction => Self::IsFunction,
+            IsInt => Self::IsInt,
+            IsList => Self::IsList,
+            IsNull => Self::IsNull,
+            IsPath => Self::IsPath,
+            IsString => Self::IsString,
+            Length => Self::Length,
+            LessThan => Self::LessThan,
+            ListToAttrs => Self::ListToAttrs,
+            Map => Self::Map,
+            MapAttrs => Self::MapAttrs,
+            Match => Self::Match,
+            Mul => Self::Mul,
+            ParseDrvName => Self::ParseDrvName,
+            Partition => Self::Partition,
+            Path => Self::Path,
+            PathExists => Self::PathExists,
+            Placeholder => Self::Placeholder,
+            ReadDir => Self::ReadDir,
+            ReadFile => Self::ReadFile,
+            ReadFileType => Self::ReadFileType,
+            RemoveAttrs => Self::RemoveAttrs,
+            ReplaceStrings => Self::ReplaceStrings,
+            ScopedImport => Self::ScopedImport,
+            Seq => Self::Seq,
+            Sort => Self::Sort,
+            Split => Self::Split,
+            SplitVersion => Self::SplitVersion,
+            StorePath => Self::StorePath,
+            StringLength => Self::StringLength,
+            Sub => Self::Sub,
+            Substring => Self::Substring,
+            Tail => Self::Tail,
+            Throw => Self::Throw,
+            ToFile => Self::ToFile,
+            ToJSON => Self::ToJSON,
+            ToPath => Self::ToPath,
+            ToString => Self::ToString,
+            ToXML => Self::ToXML,
+            Trace => Self::Trace,
+            TryEval => Self::TryEval,
+            TypeOf => Self::TypeOf,
+            UnsafeDiscardStringContext => Self::UnsafeDiscardStringContext,
+            UnsafeDiscardOutputDependency => Self::UnsafeDiscardOutputDependency,
+            UnsafeGetAttrPos => Self::UnsafeGetAttrPos,
+            Warn => Self::Warn,
+            ZipAttrsWith => Self::ZipAttrsWith,
+        }
+    }
+
+    pub fn ip(self) -> u32 {
+        self as u32 * 2
+    }
+}
+
+pub struct BytecodeReader<'a> {
+    bytecode: &'a [u8],
+    pc: usize,
+    inst_start_pc: usize,
+}
+
+impl<'a> BytecodeReader<'a> {
+    pub fn new(bytecode: &'a [u8], pc: usize) -> Self {
+        Self {
+            bytecode,
+            pc,
+            inst_start_pc: pc,
+        }
+    }
+
+    #[inline(always)]
+    pub fn from_after_op(bytecode: &'a [u8], inst_start_pc: usize) -> Self {
+        Self {
+            bytecode,
+            pc: inst_start_pc + 1,
+            inst_start_pc,
+        }
+    }
+
+    #[inline(always)]
+    #[cfg_attr(debug_assertions, track_caller)]
+    fn read_array<const N: usize>(&mut self) -> [u8; N] {
+        let ret = self.bytecode[self.pc..self.pc + N]
+            .try_into()
+            .expect("read_array failed");
+        self.pc += N;
+        ret
+    }
+
+    #[inline(always)]
+    pub fn read_op(&mut self) -> Op {
+        self.inst_start_pc = self.pc;
+        let byte = self.bytecode[self.pc];
+        if !(0..Op::Illegal as u8).contains(&byte) {
+            std::hint::cold_path();
+            panic!("unknown opcode: {byte:#04x}")
+        }
+        self.pc += 1;
+        unsafe { std::mem::transmute::<u8, Op>(byte) }
+    }
+
+    #[inline(always)]
+    pub fn read_u8(&mut self) -> u8 {
+        let val = self.bytecode[self.pc];
+        self.pc += 1;
+        val
+    }
+
+    #[inline(always)]
+    pub fn read_u16(&mut self) -> u16 {
+        u16::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub fn read_u32(&mut self) -> u32 {
+        u32::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub fn read_i32(&mut self) -> i32 {
+        i32::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub fn read_i64(&mut self) -> i64 {
+        i64::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub fn read_f64(&mut self) -> f64 {
+        f64::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub fn read_string_id(&mut self) -> StringId {
+        let raw = self.read_u32();
+        #[allow(clippy::unwrap_used)]
+        StringId(string_interner::symbol::SymbolU32::try_from_usize(raw as usize).unwrap())
+    }
+
+    #[inline(always)]
+    pub fn read_operand_data(&mut self) -> OperandData {
+        let tag = self.read_u8();
+        let Ok(ty) = OperandType::try_from_primitive(tag)
+            .map_err(|err| panic!("unknown operand tag: {:#04x}", err.number));
+        match ty {
+            OperandType::Const => OperandData::Const(self.read_u32()),
+            OperandType::BigInt => OperandData::BigInt(self.read_i64()),
+            OperandType::Local => {
+                let layer = self.read_u8();
+                let idx = self.read_u32();
+                OperandData::Local { layer, idx }
+            }
+            OperandType::BuiltinConst => OperandData::BuiltinConst(self.read_string_id()),
+            OperandType::Builtins => OperandData::Builtins,
+            OperandType::ReplBinding => OperandData::ReplBinding(self.read_string_id()),
+            OperandType::ScopedImportBinding => {
+                let slot_id = self.read_u32();
+                let name = self.read_string_id();
+                OperandData::ScopedImportBinding { slot_id, name }
+            }
+        }
+    }
+
+    pub fn pc(&self) -> usize {
+        self.pc
+    }
+
+    pub fn set_pc(&mut self, pc: usize) {
+        self.pc = pc;
+    }
+
+    pub fn inst_start_pc(&self) -> usize {
+        self.inst_start_pc
+    }
+}

fix-codegen/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "fix-codegen"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-hashbrown = { workspace = true }
-num_enum = { workspace = true }
-rnix = { workspace = true }
-string-interner = { workspace = true }
-colored = "3.1.1"
-
-fix-builtins = { path = "../fix-builtins" }
-fix-common = { path = "../fix-common" }
-fix-ir = { path = "../fix-ir" }

fix-compiler/Cargo.toml

@@ -1,17 +1,19 @@
 [package]
-name = "fix-ir"
+name = "fix-compiler"
 version = "0.1.0"
 edition = "2024"
 
 [dependencies]
 bumpalo = { workspace = true }
+colored = "3.1.1"
 ghost-cell = { workspace = true }
+hashbrown = { workspace = true }
 rnix = { workspace = true }
 rowan = { workspace = true }
 string-interner = { workspace = true }
-hashbrown = { workspace = true }
-num_enum = { workspace = true }
 
-fix-builtins = { path = "../fix-builtins" }
-fix-common = { path = "../fix-common" }
+fix-bytecode = { path = "../fix-bytecode" }
 fix-error = { path = "../fix-error" }
+fix-lang = { path = "../fix-lang" }
+fix-runtime = { path = "../fix-runtime" }
+tracing = "0.1"

fix-compiler/src/context.rs

@@ -0,0 +1,542 @@
+use bumpalo::Bump;
+use fix_bytecode::{Const, InstructionPtr, Op, PrimOpPhase};
+use fix_error::{Error, Result, Source};
+use fix_lang::{StringId, Symbol};
+use fix_runtime::{StaticValue, VmCode, VmRuntimeCtx};
+use ghost_cell::{GhostCell, GhostToken};
+use hashbrown::{HashMap, HashSet};
+use string_interner::DefaultStringInterner;
+
+use crate::BytecodeContext;
+use crate::ir::downgrade::{Downgrade as _, DowngradeContext};
+use crate::ir::{
+    GhostMaybeThunkRef, GhostRoIrRef, GhostRoMaybeThunkRef, GhostRoRef, Ir, MaybeThunk, RawIrRef,
+    ThunkId,
+};
+
+pub struct CodeState {
+    pub bytecode: Vec<u8>,
+    pub sources: Vec<Source>,
+    pub spans: Vec<(usize, rnix::TextRange)>,
+    pub thunk_count: usize,
+    pub global_env: HashMap<StringId, MaybeThunk>,
+}
+
+impl CodeState {
+    pub fn new(strings: &mut DefaultStringInterner) -> Self {
+        let global_env = crate::ir::new_global_env(strings);
+        let mut bytecode = Vec::with_capacity(PrimOpPhase::Illegal as usize * 2);
+        for phase in 0..=PrimOpPhase::Illegal as u8 {
+            bytecode.push(Op::DispatchPrimOp as u8);
+            bytecode.push(phase);
+        }
+        Self {
+            sources: Vec::new(),
+            spans: Vec::new(),
+            thunk_count: 0,
+            bytecode,
+            global_env,
+        }
+    }
+
+    pub fn compile_bytecode<'ctx>(
+        &'ctx mut self,
+        source: Source,
+        extra_scope: Option<ExtraScope<'ctx>>,
+        runtime: &'ctx mut impl VmRuntimeCtx,
+    ) -> Result<InstructionPtr> {
+        let mut compiler = CompilerCtx {
+            code: self,
+            runtime,
+        };
+        compiler.compile_bytecode(source, extra_scope)
+    }
+}
+
+impl VmCode for CodeState {
+    fn bytecode(&self) -> &[u8] {
+        &self.bytecode
+    }
+
+    fn compile_with_scope(
+        &mut self,
+        source: Source,
+        extra_scope: Option<fix_runtime::ExtraScope>,
+        runtime: &mut impl VmRuntimeCtx,
+    ) -> Result<InstructionPtr> {
+        let extra = extra_scope.map(|s| match s {
+            fix_runtime::ExtraScope::ScopedImport { keys, slot_id } => {
+                ExtraScope::ScopedImport { keys, slot_id }
+            }
+        });
+        CodeState::compile_bytecode(self, source, extra, runtime)
+    }
+}
+
+struct CompilerCtx<'a, R: VmRuntimeCtx> {
+    code: &'a mut CodeState,
+    runtime: &'a mut R,
+}
+
+impl<'a, R: VmRuntimeCtx> CompilerCtx<'a, R> {
+    fn compile_bytecode(
+        &mut self,
+        source: Source,
+        extra_scope: Option<ExtraScope>,
+    ) -> Result<InstructionPtr> {
+        let root = self.downgrade(source, extra_scope)?;
+        let ip = crate::compile_bytecode(root.as_ref(), self);
+        Ok(ip)
+    }
+
+    fn downgrade(&mut self, source: Source, extra_scope: Option<ExtraScope>) -> Result<OwnedIr> {
+        tracing::debug!("Parsing Nix expression");
+
+        self.code.sources.push(source.clone());
+
+        let root = rnix::Root::parse(&source.src);
+        handle_parse_error(root.errors(), source.clone()).map_or(Ok(()), Err)?;
+
+        tracing::debug!("Downgrading Nix expression");
+        let expr = root
+            .tree()
+            .expr()
+            .ok_or_else(|| Error::parse_error("unexpected EOF".into()))?;
+        let bump = Bump::new();
+        GhostToken::new(|token| {
+            let downgrade_ctx = DowngradeCtx::new(
+                &bump,
+                token,
+                self.runtime,
+                &self.code.global_env,
+                extra_scope.map(Into::into),
+                &mut self.code.thunk_count,
+                source,
+            );
+            let ir = downgrade_ctx.downgrade_toplevel(expr)?;
+            let ir = unsafe { std::mem::transmute::<RawIrRef<'_>, RawIrRef<'static>>(ir) };
+            Ok(OwnedIr { _bump: bump, ir })
+        })
+    }
+}
+
+impl<'a, R: VmRuntimeCtx> BytecodeContext for CompilerCtx<'a, R> {
+    fn intern_string(&mut self, s: &str) -> StringId {
+        self.runtime.intern_string(s)
+    }
+
+    fn register_span(&mut self, range: rnix::TextRange) -> u32 {
+        let id = self.code.spans.len();
+        let source_id = self
+            .code
+            .sources
+            .len()
+            .checked_sub(1)
+            .expect("current_source not set");
+        self.code.spans.push((source_id, range));
+        id as u32
+    }
+
+    fn get_code(&self) -> &[u8] {
+        &self.code.bytecode
+    }
+
+    fn get_code_mut(&mut self) -> &mut Vec<u8> {
+        &mut self.code.bytecode
+    }
+
+    fn add_constant(&mut self, val: Const) -> u32 {
+        use Const::*;
+        let val = match val {
+            Smi(x) => StaticValue::new_inline(x),
+            Float(x) => StaticValue::new_float(x),
+            Bool(x) => StaticValue::new_inline(x),
+            String(x) => StaticValue::new_inline(x),
+            Path(x) => StaticValue::new_inline(fix_runtime::Path(x)),
+            PrimOp {
+                id,
+                arity,
+                dispatch_ip,
+            } => StaticValue::new_primop(id, arity, dispatch_ip),
+            Null => StaticValue::default(),
+        };
+        self.runtime.add_const(val)
+    }
+
+    fn current_source_dir(&mut self) -> StringId {
+        let dir = self
+            .code
+            .sources
+            .last()
+            .expect("current_source not set")
+            .get_dir()
+            .to_string_lossy()
+            .into_owned();
+        self.runtime.intern_string(dir)
+    }
+}
+
+fn parse_error_span(error: &rnix::ParseError) -> Option<rnix::TextRange> {
+    use rnix::ParseError::*;
+    match error {
+        Unexpected(range)
+        | UnexpectedExtra(range)
+        | UnexpectedWanted(_, range, _)
+        | UnexpectedDoubleBind(range)
+        | DuplicatedArgs(range, _) => Some(*range),
+        _ => None,
+    }
+}
+
+fn handle_parse_error<'a>(
+    errors: impl IntoIterator<Item = &'a rnix::ParseError>,
+    source: Source,
+) -> Option<Box<Error>> {
+    for err in errors {
+        if let Some(span) = parse_error_span(err) {
+            return Some(
+                Error::parse_error(err.to_string())
+                    .with_source(source)
+                    .with_span(span),
+            );
+        }
+    }
+    None
+}
+
+struct DowngradeCtx<'ctx, 'id, 'ir, R: VmRuntimeCtx> {
+    bump: &'ir Bump,
+    token: GhostToken<'id>,
+    runtime: &'ctx mut R,
+    source: Source,
+    scopes: Vec<Scope<'ctx, 'id, 'ir>>,
+    with_stack: Vec<GhostRoMaybeThunkRef<'id, 'ir>>,
+    thunk_count: &'ctx mut usize,
+    thunk_scopes: Vec<ThunkScope<'id, 'ir>>,
+}
+
+impl<'ctx, 'id, 'ir, R: VmRuntimeCtx> DowngradeCtx<'ctx, 'id, 'ir, R> {
+    fn new(
+        bump: &'ir Bump,
+        token: GhostToken<'id>,
+        runtime: &'ctx mut R,
+        global: &'ctx HashMap<StringId, MaybeThunk>,
+        extra_scope: Option<Scope<'ctx, 'id, 'ir>>,
+        thunk_count: &'ctx mut usize,
+        source: Source,
+    ) -> Self {
+        Self {
+            bump,
+            token,
+            runtime,
+            source,
+            scopes: std::iter::once(Scope::Global(global))
+                .chain(extra_scope)
+                .collect(),
+            thunk_count,
+            with_stack: Vec::new(),
+            thunk_scopes: vec![ThunkScope::new_in(bump)],
+        }
+    }
+}
+
+impl<'ctx: 'ir, 'id, 'ir, R: VmRuntimeCtx> DowngradeContext<'id, 'ir>
+    for DowngradeCtx<'ctx, 'id, 'ir, R>
+{
+    fn new_expr(&self, expr: Ir<'ir, GhostRoRef<'id, 'ir>>) -> GhostRoIrRef<'id, 'ir> {
+        self.bump.alloc(GhostCell::new(expr).into())
+    }
+
+    fn maybe_thunk(&mut self, ir: GhostRoIrRef<'id, 'ir>) -> GhostRoMaybeThunkRef<'id, 'ir> {
+        use MaybeThunk::*;
+        let expr = (|| {
+            let expr = match *ir.borrow(&self.token) {
+                Ir::Builtin(x) => Builtin(x),
+                Ir::Int(x) => Int(x),
+                Ir::Float(x) => Float(x),
+                Ir::Bool(x) => Bool(x),
+                Ir::Str(x) => Str(x),
+                Ir::Arg { layer } => Arg { layer },
+                Ir::Builtins => Builtins,
+                Ir::Null => Null,
+                Ir::MaybeThunk(thunk) => return Some(thunk),
+                _ => return None,
+            };
+            Some(self.bump.alloc(GhostCell::new(expr).into()))
+        })();
+        if let Some(thunk) = expr {
+            return thunk;
+        }
+        let id = ThunkId(*self.thunk_count);
+        *self.thunk_count = self.thunk_count.checked_add(1).expect("thunk id overflow");
+        self.thunk_scopes
+            .last_mut()
+            .expect("no active cache scope")
+            .add_binding(id, ir);
+        self.bump.alloc(GhostCell::new(Thunk(id)).into())
+    }
+
+    fn intern_string(&mut self, sym: impl AsRef<str>) -> StringId {
+        self.runtime.intern_string(sym)
+    }
+
+    fn resolve_sym(&self, id: StringId) -> Symbol<'_> {
+        self.runtime.resolve_string(id).into()
+    }
+
+    fn lookup(
+        &mut self,
+        sym: StringId,
+        span: rnix::TextRange,
+    ) -> Result<GhostRoMaybeThunkRef<'id, 'ir>> {
+        for scope in self.scopes.iter().rev() {
+            match scope {
+                &Scope::Global(global_scope) => {
+                    if let Some(expr) = global_scope.get(&sym) {
+                        return Ok(expr.into());
+                    }
+                }
+                &Scope::Repl(repl_bindings) => {
+                    if repl_bindings.contains(&sym) {
+                        return Ok(self
+                            .bump
+                            .alloc(GhostCell::new(MaybeThunk::ReplBinding(sym)).into()));
+                    }
+                }
+                &Scope::ScopedImport { ref keys, slot_id } => {
+                    if keys.contains(&sym) {
+                        return Ok(self.bump.alloc(
+                            GhostCell::new(MaybeThunk::ScopedImportBinding { sym, slot_id }).into(),
+                        ));
+                    }
+                }
+                Scope::Let(let_scope) => {
+                    if let Some(&expr) = let_scope.get(&sym) {
+                        return Ok(expr.into());
+                    }
+                }
+                &Scope::Param {
+                    sym: param_sym,
+                    abs_layer,
+                } => {
+                    if param_sym == sym {
+                        let layers: u8 =
+                            self.thunk_scopes.len().try_into().expect("scope too deep!");
+                        let layer = layers - abs_layer;
+                        return Ok(self
+                            .bump
+                            .alloc(GhostCell::new(MaybeThunk::Arg { layer }).into()));
+                    }
+                }
+            }
+        }
+
+        if !self.with_stack.is_empty() {
+            let id = ThunkId(*self.thunk_count);
+            *self.thunk_count = self.thunk_count.checked_add(1).expect("thunk id overflow");
+            let mut namespaces =
+                bumpalo::collections::Vec::with_capacity_in(self.with_stack.len(), self.bump);
+            namespaces.extend(self.with_stack.iter().rev().copied());
+            let body = self
+                .bump
+                .alloc(GhostCell::new(Ir::WithLookup { sym, namespaces }).into());
+            self.thunk_scopes
+                .last_mut()
+                .expect("no active thunk scope")
+                .add_binding(id, body);
+            Ok(self
+                .bump
+                .alloc(GhostCell::new(MaybeThunk::Thunk(id)).into()))
+        } else {
+            Err(Error::downgrade_error(
+                format!("'{}' not found", self.resolve_sym(sym)),
+                self.get_current_source(),
+                span,
+            ))
+        }
+    }
+
+    fn get_current_source(&self) -> Source {
+        self.source.clone()
+    }
+
+    fn with_let_scope<F, Ret>(&mut self, keys: &[StringId], f: F) -> Result<Ret>
+    where
+        F: FnOnce(
+            &mut Self,
+        ) -> Result<(
+            bumpalo::collections::Vec<'ir, GhostRoMaybeThunkRef<'id, 'ir>>,
+            Ret,
+        )>,
+    {
+        let base = *self.thunk_count;
+        *self.thunk_count = self
+            .thunk_count
+            .checked_add(keys.len())
+            .expect("thunk id overflow");
+        let handles = (base..base + keys.len())
+            .map(|id| {
+                &*self
+                    .bump
+                    .alloc(GhostCell::new(MaybeThunk::Thunk(ThunkId(id))))
+            })
+            .collect::<Vec<_>>();
+        let scope = keys.iter().copied().zip(handles.iter().copied()).collect();
+        self.scopes.push(Scope::Let(scope));
+        let (vals, ret) = { f(self)? };
+        self.scopes.pop();
+        assert_eq!(keys.len(), vals.len());
+        let scope = self.thunk_scopes.last_mut().expect("no active thunk scope");
+        for (i, (val, handle)) in vals.into_iter().zip(handles).enumerate() {
+            let thunk = *val.borrow(&self.token);
+            *handle.borrow_mut(&mut self.token) = thunk;
+            let id = ThunkId(base + i);
+            let ir_ref = self
+                .bump
+                .alloc(GhostCell::new(Ir::MaybeThunk(handle.into())).into());
+            scope.add_binding(id, ir_ref);
+        }
+        Ok(ret)
+    }
+
+    fn with_param_scope<F, Ret>(&mut self, sym: StringId, f: F) -> Ret
+    where
+        F: FnOnce(&mut Self) -> Ret,
+    {
+        self.scopes.push(Scope::Param {
+            sym,
+            abs_layer: self.thunk_scopes.len().try_into().expect("scope too deep!"),
+        });
+        let mut guard = ScopeGuard { ctx: self };
+        f(guard.as_ctx())
+    }
+
+    fn with_with_scope<F, Ret>(&mut self, namespace: GhostRoMaybeThunkRef<'id, 'ir>, f: F) -> Ret
+    where
+        F: FnOnce(&mut Self) -> Ret,
+    {
+        self.with_stack.push(namespace);
+        let ret = f(self);
+        self.with_stack.pop();
+        ret
+    }
+
+    fn with_thunk_scope<F, Ret>(
+        &mut self,
+        f: F,
+    ) -> (
+        Ret,
+        bumpalo::collections::Vec<'ir, (ThunkId, GhostRoIrRef<'id, 'ir>)>,
+    )
+    where
+        F: FnOnce(&mut Self) -> Ret,
+    {
+        if self.thunk_scopes.len() == u8::MAX as usize {
+            panic!("scope too deep!");
+        }
+        self.thunk_scopes.push(ThunkScope::new_in(self.bump));
+        let ret = f(self);
+        (
+            ret,
+            self.thunk_scopes
+                .pop()
+                .expect("no thunk scope left???")
+                .bindings,
+        )
+    }
+
+    fn bump(&self) -> &'ir bumpalo::Bump {
+        self.bump
+    }
+}
+
+impl<'id, 'ir, 'ctx: 'ir, R: VmRuntimeCtx> DowngradeCtx<'ctx, 'id, 'ir, R> {
+    fn downgrade_toplevel(mut self, root: rnix::ast::Expr) -> Result<RawIrRef<'ir>> {
+        let body = root.downgrade(&mut self)?;
+        let thunks = self
+            .thunk_scopes
+            .pop()
+            .expect("no thunk scope left???")
+            .bindings;
+        Ok(Ir::freeze(
+            self.new_expr(Ir::TopLevel { body, thunks }),
+            self.token,
+        ))
+    }
+}
+
+struct ThunkScope<'id, 'ir> {
+    bindings: bumpalo::collections::Vec<'ir, (ThunkId, GhostRoIrRef<'id, 'ir>)>,
+}
+
+impl<'id, 'ir> ThunkScope<'id, 'ir> {
+    fn new_in(bump: &'ir Bump) -> Self {
+        Self {
+            bindings: bumpalo::collections::Vec::new_in(bump),
+        }
+    }
+
+    fn add_binding(&mut self, id: ThunkId, ir: GhostRoIrRef<'id, 'ir>) {
+        self.bindings.push((id, ir));
+    }
+}
+
+enum Scope<'ctx, 'id, 'ir> {
+    Global(&'ctx HashMap<StringId, MaybeThunk>),
+    Repl(&'ctx HashSet<StringId>),
+    ScopedImport {
+        keys: HashSet<StringId>,
+        #[allow(dead_code)]
+        slot_id: u32,
+    },
+    Let(HashMap<StringId, GhostMaybeThunkRef<'id, 'ir>>),
+    Param {
+        sym: StringId,
+        abs_layer: u8,
+    },
+}
+
+pub enum ExtraScope<'ctx> {
+    Repl(&'ctx HashSet<StringId>),
+    ScopedImport {
+        keys: HashSet<StringId>,
+        slot_id: u32,
+    },
+}
+
+impl<'ctx> From<ExtraScope<'ctx>> for Scope<'ctx, '_, '_> {
+    fn from(value: ExtraScope<'ctx>) -> Self {
+        use ExtraScope::*;
+        match value {
+            ScopedImport { keys, slot_id } => Scope::ScopedImport { keys, slot_id },
+            Repl(scope) => Scope::Repl(scope),
+        }
+    }
+}
+
+struct ScopeGuard<'a, 'ctx, 'id, 'ir, R: VmRuntimeCtx> {
+    ctx: &'a mut DowngradeCtx<'ctx, 'id, 'ir, R>,
+}
+
+impl<'a, 'ctx, 'id, 'ir, R: VmRuntimeCtx> Drop for ScopeGuard<'a, 'ctx, 'id, 'ir, R> {
+    fn drop(&mut self) {
+        self.ctx.scopes.pop();
+    }
+}
+
+impl<'a, 'ctx, 'id, 'ir, R: VmRuntimeCtx> ScopeGuard<'a, 'ctx, 'id, 'ir, R> {
+    fn as_ctx(&mut self) -> &mut DowngradeCtx<'ctx, 'id, 'ir, R> {
+        self.ctx
+    }
+}
+
+struct OwnedIr {
+    _bump: Bump,
+    ir: RawIrRef<'static>,
+}
+
+impl OwnedIr {
+    fn as_ref<'ir>(&'ir self) -> RawIrRef<'ir> {
+        unsafe { std::mem::transmute::<RawIrRef<'static>, RawIrRef<'ir>>(self.ir) }
+    }
+}

fix-compiler/src/ir.rs

@@ -3,10 +3,8 @@ use std::marker::PhantomData;
 
 use bumpalo::Bump;
 use bumpalo::collections::Vec;
-use fix_builtins::{BUILTINS, BuiltinId};
-use fix_common::StringId;
+use fix_lang::{BUILTINS, BuiltinId, StringId};
 use ghost_cell::{GhostCell, GhostToken};
-use num_enum::TryFromPrimitive as _;
 use rnix::{TextRange, ast};
 use string_interner::DefaultStringInterner;
 
@@ -92,7 +90,7 @@ pub enum MaybeThunk {
     BuiltinConst(StringId),
     Builtins,
     ReplBinding(StringId),
-    ScopedImportBinding(StringId),
+    ScopedImportBinding { slot_id: u32, sym: StringId },
 }
 
 pub trait Ref<'ir> {
@@ -213,17 +211,16 @@ pub enum Ir<'ir, R: RefExt<'ir> + ?Sized + 'ir> {
     },
     MaybeThunk(R::MaybeThunkRef),
     ReplBinding(StringId),
-    ScopedImportBinding(StringId),
+    ScopedImportBinding {
+        sym: StringId,
+        slot_id: u32,
+    },
 }
 
 #[repr(transparent)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct ThunkId(pub usize);
 
-#[repr(transparent)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct SpanId(pub u32);
-
 /// Represents a key in an attribute path.
 #[allow(unused)]
 #[derive(Debug)]
@@ -295,7 +292,7 @@ pub fn new_global_env(
     global_env.insert(builtins_sym, MaybeThunk::Builtins);
 
     for (idx, &(name, _)) in BUILTINS.iter().enumerate() {
-        let id = BuiltinId::try_from_primitive(idx as u8).expect("infallible");
+        let id = BuiltinId::try_from(idx as u8).expect("infallible");
         let name = StringId(strings.get_or_intern(name));
         global_env.insert(name, MaybeThunk::Builtin(id));
     }

fix-compiler/src/ir/downgrade.rs

@@ -1,7 +1,6 @@
 use bumpalo::collections::{CollectIn, Vec};
-use fix_builtins::BuiltinId;
-use fix_common::Symbol;
 use fix_error::{Error, Result, Source};
+use fix_lang::{BuiltinId, Symbol};
 use hashbrown::HashSet;
 use hashbrown::hash_map::Entry;
 use rnix::TextRange;

fix-compiler/src/lib.rs

@@ -1,14 +1,14 @@
-use fix_builtins::{BUILTINS, BuiltinId};
-use fix_common::StringId;
-use fix_ir::{Attr, BinOpKind, Ir, MaybeThunk, Param, RawIrRef, ThunkId, UnOpKind};
+use fix_bytecode::{Const, InstructionPtr, Op, OperandType, PrimOpPhase};
+use fix_lang::{BUILTINS, StringId};
 use hashbrown::HashMap;
-use num_enum::TryFromPrimitive;
 use rnix::TextRange;
 use string_interner::Symbol as _;
 
-pub mod disassembler;
-
-pub struct InstructionPtr(pub usize);
+mod context;
+pub mod ir;
+pub use context::{CodeState, ExtraScope};
+pub use fix_bytecode::disassembler;
+pub use ir::{Attr, BinOpKind, Ir, MaybeThunk, Param, RawIrRef, ThunkId, UnOpKind};
 
 pub trait BytecodeContext {
     fn intern_string(&mut self, s: &str) -> StringId;
@@ -17,86 +17,6 @@ pub trait BytecodeContext {
     fn get_code_mut(&mut self) -> &mut Vec<u8>;
     fn add_constant(&mut self, val: Const) -> u32;
     fn current_source_dir(&mut self) -> StringId;
-    fn current_scope_slot(&self) -> Option<u32>;
-}
-
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, TryFromPrimitive)]
-#[allow(clippy::enum_variant_names)]
-pub enum Op {
-    PushSmi,
-    PushBigInt,
-    PushFloat,
-    PushString,
-    PushNull,
-    PushTrue,
-    PushFalse,
-
-    LoadLocal,
-    LoadOuter,
-    StoreLocal,
-    AllocLocals,
-
-    MakeThunk,
-    MakeClosure,
-    MakePatternClosure,
-
-    Call,
-    DispatchPrimOp,
-
-    MakeAttrs,
-    MakeEmptyAttrs,
-    SelectStatic,
-    SelectDynamic,
-    HasAttrPathStatic,
-    HasAttrPathDynamic,
-    HasAttrStatic,
-    HasAttrDynamic,
-    HasAttrResolve,
-    JumpIfSelectSucceeded,
-    JumpIfSelectFailed,
-
-    MakeList,
-    MakeEmptyList,
-
-    OpAdd,
-    OpSub,
-    OpMul,
-    OpDiv,
-    OpEq,
-    OpNeq,
-    OpLt,
-    OpGt,
-    OpLeq,
-    OpGeq,
-    OpConcat,
-    OpUpdate,
-
-    OpNeg,
-    OpNot,
-
-    JumpIfFalse,
-    JumpIfTrue,
-    Jump,
-
-    CoerceToString,
-
-    ConcatStrings,
-    ResolvePath,
-
-    Assert,
-
-    LookupWith,
-
-    LoadBuiltins,
-    LoadBuiltin,
-
-    LoadReplBinding,
-    LoadScopedBinding,
-
-    Return,
-
-    Illegal,
 }
 
 struct ScopeInfo {
@@ -109,39 +29,6 @@ struct BytecodeEmitter<'a, Ctx: BytecodeContext> {
     scope_stack: Vec<ScopeInfo>,
 }
 
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, TryFromPrimitive)]
-pub enum OperandType {
-    Const,
-    BigInt,
-    Local,
-    BuiltinConst,
-    Builtins,
-    ReplBinding,
-    ScopedImportBinding,
-}
-
-pub enum Const {
-    Smi(i32),
-    Float(f64),
-    Bool(bool),
-    String(StringId),
-    Path(StringId),
-    PrimOp {
-        id: BuiltinId,
-        arity: u8,
-        dispatch_ip: u32,
-    },
-    Null,
-}
-
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, TryFromPrimitive)]
-pub enum AttrKeyType {
-    Static,
-    Dynamic,
-}
-
 pub enum InlineOperand {
     Const(Const),
     BigInt(i64),
@@ -149,7 +36,7 @@ pub enum InlineOperand {
     BuiltinConst(StringId),
     Builtins,
     ReplBinding(StringId),
-    ScopedImportBinding(StringId),
+    ScopedImportBinding { id: StringId, slot_id: u32 },
 }
 
 pub fn compile_bytecode(ir: RawIrRef<'_>, ctx: &mut impl BytecodeContext) -> InstructionPtr {
@@ -193,13 +80,15 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                 InlineOperand::Const(Const::PrimOp {
                     id,
                     arity,
-                    dispatch_ip: id.entry_phase().ip(),
+                    dispatch_ip: PrimOpPhase::entry_for_builtin(id).ip(),
                 })
             }
             BuiltinConst(id) => InlineOperand::BuiltinConst(id),
             Builtins => InlineOperand::Builtins,
             ReplBinding(id) => InlineOperand::ReplBinding(id),
-            ScopedImportBinding(id) => InlineOperand::ScopedImportBinding(id),
+            ScopedImportBinding { slot_id, sym: id } => {
+                InlineOperand::ScopedImportBinding { slot_id, id }
+            }
         }
     }
 
@@ -232,13 +121,9 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                 self.emit_u8(OperandType::ReplBinding as u8);
                 self.emit_str_id(id);
             }
-            ScopedImportBinding(id) => {
+            ScopedImportBinding { id, slot_id } => {
                 self.emit_u8(OperandType::ScopedImportBinding as u8);
-                let slot = self
-                    .ctx
-                    .current_scope_slot()
-                    .expect("ScopedImportBinding outside scoped compilation");
-                self.emit_u32(slot);
+                self.emit_u32(slot_id);
                 self.emit_str_id(id);
             }
         }
@@ -555,14 +440,10 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                 self.emit_op(Op::LoadReplBinding);
                 self.emit_str_id(name);
             }
-            &Ir::ScopedImportBinding(name) => {
+            &Ir::ScopedImportBinding { sym, slot_id } => {
                 self.emit_op(Op::LoadScopedBinding);
-                let slot = self
-                    .ctx
-                    .current_scope_slot()
-                    .expect("ScopedImportBinding outside scoped compilation");
-                self.emit_u32(slot);
-                self.emit_str_id(name);
+                self.emit_u32(slot_id);
+                self.emit_str_id(sym);
             }
             Ir::WithLookup { sym, namespaces } => {
                 // counter
@@ -629,14 +510,10 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                         self.emit_op(Op::LoadReplBinding);
                         self.emit_str_id(name);
                     }
-                    ScopedImportBinding(name) => {
+                    ScopedImportBinding { slot_id, sym } => {
                         self.emit_op(Op::LoadScopedBinding);
-                        let slot = self
-                            .ctx
-                            .current_scope_slot()
-                            .expect("ScopedImportBinding outside scoped compilation");
-                        self.emit_u32(slot);
-                        self.emit_str_id(name);
+                        self.emit_u32(slot_id);
+                        self.emit_str_id(sym);
                     }
                 }
             }
@@ -775,7 +652,7 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
 
     fn emit_attrset(
         &mut self,
-        stcs: &fix_ir::HashMap<'_, StringId, (&MaybeThunk, TextRange)>,
+        stcs: &ir::HashMap<'_, StringId, (&MaybeThunk, TextRange)>,
         dyns: &[(RawIrRef<'_>, &MaybeThunk, TextRange)],
     ) {
         if stcs.is_empty() && dyns.is_empty() {

fix-error/Cargo.toml

@@ -5,5 +5,5 @@ edition = "2024"
 
 [dependencies]
 miette = { version = "7.6", features = ["fancy"] }
-thiserror = "2.0"
 rnix = { workspace = true }
+thiserror = "2.0"

fix-lang/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
-name = "fix-common"
+name = "fix-lang"
 version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-gc-arena = { workspace = true }
-string-interner = { workspace = true }
 ere = { workspace = true }
+gc-arena = { workspace = true }
+num_enum = { workspace = true }
+string-interner = { workspace = true }

fix-lang/src/lib.rs

@@ -4,6 +4,128 @@ use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
 use std::ops::{Deref, DerefMut};
 
 use gc_arena::Collect;
+use num_enum::TryFromPrimitive;
+
+macro_rules! define_builtins {
+    ($(($name:literal, $variant:ident, $arity:expr)),* $(,)?) => {
+        pub const BUILTINS: &[(&str, u8)] = &[
+            $(($name, $arity),)*
+        ];
+
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, TryFromPrimitive, Collect)]
+        #[repr(u8)]
+        #[collect(require_static)]
+        pub enum BuiltinId {
+            $($variant,)*
+        }
+    };
+}
+
+define_builtins! {
+    ("abort",                    Abort,                    1),
+    ("__add",                      Add,                      2),
+    ("__addErrorContext",          AddErrorContext,           2),
+    ("__all",                      All,                      2),
+    ("__any",                      Any,                      2),
+    ("__appendContext",            AppendContext,             2),
+    ("__attrNames",                AttrNames,                1),
+    ("__attrValues",               AttrValues,               1),
+    ("baseNameOf",               BaseNameOf,               1),
+    ("__bitAnd",                   BitAnd,                   2),
+    ("__bitOr",                    BitOr,                    2),
+    ("__bitXor",                   BitXor,                   2),
+    ("break",                    Break,                    1),
+    ("__catAttrs",                 CatAttrs,                 2),
+    ("__ceil",                     Ceil,                     1),
+    ("__compareVersions",          CompareVersions,          2),
+    ("__concatLists",              ConcatLists,              1),
+    ("__concatMap",                ConcatMap,                2),
+    ("__concatStringsSep",         ConcatStringsSep,         2),
+    ("__convertHash",              ConvertHash,              1),
+    ("__deepSeq",                  DeepSeq,                  2),
+    ("derivation",               Derivation,               1),
+    ("derivationStrict",         DerivationStrict,         1),
+    ("dirOf",                    DirOf,                    1),
+    ("__div",                      Div,                      2),
+    ("__elem",                     Elem,                     2),
+    ("__elemAt",                   ElemAt,                   2),
+    ("fetchGit",                 FetchGit,                 1),
+    ("fetchMercurial",           FetchMercurial,           1),
+    ("fetchTarball",             FetchTarball,             1),
+    ("fetchTree",                FetchTree,                1),
+    ("__fetchurl",                 FetchUrl,                 1),
+    ("__filter",                   Filter,                   2),
+    ("__filterSource",             FilterSource,             2),
+    ("__findFile",                 FindFile,                 2),
+    ("__floor",                    Floor,                    1),
+    ("__foldl'",                   FoldlStrict,              3),
+    ("__fromJSON",                 FromJSON,                 1),
+    ("fromTOML",                 FromTOML,                 1),
+    ("__functionArgs",             FunctionArgs,             1),
+    ("__genList",                  GenList,                  2),
+    ("__genericClosure",           GenericClosure,           1),
+    ("__getAttr",                  GetAttr,                  2),
+    ("__getContext",               GetContext,               1),
+    ("__getEnv",                   GetEnv,                   1),
+    ("__groupBy",                  GroupBy,                  2),
+    ("__hasAttr",                  HasAttr,                  2),
+    ("__hasContext",               HasContext,               1),
+    ("__hashFile",                 HashFile,                 2),
+    ("__hashString",               HashString,               2),
+    ("__head",                     Head,                     1),
+    ("import",                   Import,                   1),
+    ("__intersectAttrs",           IntersectAttrs,           2),
+    ("__isAttrs",                  IsAttrs,                  1),
+    ("__isBool",                   IsBool,                   1),
+    ("__isFloat",                  IsFloat,                  1),
+    ("__isFunction",               IsFunction,               1),
+    ("__isInt",                    IsInt,                    1),
+    ("__isList",                   IsList,                   1),
+    ("isNull",                   IsNull,                   1),
+    ("__isPath",                   IsPath,                   1),
+    ("__isString",                 IsString,                 1),
+    ("__length",                   Length,                   1),
+    ("__lessThan",                 LessThan,                 2),
+    ("__listToAttrs",              ListToAttrs,              1),
+    ("map",                      Map,                      2),
+    ("__mapAttrs",                 MapAttrs,                 2),
+    ("__match",                    Match,                    2),
+    ("__mul",                      Mul,                      2),
+    ("__parseDrvName",             ParseDrvName,             1),
+    ("__partition",                Partition,                2),
+    ("__path",                     Path,                     1),
+    ("__pathExists",               PathExists,               1),
+    ("placeholder",              Placeholder,              1),
+    ("__readDir",                  ReadDir,                  1),
+    ("__readFile",                 ReadFile,                 1),
+    ("__readFileType",             ReadFileType,             1),
+    ("removeAttrs",              RemoveAttrs,              2),
+    ("__replaceStrings",           ReplaceStrings,           3),
+    ("scopedImport",             ScopedImport,             2),
+    ("__seq",                      Seq,                      2),
+    ("__sort",                     Sort,                     2),
+    ("__split",                    Split,                    2),
+    ("__splitVersion",             SplitVersion,             1),
+    ("__storePath",                StorePath,                1),
+    ("__stringLength",             StringLength,             1),
+    ("__sub",                      Sub,                      2),
+    ("__substring",                Substring,                3),
+    ("__tail",                     Tail,                     1),
+    ("throw",                    Throw,                    1),
+    ("__toFile",                   ToFile,                   2),
+    ("__toJSON",                   ToJSON,                   1),
+    ("__toPath",                   ToPath,                   1),
+    ("toString",                 ToString,                 1),
+    ("__toXML",                    ToXML,                    1),
+    ("__trace",                    Trace,                    2),
+    ("__tryEval",                  TryEval,                  1),
+    ("__typeOf",                   TypeOf,                   1),
+    ("__unsafeDiscardStringContext", UnsafeDiscardStringContext, 1),
+    ("__unsafeDiscardOutputDependency", UnsafeDiscardOutputDependency, 1),
+    ("__unsafeGetAttrPos",         UnsafeGetAttrPos,         2),
+    ("__warn",                     Warn,                     2),
+    ("__zipAttrsWith",             ZipAttrsWith,             2),
+}
 
 #[repr(transparent)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Collect)]

fix-primops/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "fix-primops"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-gc-arena = { workspace = true }
-hashbrown = { workspace = true }
-num_enum = { workspace = true }
-smallvec = { workspace = true }
-string-interner = { workspace = true }
-
-fix-abstract-vm = { path = "../fix-abstract-vm" }
-fix-builtins = { path = "../fix-builtins" }
-fix-codegen = { path = "../fix-codegen" }
-fix-common = { path = "../fix-common" }
-fix-error = { path = "../fix-error" }

fix-runtime/Cargo.toml

@@ -1,18 +1,15 @@
 [package]
-name = "fix-abstract-vm"
+name = "fix-runtime"
 version = "0.1.0"
 edition = "2024"
 
 [dependencies]
 gc-arena = { workspace = true }
 hashbrown = { workspace = true }
-num_enum = { workspace = true }
 smallvec = { workspace = true }
-string-interner = { workspace = true }
-likely_stable = { workspace = true }
 sptr = "0.3"
+string-interner = { workspace = true }
 
-fix-builtins = { path = "../fix-builtins" }
-fix-codegen = { path = "../fix-codegen" }
-fix-common = { path = "../fix-common" }
+fix-bytecode = { path = "../fix-bytecode" }
 fix-error = { path = "../fix-error" }
+fix-lang = { path = "../fix-lang" }

fix-runtime/src/forced.rs

@@ -1,4 +1,4 @@
-use fix_common::StringId;
+use fix_lang::StringId;
 use gc_arena::{Gc, Mutation};
 
 use crate::{

fix-runtime/src/host.rs

@@ -1,10 +1,11 @@
-use fix_codegen::InstructionPtr;
-use fix_common::StringId;
+use fix_bytecode::InstructionPtr;
 use fix_error::Source;
+use fix_lang::{self, BUILTINS, StringId};
 use hashbrown::HashSet;
 
 use crate::{
-    AttrSet, Closure, ExtraScope, List, NixString, NixType, Null, Path, PrimOp, PrimOpApp, StaticValue, StrictValue, StringContext, Thunk, ThunkState, Value
+    AttrSet, Closure, ExtraScope, List, NixString, NixType, Null, Path, PrimOp, PrimOpApp,
+    StaticValue, StrictValue, StringContext, Thunk, ThunkState, Value,
 };
 
 pub trait VmContext {
@@ -38,7 +39,7 @@ pub trait VmRuntimeCtxExt: VmRuntimeCtx {
     /// Returns the string context attached to `val`, or `&[]` if `val` is
     /// either a non-string or a string without context.
     fn get_string_context<'gc>(&self, val: StrictValue<'gc>) -> &'gc StringContext;
-    fn convert_value(&self, val: Value) -> fix_common::Value;
+    fn convert_value(&self, val: Value) -> fix_lang::Value;
 }
 
 impl<T: VmRuntimeCtx> VmRuntimeCtxExt for T {
@@ -83,18 +84,18 @@ impl<T: VmRuntimeCtx> VmRuntimeCtxExt for T {
         }
     }
 
-    fn convert_value(&self, val: Value) -> fix_common::Value {
+    fn convert_value(&self, val: Value) -> fix_lang::Value {
         self.convert_value_with_seen(val, &mut HashSet::new())
     }
 }
 
 pub(crate) trait ConvertValueWithSeen: VmRuntimeCtx {
-    fn convert_value_with_seen(&self, val: Value, seen: &mut HashSet<u64>) -> fix_common::Value;
+    fn convert_value_with_seen(&self, val: Value, seen: &mut HashSet<u64>) -> fix_lang::Value;
 }
 
 impl<T: VmRuntimeCtx> ConvertValueWithSeen for T {
-    fn convert_value_with_seen(&self, val: Value, seen: &mut HashSet<u64>) -> fix_common::Value {
-        use fix_common::Value;
+    fn convert_value_with_seen(&self, val: Value, seen: &mut HashSet<u64>) -> fix_lang::Value {
+        use fix_lang::Value;
         if let Some(i) = val.as_inline::<i32>() {
             Value::Int(i as i64)
         } else if let Some(gc_i) = val.as_gc::<i64>() {
@@ -124,9 +125,9 @@ impl<T: VmRuntimeCtx> ConvertValueWithSeen for T {
             for &(key, val) in attrs.entries.iter() {
                 let key = self.resolve_string(key).to_owned();
                 let converted = self.convert_value_with_seen(val, seen);
-                map.insert(fix_common::Symbol::from(key), converted);
+                map.insert(fix_lang::Symbol::from(key), converted);
             }
-            Value::AttrSet(fix_common::AttrSet::new(map))
+            Value::AttrSet(fix_lang::AttrSet::new(map))
         } else if let Some(list) = val.as_gc::<List>() {
             let bits = val.to_bits();
             if list.inner.borrow().is_empty() {
@@ -142,7 +143,7 @@ impl<T: VmRuntimeCtx> ConvertValueWithSeen for T {
                 .copied()
                 .map(|v| self.convert_value_with_seen(v, seen))
                 .collect();
-            Value::List(fix_common::List::new(items))
+            Value::List(fix_lang::List::new(items))
         } else if val.is::<Closure>() {
             Value::Func
         } else if let Some(thunk) = val.as_gc::<Thunk>() {
@@ -152,10 +153,10 @@ impl<T: VmRuntimeCtx> ConvertValueWithSeen for T {
                 Value::Thunk
             }
         } else if let Some(primop) = val.as_inline::<PrimOp>() {
-            let name = fix_builtins::BUILTINS[primop.id as usize].0;
+            let name = BUILTINS[primop.id as usize].0;
             Value::PrimOp(name.strip_prefix("__").unwrap_or(name))
         } else if let Some(app) = val.as_gc::<PrimOpApp>() {
-            let name = fix_builtins::BUILTINS[app.primop.id as usize].0;
+            let name = BUILTINS[app.primop.id as usize].0;
             Value::PrimOpApp(name.strip_prefix("__").unwrap_or(name))
         } else {
             Value::Null

fix-runtime/src/lib.rs

@@ -1,5 +1,4 @@
 mod boxing;
-mod bytecode_reader;
 mod forced;
 mod host;
 mod machine;
@@ -9,7 +8,7 @@ mod state;
 mod string_context;
 mod value;
 
-pub use bytecode_reader::*;
+pub use fix_bytecode::{BytecodeReader, OperandData};
 pub use forced::*;
 pub use host::*;
 pub use machine::*;

fix-runtime/src/machine.rs

@@ -1,8 +1,8 @@
 use std::ops::ControlFlow;
 use std::path::{Path, PathBuf};
 
-use fix_common::StringId;
 use fix_error::Error;
+use fix_lang::{self, StringId};
 use gc_arena::Mutation;
 
 use crate::{
@@ -26,11 +26,15 @@ use crate::{
 /// - Imports and scope slots (`import_cache_*` / `scope_slot*` / `set_pending_load`)
 pub trait Machine<'gc> {
     fn push(&mut self, val: Value<'gc>);
+    #[must_use]
     fn pop(&mut self) -> Value<'gc>;
+    #[must_use]
     fn peek(&self, depth: usize) -> Value<'gc>;
+    #[must_use]
     fn peek_forced(&self, depth: usize) -> StrictValue<'gc>;
     fn pop_forced(&mut self) -> StrictValue<'gc>;
     fn replace(&mut self, depth: usize, val: Value<'gc>);
+    fn drop_n(&mut self, depth: usize);
     fn stack_len(&self) -> usize;
 
     fn force_slot_to_pc(
@@ -96,7 +100,7 @@ pub trait Machine<'gc> {
         cur.borrow().locals[idx as usize]
     }
 
-    fn finish_ok(&mut self, val: fix_common::Value) -> Step;
+    fn finish_ok(&mut self, val: fix_lang::Value) -> Step;
     fn finish_err(&mut self, err: Box<Error>) -> Step;
     fn finish_type_err(&mut self, expected: NixType, got: NixType) -> Step;
 

fix-runtime/src/resolve.rs

@@ -1,6 +1,7 @@
+use fix_bytecode::OperandData;
 use gc_arena::{Gc, Mutation};
 
-use crate::{AttrSet, Machine, OperandData, Value};
+use crate::{AttrSet, Machine, Value, VmRuntimeCtx};
 
 /// Resolve a decoded operand into a runtime [`Value`].
 ///
@@ -11,11 +12,12 @@ use crate::{AttrSet, Machine, OperandData, Value};
 pub fn resolve_operand<'gc, M: Machine<'gc>>(
     op: &OperandData,
     mc: &Mutation<'gc>,
+    ctx: &impl VmRuntimeCtx,
     m: &M,
 ) -> Value<'gc> {
     use OperandData::*;
     match *op {
-        Const(sv) => sv.into(),
+        Const(id) => ctx.get_const(id).into(),
         BigInt(val) => Value::new_gc(Gc::new(mc, val)),
         Local { layer, idx } => m.local(layer, idx),
         #[allow(clippy::unwrap_used)]

fix-runtime/src/state.rs

@@ -1,12 +1,12 @@
 use std::ops::ControlFlow;
 use std::path::PathBuf;
 
-use fix_common::StringId;
 use fix_error::Error;
+use fix_lang::StringId;
 use gc_arena::{Collect, Gc};
 use hashbrown::HashSet;
 
-use crate::{GcEnv, StaticValue, Thunk};
+use crate::{GcEnv, Thunk};
 
 #[allow(dead_code)]
 pub enum VmError {
@@ -87,13 +87,3 @@ pub enum ExtraScope {
         slot_id: u32,
     },
 }
-
-pub enum OperandData {
-    Const(StaticValue),
-    BigInt(i64),
-    Local { layer: u8, idx: u32 },
-    BuiltinConst(StringId),
-    Builtins,
-    ReplBinding(StringId),
-    ScopedImportBinding { slot_id: u32, name: StringId },
-}

fix-runtime/src/string_context.rs

@@ -89,7 +89,7 @@ impl<'a> IntoIterator for &'a mut StringContext {
 impl FromIterator<StringContextElem> for StringContext {
     fn from_iter<T: IntoIterator<Item = StringContextElem>>(iter: T) -> Self {
         Self {
-            data: iter.into_iter().collect()
+            data: iter.into_iter().collect(),
         }
     }
 }

fix-runtime/src/value.rs

@@ -1,17 +1,13 @@
-#![allow(dead_code)]
-
 use std::cell::RefCell;
 use std::fmt;
 use std::marker::PhantomData;
 use std::mem::size_of;
 use std::ops::Deref;
 
-use fix_builtins::BuiltinId;
-use fix_common::*;
+use fix_lang::*;
 use gc_arena::barrier::Unlock;
 use gc_arena::collect::Trace;
 use gc_arena::{Collect, Gc, GcRefLock, Mutation, RefLock};
-use num_enum::TryFromPrimitive;
 use smallvec::SmallVec;
 use string_interner::Symbol;
 use string_interner::symbol::SymbolU32;
@@ -25,14 +21,12 @@ mod private {
 
 /// # Safety
 ///
-/// TAG must be unique among all implementors.
-#[allow(private_interfaces)]
-pub unsafe trait Storable: private::Cealed {
+/// [`Self::TAG`] must be unique among all implementors.
+unsafe trait Storable: private::Cealed {
     const TAG: RawTag;
 }
-#[allow(private_bounds)]
-pub trait InlineStorable: Storable + RawStore {}
-pub trait GcStorable: Storable {}
+trait InlineStorable: Storable + RawStore {}
+trait GcStorable: Storable {}
 
 macro_rules! define_value_types {
     (
@@ -40,7 +34,6 @@ macro_rules! define_value_types {
         gc { $($gtype:ty => $gtag:expr, $gname:literal;)* }
     ) => {
         $(
-        #[allow(private_interfaces)]
         unsafe impl Storable for $itype {
             const TAG: RawTag = $itag;
         }
@@ -48,7 +41,6 @@ macro_rules! define_value_types {
         impl private::Cealed for $itype {}
         )*
         $(
-        #[allow(private_interfaces)]
         unsafe impl Storable for $gtype {
             const TAG: RawTag = $gtag;
         }
@@ -117,16 +109,16 @@ define_value_types! {
         Null => RawTag::P3, "Null";
         StringId => RawTag::P4, "SmallString";
         PrimOp => RawTag::P5, "PrimOp";
-        Path => RawTag::N6, "Path";
+        Path => RawTag::P6, "Path";
     }
     gc {
-        i64 => RawTag::P6, "BigInt";
-        NixString => RawTag::P7, "String";
-        AttrSet<'_> => RawTag::N1, "AttrSet";
-        List<'_> => RawTag::N2, "List";
-        Thunk<'_> => RawTag::N3, "Thunk";
-        Closure<'_> => RawTag::N4, "Closure";
-        PrimOpApp<'_> => RawTag::N5, "PrimOpApp";
+        i64 => RawTag::P7, "BigInt";
+        NixString => RawTag::N1, "String";
+        AttrSet<'_> => RawTag::N2, "AttrSet";
+        List<'_> => RawTag::N3, "List";
+        Thunk<'_> => RawTag::N4, "Thunk";
+        Closure<'_> => RawTag::N5, "Closure";
+        PrimOpApp<'_> => RawTag::N6, "PrimOpApp";
     }
 }
 
@@ -186,11 +178,13 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn new_inline<T: InlineStorable>(val: T) -> Self {
         Self::from_raw_value(RawValue::store(T::TAG, val))
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn new_gc<T: GcStorable>(gc: Gc<'gc, T>) -> Self {
         let ptr = Gc::as_ptr(gc);
         Self::from_raw_value(RawValue::store(T::TAG, ptr))
@@ -213,6 +207,7 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn is<T: Storable>(self) -> bool {
         self.tag() == Some(T::TAG)
     }
@@ -225,6 +220,7 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn as_inline<T: InlineStorable>(self) -> Option<T> {
         if self.is::<T>() {
             Some(unsafe {
@@ -237,6 +233,7 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn as_gc<T: GcStorable>(self) -> Option<Gc<'gc, T>> {
         if self.is::<T>() {
             Some(unsafe {
@@ -308,11 +305,13 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn expect_inline<T: InlineStorable>(self) -> Result<T, NixType> {
         self.as_inline::<T>().ok_or_else(|| self.ty())
     }
 
     #[inline]
+    #[allow(private_bounds)]
     pub fn expect_gc<T: GcStorable>(self) -> Result<Gc<'gc, T>, NixType> {
         self.as_gc::<T>().ok_or_else(|| self.ty())
     }
@@ -351,6 +350,7 @@ impl StaticValue {
         Self(Value::new_float(val))
     }
     #[inline]
+    #[allow(private_bounds)]
     pub fn new_inline<T: InlineStorable>(val: T) -> Self {
         Self(Value::new_inline(val))
     }
@@ -367,6 +367,7 @@ impl StaticValue {
         self.0.is_float()
     }
     #[inline]
+    #[allow(private_bounds)]
     pub fn is<T: InlineStorable>(self) -> bool {
         self.0.is::<T>()
     }
@@ -375,6 +376,7 @@ impl StaticValue {
         self.0.as_float()
     }
     #[inline]
+    #[allow(private_bounds)]
     pub fn as_inline<T: InlineStorable>(self) -> Option<T> {
         self.0.as_inline::<T>()
     }
@@ -638,7 +640,7 @@ impl RawStore for PrimOp {
     fn from_val(value: &RawValue) -> Self {
         let [id, arity, bytes @ ..] = *value.data();
         Self {
-            id: BuiltinId::try_from_primitive(id).expect("invalid BuiltinId"),
+            id: BuiltinId::try_from(id).expect("invalid BuiltinId"),
             arity,
             dispatch_ip: u32::from_le_bytes(bytes),
         }

fix-vm/Cargo.toml

@@ -3,22 +3,16 @@ name = "fix-vm"
 version = "0.1.0"
 edition = "2024"
 
-[features]
-tailcall = []
-
 [dependencies]
 gc-arena = { workspace = true }
 hashbrown = { workspace = true }
-num_enum = { workspace = true }
 smallvec = { workspace = true }
-string-interner = { workspace = true }
-likely_stable = { workspace = true }
-sptr = "0.3"
 sysinfo = { version = "0.38", default-features = false, features = ["system"] }
 
-fix-builtins = { path = "../fix-builtins" }
-fix-codegen = { path = "../fix-codegen" }
-fix-common = { path = "../fix-common" }
+fix-bytecode = { path = "../fix-bytecode" }
 fix-error = { path = "../fix-error" }
-fix-abstract-vm = { path = "../fix-abstract-vm" }
-fix-primops = { path = "../fix-primops" }
+fix-lang = { path = "../fix-lang" }
+fix-runtime = { path = "../fix-runtime" }
+
+[features]
+tailcall = []

fix-vm/src/dispatch_tailcall.rs

@@ -61,7 +61,7 @@ macro_rules! tail_fn {
             pc: u32,
             fuel: u32,
         ) -> TailResult {
-            let result = vm.$name();
+            let result = crate::instructions::$name(vm);
             tail_dispatch_after!(result, pc + 1, vm, mc, ctx, bc, table, fuel)
         }
     };
@@ -76,7 +76,7 @@ macro_rules! tail_fn {
             fuel: u32,
         ) -> TailResult {
             let mut reader = BytecodeReader::from_after_op(bc, pc as usize);
-            let result = vm.$name(&mut reader);
+            let result = crate::instructions::$name(vm, &mut reader);
             tail_dispatch_after!(result, reader.pc() as u32, vm, mc, ctx, bc, table, fuel)
         }
     };
@@ -91,7 +91,7 @@ macro_rules! tail_fn {
             fuel: u32,
         ) -> TailResult {
             let mut reader = BytecodeReader::from_after_op(bc, pc as usize);
-            let result = vm.$name(&mut reader, mc);
+            let result = crate::instructions::$name(vm, &mut reader, mc);
             tail_dispatch_after!(result, reader.pc() as u32, vm, mc, ctx, bc, table, fuel)
         }
     };
@@ -106,7 +106,7 @@ macro_rules! tail_fn {
             fuel: u32,
         ) -> TailResult {
             let mut reader = BytecodeReader::from_after_op(bc, pc as usize);
-            let result = vm.$name(ctx, &mut reader, mc);
+            let result = crate::instructions::$name(vm, ctx, &mut reader, mc);
             tail_dispatch_after!(result, reader.pc() as u32, vm, mc, ctx, bc, table, fuel)
         }
     };
@@ -120,7 +120,7 @@ macro_rules! tail_fn {
             pc: u32,
             fuel: u32,
         ) -> TailResult {
-            let result = vm.$name(ctx);
+            let result = crate::instructions::$name(vm, ctx);
             tail_dispatch_after!(result, pc + 1, vm, mc, ctx, bc, table, fuel)
         }
     };
@@ -202,16 +202,16 @@ macro_rules! table {
         impl<'gc, C: VmRuntimeCtx> DispatchTable<'gc, C> {
             pub(crate) const NEW: Self = {
                 let mut arr: [OpFn<'gc, C>; 256] = [op_illegal; 256];
-                $( arr[fix_codegen::Op::$variant as usize] = $fn; )*
+                $( arr[fix_bytecode::Op::$variant as usize] = $fn; )*
                 DispatchTable(arr)
             };
         }
 
-        // Exhaustiveness check: fails to compile if `fix_codegen::Op` gains,
+        // Exhaustiveness check: fails to compile if `fix_bytecode::Op` gains,
         // loses, or renames a variant that isn't wired up above.
         #[allow(dead_code)]
-        const _: fn(fix_codegen::Op) = |op| match op {
-            $( fix_codegen::Op::$variant => (), )*
+        const _: fn(fix_bytecode::Op) = |op| match op {
+            $( fix_bytecode::Op::$variant => (), )*
         };
     };
 }

fix-vm/src/instructions/arithmetic.rs

@@ -1,19 +1,18 @@
 use std::cmp::Ordering;
 
-use fix_abstract_vm::*;
+use fix_runtime::*;
 use gc_arena::{Gc, Mutation, RefLock};
 
 use crate::{BytecodeReader, NixNum, Step, VmError, VmRuntimeCtx};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_add(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_add<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+) -> Step {
+    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
     // if the LHS is a path, the result is a path obtained by
     // canonicalizing the concatenated string. RHS may be a path or a
     // string. (A `string + path` keeps the string-typed result, handled
@@ -21,7 +20,7 @@ impl<'gc> crate::Vm<'gc> {
     if lhs.is::<Path>() {
         let (Some(ls), Some(rs)) = (ctx.get_string_or_path(lhs), ctx.get_string_or_path(rhs))
         else {
-                return self.finish_err(fix_error::Error::eval_error(format!(
+            return m.finish_err(fix_error::Error::eval_error(format!(
                 "cannot append {} to a path",
                 rhs.ty()
             )));
@@ -29,7 +28,7 @@ impl<'gc> crate::Vm<'gc> {
         let combined = format!("{ls}{rs}");
         let canon = canon_path_str(&combined);
         let sid = ctx.intern_string(canon);
-            self.push(Value::new_inline(fix_abstract_vm::Path(sid)));
+        m.push(Value::new_inline(fix_runtime::Path(sid)));
         return Step::Continue(());
     }
     if let (Some(ls), Some(rs)) = (ctx.get_string(lhs), ctx.get_string_or_path(rhs)) {
@@ -40,54 +39,66 @@ impl<'gc> crate::Vm<'gc> {
             mc,
             crate::NixString::with_context(format!("{ls}{rs}"), merged),
         );
-            self.push(Value::new_gc(ns));
+        m.push(Value::new_gc(ns));
         return Step::Continue(());
     }
     let res = numeric_binop(lhs, rhs, mc, i64::wrapping_add, |a, b| a + b);
     match res {
         Ok(val) => {
-                self.push(val);
+            m.push(val);
             Step::Continue(())
         }
-            Err(e) => self.finish_vm_err(e),
-        }
+        Err(e) => m.finish_vm_err(e),
     }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_sub(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-        self.op_arith(reader, mc, i64::wrapping_sub, |a, b| a - b)
-    }
+#[inline(always)]
+pub(crate) fn op_sub<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    op_arith(m, reader, mc, i64::wrapping_sub, |a, b| a - b)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_mul(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-        self.op_arith(reader, mc, i64::wrapping_mul, |a, b| a * b)
-    }
+#[inline(always)]
+pub(crate) fn op_mul<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    op_arith(m, reader, mc, i64::wrapping_mul, |a, b| a * b)
+}
 
-    #[inline(always)]
-    fn op_arith(
-        &mut self,
+#[inline(always)]
+fn op_arith<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
     int_op: fn(i64, i64) -> i64,
     float_op: fn(f64, f64) -> f64,
-    ) -> Step {
-        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+) -> Step {
+    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
     let res = numeric_binop(lhs, rhs, mc, int_op, float_op);
     match res {
         Ok(val) => {
-                self.push(val);
+            m.push(val);
             Step::Continue(())
         }
-            Err(e) => self.finish_vm_err(e),
-        }
+        Err(e) => m.finish_vm_err(e),
     }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_div(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+#[inline(always)]
+pub(crate) fn op_div<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
     match (get_num(lhs), get_num(rhs)) {
         (_, Some(NixNum::Int(0))) | (_, Some(NixNum::Float(0.))) => {
-                return self.finish_vm_err(VmError::Uncatchable(fix_error::Error::eval_error(
+            return m.finish_vm_err(VmError::Uncatchable(fix_error::Error::eval_error(
                 "division by zero",
             )));
         }
@@ -96,143 +107,151 @@ impl<'gc> crate::Vm<'gc> {
     let res = numeric_binop(lhs, rhs, mc, |a, b| a / b, |a, b| a / b);
     match res {
         Ok(val) => {
-                self.push(val);
+            m.push(val);
             Step::Continue(())
         }
-            Err(e) => self.finish_vm_err(e),
-        }
+        Err(e) => m.finish_vm_err(e),
     }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_eq(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_eq<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-        fix_primops::start_eq(self, ctx, reader, mc, lhs, rhs, false)
-    }
+) -> Step {
+    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+    crate::primops::start_eq(m, ctx, reader, mc, lhs, rhs, false)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_neq(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_neq<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-        fix_primops::start_eq(self, ctx, reader, mc, lhs, rhs, true)
-    }
+) -> Step {
+    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+    crate::primops::start_eq(m, ctx, reader, mc, lhs, rhs, true)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_lt(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_lt<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        self.compare_values(ctx, reader, mc, Ordering::is_lt)
-    }
+) -> Step {
+    compare_values(m, ctx, reader, mc, Ordering::is_lt)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_gt(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_gt<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        self.compare_values(ctx, reader, mc, Ordering::is_gt)
-    }
+) -> Step {
+    compare_values(m, ctx, reader, mc, Ordering::is_gt)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_leq(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_leq<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        self.compare_values(ctx, reader, mc, Ordering::is_le)
-    }
+) -> Step {
+    compare_values(m, ctx, reader, mc, Ordering::is_le)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_geq(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_geq<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        self.compare_values(ctx, reader, mc, Ordering::is_ge)
-    }
+) -> Step {
+    compare_values(m, ctx, reader, mc, Ordering::is_ge)
+}
 
-    fn compare_values(
-        &mut self,
+fn compare_values<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
     pred: fn(Ordering) -> bool,
-    ) -> Step {
-        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-        match self.compare_values_inner(ctx, pred, lhs, rhs) {
+) -> Step {
+    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+    match compare_values_inner(m, ctx, pred, lhs, rhs) {
         Ok(()) => Step::Continue(()),
-            Err(e) => self.finish_vm_err(e),
-        }
+        Err(e) => m.finish_vm_err(e),
     }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_concat(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_concat<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let (l, r) = self.force_and_retry::<(Gc<List>, Gc<List>)>(reader, mc)?;
+) -> Step {
+    let (l, r) = m.force_and_retry::<(Gc<List>, Gc<List>)>(reader, mc)?;
     let mut items = smallvec::SmallVec::new();
     items.extend_from_slice(&l.inner.borrow());
     items.extend_from_slice(&r.inner.borrow());
-        self.push(Value::new_gc(Gc::new(
+    m.push(Value::new_gc(Gc::new(
         mc,
         crate::List {
             inner: RefLock::new(items),
         },
     )));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_update(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_update<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let (l, r) = self.force_and_retry::<(Gc<AttrSet>, Gc<AttrSet>)>(reader, mc)?;
-        self.push(Value::new_gc(l.merge(&r, mc)));
+) -> Step {
+    let (l, r) = m.force_and_retry::<(Gc<AttrSet>, Gc<AttrSet>)>(reader, mc)?;
+    m.push(Value::new_gc(l.merge(&r, mc)));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_neg(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-        let rhs = self.force_and_retry::<NixNum>(reader, mc)?;
+#[inline(always)]
+pub(crate) fn op_neg<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let rhs = m.force_and_retry::<NixNum>(reader, mc)?;
     match rhs {
-            NixNum::Int(int) => self.push(Value::make_int(-int, mc)),
-            NixNum::Float(float) => self.push(Value::new_float(-float)),
+        NixNum::Int(int) => m.push(Value::make_int(-int, mc)),
+        NixNum::Float(float) => m.push(Value::new_float(-float)),
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_not(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-        let rhs = self.force_and_retry::<bool>(reader, mc)?;
-        self.push(Value::new_inline(!rhs));
+#[inline(always)]
+pub(crate) fn op_not<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let rhs = m.force_and_retry::<bool>(reader, mc)?;
+    m.push(Value::new_inline(!rhs));
     Step::Continue(())
-    }
+}
 
-    fn compare_values_inner(
-        &mut self,
+fn compare_values_inner<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &impl VmRuntimeCtx,
     pred: fn(Ordering) -> bool,
     lhs: StrictValue<'gc>,
     rhs: StrictValue<'gc>,
-    ) -> crate::VmResult<()> {
+) -> crate::VmResult<()> {
     if let (Some(a), Some(b)) = (get_num(lhs), get_num(rhs)) {
         let ord = match (a, b) {
             (NixNum::Int(a), NixNum::Int(b)) => a.cmp(&b),
@@ -244,27 +263,30 @@ impl<'gc> crate::Vm<'gc> {
                 a.partial_cmp(&(b as f64)).unwrap_or(Ordering::Less)
             }
         };
-            self.push(Value::new_inline(pred(ord)));
+        m.push(Value::new_inline(pred(ord)));
         return Ok(());
     }
     if let (Some(a), Some(b)) = (ctx.get_string(lhs), ctx.get_string(rhs)) {
-            self.push(Value::new_inline(pred(a.cmp(b))));
+        m.push(Value::new_inline(pred(a.cmp(b))));
         return Ok(());
     }
     if let (Some(a), Some(b)) = (lhs.as_inline::<Path>(), rhs.as_inline::<Path>()) {
         let a = ctx.resolve_string(a.0);
         let b = ctx.resolve_string(b.0);
-            self.push(Value::new_inline(pred(a.cmp(b))));
+        m.push(Value::new_inline(pred(a.cmp(b))));
         return Ok(());
     }
     // TODO: compare other types
-        Err(crate::vm_err("cannot compare these types"))
-    }
+    Err(crate::vm_err(format!(
+        "cannot compare {} with {}",
+        lhs.ty(),
+        rhs.ty()
+    )))
 }
 
 pub(crate) fn get_num(val: StrictValue<'_>) -> Option<NixNum> {
     if let Some(i) = val.as_inline::<i32>() {
-        Some(NixNum::Int(i as i64))
+        Some(NixNum::Int(i64::from(i)))
     } else if let Some(gc_i) = val.as_gc::<i64>() {
         Some(NixNum::Int(*gc_i))
     } else {

fix-vm/src/instructions/calls.rs

@@ -1,6 +1,6 @@
-use fix_abstract_vm::{resolve_operand, *};
-use fix_builtins::PrimOpPhase;
+use fix_bytecode::PrimOpPhase;
 use fix_error::Error;
+use fix_runtime::{resolve_operand, *};
 use gc_arena::{Gc, Mutation, RefLock};
 
 use crate::{
@@ -8,29 +8,28 @@ use crate::{
     VmRuntimeCtxExt,
 };
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn call(
-        &mut self,
+#[inline(always)]
+pub(crate) fn call<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
     arg: Value<'gc>,
     resume_pc: usize,
-    ) -> Step {
-        let func = self.force_and_retry::<StrictValue>(reader, mc)?;
-        if self.call_depth > 10000 {
-            return self.finish_err(Error::eval_error("stack overflow; max-call-depth exceeded"));
+) -> Step {
+    let func = m.force_and_retry::<StrictValue>(reader, mc)?;
+    if m.call_depth() > 10000 {
+        return m.finish_err(Error::eval_error("stack overflow; max-call-depth exceeded"));
     }
-        self.call_depth += 1;
+    m.inc_call_depth();
     if let Some(closure) = func.as_gc::<Closure>() {
         if closure.pattern.is_some() {
             // FIXME: better DX...
-                self.push(func.relax());
-                self.push(arg);
-                self.call_stack.push(CallFrame {
+            m.push(func.relax());
+            m.push(arg);
+            m.push_call_frame(CallFrame {
                 pc: resume_pc,
                 thunk: None,
-                    env: self.env,
+                env: m.env(),
             });
             reader.set_pc(PrimOpPhase::CallPattern.ip() as usize);
             return Step::Continue(());
@@ -40,20 +39,20 @@ impl<'gc> crate::Vm<'gc> {
         let n_locals = closure.n_locals;
         let env = closure.env;
         let new_env = Gc::new(mc, RefLock::new(Env::with_arg(arg, n_locals, env)));
-            self.call_stack.push(CallFrame {
+        m.push_call_frame(CallFrame {
             pc: resume_pc,
             thunk: None,
-                env: self.env,
+            env: m.env(),
         });
         reader.set_pc(ip as usize);
-            self.env = new_env;
+        m.set_env(new_env);
     } else if let Some(primop) = func.as_inline::<PrimOp>() {
         if primop.arity == 1 {
-                self.push(arg);
-                self.call_stack.push(CallFrame {
+            m.push(arg);
+            m.push_call_frame(CallFrame {
                 pc: resume_pc,
                 thunk: None,
-                    env: self.env,
+                env: m.env(),
             });
             reader.set_pc(primop.dispatch_ip as usize)
         } else {
@@ -62,18 +61,18 @@ impl<'gc> crate::Vm<'gc> {
                 arity: primop.arity - 1,
                 args: [arg, Value::default(), Value::default()],
             };
-                self.push(Value::new_gc(Gc::new(mc, app)));
+            m.push(Value::new_gc(Gc::new(mc, app)));
         }
     } else if let Some(app) = func.as_gc::<PrimOpApp>() {
         if app.arity == 1 {
             for i in 0..app.primop.arity - 1 {
-                    self.push(app.args[i as usize]);
+                m.push(app.args[i as usize]);
             }
-                self.push(arg);
-                self.call_stack.push(CallFrame {
+            m.push(arg);
+            m.push_call_frame(CallFrame {
                 pc: resume_pc,
                 thunk: None,
-                    env: self.env,
+                env: m.env(),
             });
             reader.set_pc(app.primop.dispatch_ip as usize)
         } else {
@@ -83,78 +82,78 @@ impl<'gc> crate::Vm<'gc> {
                 ..*app
             };
             new_app.args[position] = arg;
-                self.push(Value::new_gc(Gc::new(mc, new_app)))
+            m.push(Value::new_gc(Gc::new(mc, new_app)))
         }
     } else if let Some(attrs) = func.as_gc::<AttrSet>()
-            && let Some(functor) = attrs.lookup(self.functor_sym)
+        && let Some(functor) = attrs.lookup(m.functor_sym())
     {
         // f arg  =>  (f.__functor f) arg
         //
         // Stage the work for `CallFunctor1` so retries during force are
         // safe: the stack invariant `[..., orig_arg, self, functor]`
         // holds every time control re-enters phase 1.
-            self.call_depth -= 1;
-            self.call_stack.push(CallFrame {
+        m.dec_call_depth();
+        m.push_call_frame(CallFrame {
             pc: resume_pc,
             thunk: None,
-                env: self.env,
+            env: m.env(),
         });
-            self.push(arg);
-            self.push(func.relax());
-            self.push(functor);
+        m.push(arg);
+        m.push(func.relax());
+        m.push(functor);
         reader.set_pc(PrimOpPhase::CallFunctor1.ip() as usize);
         return Step::Continue(());
     } else {
-            return self.finish_err(Error::eval_error(format!(
+        return m.finish_err(Error::eval_error(format!(
             "attempt to call something which is not a function but {}",
             func.ty()
         )));
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_call(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_call<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let arg = resolve_operand(&reader.read_operand_data(ctx), mc, self);
+) -> Step {
+    let arg = resolve_operand(&reader.read_operand_data(), mc, ctx, m);
     let pc = reader.pc();
-        self.call(reader, mc, arg, pc)
-    }
+    m.call(reader, mc, arg, pc)
+}
 
-    #[inline(always)]
-    pub(crate) fn op_return(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_return<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
+) -> Step {
+    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
     let Some(CallFrame {
         pc: ret_pc,
         thunk,
         env,
-        }) = self.call_stack.pop()
+    }) = m.pop_call_frame()
     else {
-            match self.force_mode {
-                ForceMode::AsIs => return self.finish_ok(ctx.convert_value(val.relax())),
+        match m.force_mode() {
+            ForceMode::AsIs => return m.finish_ok(ctx.convert_value(val.relax())),
             ForceMode::Shallow => {
-                    self.push(val.relax());
+                m.push(val.relax());
                 reader.set_pc(PrimOpPhase::ForceResultShallow.ip() as usize);
                 return Step::Continue(());
             }
             ForceMode::Deep => {
-                    self.push(val.relax());
-                    self.push(val.relax());
-                    self.call_stack.push(CallFrame {
+                m.push(val.relax());
+                m.push(val.relax());
+                m.push_call_frame(CallFrame {
                     pc: PrimOpPhase::ForceResultDeepFinish.ip() as usize,
                     thunk: None,
-                        env: self.env,
+                    env: m.env(),
                 });
-                    self.call_depth += 1;
+                m.inc_call_depth();
                 reader.set_pc(PrimOpPhase::DeepSeq.ip() as usize);
                 return Step::Continue(());
             }
@@ -164,20 +163,19 @@ impl<'gc> crate::Vm<'gc> {
     if let Some(outer_thunk) = thunk {
         *outer_thunk.borrow_mut(mc) = ThunkState::Evaluated(val);
     } else {
-            self.call_depth -= 1;
-            self.push(val.relax())
+        m.dec_call_depth();
+        m.push(val.relax())
     }
-        self.env = env;
+    m.set_env(env);
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_dispatch_primop(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_dispatch_primop<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
-        fix_primops::dispatch_primop(self, ctx, reader, mc)
-    }
+) -> Step {
+    crate::primops::dispatch_primop(m, ctx, reader, mc)
 }

fix-vm/src/instructions/closures.rs

@@ -1,32 +1,32 @@
+use fix_runtime::Machine;
 use gc_arena::{Gc, Mutation, RefLock};
 
 use crate::{BytecodeReader, Step, ThunkState, Value};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_make_thunk(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_make_thunk<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let entry_point = reader.read_u32();
     let thunk = Gc::new(
         mc,
         RefLock::new(ThunkState::Pending {
             ip: entry_point as usize,
-                env: self.env,
+            env: m.env(),
         }),
     );
-        self.push(Value::new_gc(thunk));
+    m.push(Value::new_gc(thunk));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_make_closure(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_make_closure<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let entry_point = reader.read_u32();
     let n_locals = reader.read_u32();
     let closure = Gc::new(
@@ -34,20 +34,20 @@ impl<'gc> crate::Vm<'gc> {
         crate::Closure {
             ip: entry_point,
             n_locals,
-                env: self.env,
+            env: m.env(),
             pattern: None,
         },
     );
-        self.push(Value::new_gc(closure));
+    m.push(Value::new_gc(closure));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_make_pattern_closure(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_make_pattern_closure<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let entry_point = reader.read_u32();
     let n_locals = reader.read_u32();
     let req_count = reader.read_u16() as usize;
@@ -84,11 +84,10 @@ impl<'gc> crate::Vm<'gc> {
         crate::Closure {
             ip: entry_point,
             n_locals,
-                env: self.env,
+            env: m.env(),
             pattern: Some(pattern),
         },
     );
-        self.push(Value::new_gc(closure));
+    m.push(Value::new_gc(closure));
     Step::Continue(())
-    }
 }

fix-vm/src/instructions/collections.rs

@@ -1,6 +1,6 @@
-use fix_abstract_vm::{NixType, resolve_operand};
-use fix_common::StringId;
 use fix_error::Error;
+use fix_lang::StringId;
+use fix_runtime::{Machine, MachineExt, NixType, resolve_operand};
 use gc_arena::{Gc, RefLock};
 use smallvec::SmallVec;
 
@@ -8,48 +8,47 @@ use crate::{
     AttrSet, BytecodeReader, List, Step, StrictValue, Value, VmRuntimeCtx, VmRuntimeCtxExt,
 };
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_make_attrs(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_make_attrs<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let static_count = reader.read_u32() as usize;
     let dynamic_count = reader.read_u32() as usize;
 
     for i in 0..dynamic_count {
         let depth = dynamic_count - 1 - i;
-            self.force_slot_to_pc(depth, reader, mc, reader.inst_start_pc())?;
+        m.force_slot_to_pc(depth, reader, mc, reader.inst_start_pc())?;
     }
 
     let mut dyn_keys: SmallVec<[_; 2]> = SmallVec::with_capacity(dynamic_count);
     for i in 0..dynamic_count {
         let depth = dynamic_count - 1 - i;
-            let key_val = self.peek_forced(depth);
+        let key_val = m.peek_forced(depth);
         let key_sid = match ctx.get_string_id(key_val) {
             Ok(id) => Some(id),
             Err(NixType::Null) => None,
-                Err(got) => return self.finish_type_err(NixType::String, got),
+            Err(got) => return m.finish_type_err(NixType::String, got),
         };
         dyn_keys.push(key_sid);
     }
 
-        self.stack.truncate(self.stack.len() - dynamic_count);
+    m.drop_n(dynamic_count);
 
     let mut kv: SmallVec<[(crate::StringId, Value); 4]> =
         SmallVec::with_capacity(static_count + dynamic_count);
 
     for _ in 0..static_count {
         let key = reader.read_string_id();
-            let val = resolve_operand(&reader.read_operand_data(ctx), mc, self);
+        let val = resolve_operand(&reader.read_operand_data(), mc, ctx, m);
         let _span_id = reader.read_u32();
         kv.push((key, val));
     }
 
     for key in dyn_keys {
-            let val = resolve_operand(&reader.read_operand_data(ctx), mc, self);
+        let val = resolve_operand(&reader.read_operand_data(), mc, ctx, m);
         let _span_id = reader.read_u32();
         if let Some(key) = key {
             kv.push((key, val))
@@ -58,73 +57,73 @@ impl<'gc> crate::Vm<'gc> {
 
     kv.sort_by_key(|(k, _)| *k);
     let attrs = Gc::new(mc, AttrSet::from_sorted_unchecked(kv));
-        self.push(Value::new_gc(attrs));
+    m.push(Value::new_gc(attrs));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_make_empty_attrs(&mut self) -> Step {
-        self.push(self.empty_attrs);
+#[inline(always)]
+pub(crate) fn op_make_empty_attrs<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    m.push(m.empty_attrs());
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_select_static(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_select_static<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let _span_id = reader.read_u32();
     let key = reader.read_string_id();
 
-        let attrset = self.force_and_retry::<Gc<AttrSet>>(reader, mc)?;
+    let attrset = m.force_and_retry::<Gc<AttrSet>>(reader, mc)?;
 
     match attrset.lookup(key) {
         Some(v) => {
-                self.push(v);
+            m.push(v);
         }
-            None => return self.select_skip(key, ctx, reader),
+        None => return select_skip(m, key, ctx, reader),
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_select_dynamic(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_select_dynamic<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let _span_id = reader.read_u32();
 
-        let (attrset, key_val) = self.force_and_retry::<(Gc<AttrSet>, StrictValue)>(reader, mc)?;
+    let (attrset, key_val) = m.force_and_retry::<(Gc<AttrSet>, StrictValue)>(reader, mc)?;
 
     let key_sid = match ctx.get_string_id(key_val) {
         Ok(id) => id,
-            Err(got) => return self.finish_type_err(NixType::String, got),
+        Err(got) => return m.finish_type_err(NixType::String, got),
     };
 
     match attrset.lookup(key_sid) {
         Some(v) => {
-                self.push(v);
+            m.push(v);
         }
-            None => return self.select_skip(key_sid, ctx, reader),
+        None => return select_skip(m, key_sid, ctx, reader),
     }
     Step::Continue(())
-    }
+}
 
-    /// Skip the rest of a **Select** attrpath after a missing attribute.
-    /// Only recognises Select opcodes and jumps; encountering any other
-    /// opcode means we've reached the end of the select sequence and
-    /// should report the missing-attribute error.
-    fn select_skip(
-        &mut self,
+/// Skip the rest of a **Select** attrpath after a missing attribute.
+/// Only recognises Select opcodes and jumps; encountering any other
+/// opcode means we've reached the end of the select sequence and
+/// should report the missing-attribute error.
+fn select_skip<'gc, M: Machine<'gc>>(
+    m: &mut M,
     key: StringId,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
-    ) -> Step {
-        use fix_codegen::Op::*;
+) -> Step {
+    use fix_bytecode::Op::*;
     loop {
         match reader.read_op() {
             SelectStatic => {
@@ -143,17 +142,16 @@ impl<'gc> crate::Vm<'gc> {
             }
             _ => {
                 let name = ctx.resolve_string(key);
-                    return self
-                        .finish_err(Error::eval_error(format!("attribute '{name}' missing")));
-                }
+                return m.finish_err(Error::eval_error(format!("attribute '{name}' missing")));
             }
         }
     }
+}
 
-    /// Skip the rest of a **HasAttr** attrpath after an intermediate
-    /// lookup failed. Only recognises HasAttr opcodes and jumps.
-    fn has_attr_skip(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-        use fix_codegen::Op::*;
+/// Skip the rest of a **HasAttr** attrpath after an intermediate
+/// lookup failed. Only recognises HasAttr opcodes and jumps.
+fn has_attr_skip(reader: &mut BytecodeReader<'_>) -> Step {
+    use fix_bytecode::Op::*;
     loop {
         match reader.read_op() {
             HasAttrPathStatic => {
@@ -182,46 +180,46 @@ impl<'gc> crate::Vm<'gc> {
             }
         }
     }
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_has_attr_path_static(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_has_attr_path_static<'gc, M: Machine<'gc>>(
+    m: &mut M,
     _ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let _span_id = reader.read_u32();
     let key = reader.read_string_id();
 
-        let current = self.force_and_retry::<StrictValue>(reader, mc)?;
+    let current = m.force_and_retry::<StrictValue>(reader, mc)?;
 
     match current
         .as_gc::<AttrSet>()
         .and_then(|attrs| attrs.lookup(key))
     {
         Some(v) => {
-                self.push(v);
+            m.push(v);
         }
-            None => return self.has_attr_skip(reader),
+        None => return has_attr_skip(reader),
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_has_attr_path_dynamic(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_has_attr_path_dynamic<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let _span_id = reader.read_u32();
 
-        let (current, key_val) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+    let (current, key_val) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
 
     let key_sid = match ctx.get_string_id(key_val) {
         Ok(id) => id,
-            Err(got) => return self.finish_type_err(NixType::String, got),
+        Err(got) => return m.finish_type_err(NixType::String, got),
     };
 
     match current
@@ -229,37 +227,43 @@ impl<'gc> crate::Vm<'gc> {
         .and_then(|attrs| attrs.lookup(key_sid))
     {
         Some(v) => {
-                self.push(v);
+            m.push(v);
         }
-            None => return self.has_attr_skip(reader),
+        None => return has_attr_skip(reader),
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_jump_if_select_failed(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_jump_if_select_failed<'gc, M: Machine<'gc>>(
+    _m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
     // No-op
     let _offset = reader.read_i32();
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_jump_if_select_succeeded(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_jump_if_select_succeeded<'gc, M: Machine<'gc>>(
+    _m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
     let offset = reader.read_i32();
     reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_has_attr_static(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_has_attr_static<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let key = reader.read_string_id();
-        let current = self.force_and_retry::<StrictValue>(reader, mc)?;
+    let current = m.force_and_retry::<StrictValue>(reader, mc)?;
 
-        self.push(Value::new_inline(
+    m.push(Value::new_inline(
         current
             .as_gc::<AttrSet>()
             .and_then(|attrs| attrs.lookup(key))
@@ -269,23 +273,23 @@ impl<'gc> crate::Vm<'gc> {
     reader.set_pc(reader.pc() + 1);
 
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_has_attr_dynamic(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_has_attr_dynamic<'gc, M: MachineExt<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
-        let (current, dyn_key) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+) -> Step {
+    let (current, dyn_key) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
 
     let key_sid = match ctx.get_string_id(dyn_key) {
         Ok(id) => id,
-            Err(got) => return self.finish_type_err(NixType::String, got),
+        Err(got) => return m.finish_type_err(NixType::String, got),
     };
 
-        self.push(Value::new_inline(
+    m.push(Value::new_inline(
         current
             .as_gc::<AttrSet>()
             .and_then(|attrs| attrs.lookup(key_sid))
@@ -295,26 +299,26 @@ impl<'gc> crate::Vm<'gc> {
     reader.set_pc(reader.pc() + 1);
 
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_has_attr_resolve(&mut self) -> Step {
+#[inline(always)]
+pub(crate) fn op_has_attr_resolve<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
     // If we reach here, has_attr check has failed, push false (AttrSet is already popped)
-        self.push(Value::new_inline(false));
+    m.push(Value::new_inline(false));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_make_list(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_make_list<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let count = reader.read_u32() as usize;
     let mut items: SmallVec<[Value; 4]> = SmallVec::with_capacity(count);
     for _ in 0..count {
-            items.push(resolve_operand(&reader.read_operand_data(ctx), mc, self));
+        items.push(resolve_operand(&reader.read_operand_data(), mc, ctx, m));
     }
     let list = Gc::new(
         mc,
@@ -322,13 +326,12 @@ impl<'gc> crate::Vm<'gc> {
             inner: RefLock::new(items),
         },
     );
-        self.push(Value::new_gc(list));
+    m.push(Value::new_gc(list));
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_make_empty_list<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    m.push(m.empty_list());
     Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_make_empty_list(&mut self) -> Step {
-        self.push(self.empty_list);
-        Step::Continue(())
-    }
 }

fix-vm/src/instructions/control.rs

@@ -1,60 +1,58 @@
-use fix_abstract_vm::*;
 use fix_error::Error;
+use fix_runtime::*;
 use gc_arena::Mutation;
 
 use crate::{BytecodeReader, Step, VmRuntimeCtx};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_jump_if_false(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_jump_if_false<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let offset = reader.read_i32();
-        let cond = self.force_and_retry::<StrictValue>(reader, mc)?;
+    let cond = m.force_and_retry::<StrictValue>(reader, mc)?;
     if cond.as_inline::<bool>() == Some(false) {
         reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_jump_if_true(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_jump_if_true<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let offset = reader.read_i32();
-        let cond = self.force_and_retry::<StrictValue>(reader, mc)?;
+    let cond = m.force_and_retry::<StrictValue>(reader, mc)?;
     if cond.as_inline::<bool>() == Some(true) {
         reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_jump(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_jump<'gc, M: Machine<'gc>>(_m: &mut M, reader: &mut BytecodeReader<'_>) -> Step {
     let offset = reader.read_i32();
     reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_assert(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_assert<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let raw_id = reader.read_string_id();
     let raw = ctx.resolve_string(raw_id);
     let _span_id = reader.read_u32();
-        let assertion = self.force_and_retry::<bool>(reader, mc)?;
+    let assertion = m.force_and_retry::<bool>(reader, mc)?;
     if !assertion {
         // FIXME: use catchable error
-            return self.finish_err(Error::eval_error(format!("assertion '{raw}' failed")));
+        return m.finish_err(Error::eval_error(format!("assertion '{raw}' failed")));
     }
     Step::Continue(())
-    }
 }

fix-vm/src/instructions/literals.rs

@@ -1,55 +1,63 @@
+use fix_runtime::Machine;
 use gc_arena::{Gc, Mutation};
 
 use crate::{BytecodeReader, Step, Value};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_push_smi(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_push_smi<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
     let val = reader.read_i32();
-        self.push(Value::new_inline(val));
+    m.push(Value::new_inline(val));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_push_bigint(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_push_bigint<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let val = reader.read_i64();
-        self.push(Value::new_gc(Gc::new(mc, val)));
+    m.push(Value::new_gc(Gc::new(mc, val)));
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_push_float<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
+    let val = reader.read_f64();
+    m.push(Value::new_float(val));
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_push_string<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
+    let sid = reader.read_string_id();
+    m.push(Value::new_inline(sid));
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_push_null<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    m.push(Value::new_inline(crate::Null));
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_push_true<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    m.push(Value::new_inline(true));
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_push_false<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    m.push(Value::new_inline(false));
     Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_push_float(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-        let val = reader.read_f64();
-        self.push(Value::new_float(val));
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_push_string(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-        let sid = reader.read_string_id();
-        self.push(Value::new_inline(sid));
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_push_null(&mut self) -> Step {
-        self.push(Value::new_inline(crate::Null));
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_push_true(&mut self) -> Step {
-        self.push(Value::new_inline(true));
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_push_false(&mut self) -> Step {
-        self.push(Value::new_inline(false));
-        Step::Continue(())
-    }
 }

fix-vm/src/instructions/misc.rs

@@ -1,105 +1,102 @@
 use std::path::PathBuf;
 
-use fix_abstract_vm::{
-    AttrSet, NixString, Path, StrictValue, StringContext, canon_path_str
-};
-use fix_builtins::BuiltinId;
-use fix_common::StringId;
+use fix_bytecode::PrimOpPhase;
 use fix_error::Error;
-use num_enum::TryFromPrimitive;
+use fix_lang::{BUILTINS, BuiltinId, StringId};
+use fix_runtime::{
+    AttrSet, Machine, MachineExt, NixString, Path, StrictValue, StringContext, canon_path_str,
+};
 
 use crate::{BytecodeReader, PrimOp, Step, Value, VmRuntimeCtx, VmRuntimeCtxExt};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_load_builtins(&mut self) -> Step {
-        self.push(self.builtins);
+#[inline(always)]
+pub(crate) fn op_load_builtins<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    m.push(m.builtins());
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_load_builtin(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-        let Ok(id) = BuiltinId::try_from_primitive(reader.read_u8())
+#[inline(always)]
+pub(crate) fn op_load_builtin<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
+    let Ok(id) = BuiltinId::try_from(reader.read_u8())
         .map_err(|err| panic!("unknown builtin id: {}", err.number));
-        self.push(Value::new_inline(PrimOp {
+    m.push(Value::new_inline(PrimOp {
         id,
-            arity: fix_builtins::BUILTINS[id as usize].1,
-            dispatch_ip: id.entry_phase().ip(),
+        arity: BUILTINS[id as usize].1,
+        dispatch_ip: PrimOpPhase::entry_for_builtin(id).ip(),
     }));
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_load_repl_binding(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_load_repl_binding<'gc, M: Machine<'gc>>(
+    _m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
     let _name = reader.read_string_id();
     todo!("LoadReplBinding");
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_load_scoped_binding(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_load_scoped_binding<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     _mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let slot_id = reader.read_u32();
     let name = reader.read_string_id();
-        let scope = match self.scope_slots.get(slot_id as usize).copied() {
-            Some(s) => s,
-            None => {
-                return self.finish_err(Error::eval_error(format!(
-                    "internal: invalid scope slot {slot_id}"
-                )));
-            }
-        };
+    let scope = m.scope_slot(slot_id);
     let Some(attrs) = scope.as_gc::<AttrSet>() else {
-            return self.finish_err(Error::eval_error("internal: scope slot is not an attrset"));
+        return m.finish_err(Error::eval_error("internal: scope slot is not an attrset"));
     };
     match attrs.lookup(name) {
         Some(val) => {
-                self.push(val);
+            m.push(val);
             Step::Continue(())
         }
-            None => self.finish_err(Error::eval_error(format!(
+        None => m.finish_err(Error::eval_error(format!(
             "scoped binding '{}' not found",
             ctx.resolve_string(name)
         ))),
     }
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_coerce_to_string(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_coerce_to_string<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
-        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
+) -> Step {
+    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
     if val.is::<StringId>() || val.is::<NixString>() {
-            self.push(val.relax());
+        m.push(val.relax());
     } else if let Some(p) = val.as_inline::<Path>() {
         // Coercing a path to a string yields the canonical path text.
         // FIXME: copy to store
-            self.push(Value::new_inline(p.0));
+        m.push(Value::new_inline(p.0));
     } else {
         todo!("coerce other types to string: {:?}", val.ty());
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_concat_strings(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_concat_strings<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let count = reader.read_u16() as usize;
     let _force_string = reader.read_u8() != 0;
 
     let mut total_len = 0;
     let mut has_any_context = false;
     for i in 0..count {
-            let val = self.peek_forced(count - 1 - i);
+        let val = m.peek_forced(count - 1 - i);
         let s = ctx.get_string(val).expect("coerced");
         total_len += s.len();
         if !ctx.get_string_context(val).is_empty() {
@@ -110,7 +107,7 @@ impl<'gc> crate::Vm<'gc> {
     let mut result = String::with_capacity(total_len);
     let mut merged = StringContext::new();
     for i in 0..count {
-            let val = self.peek_forced(count - 1 - i);
+        let val = m.peek_forced(count - 1 - i);
         let s = ctx.get_string(val).expect("coerced");
         result.push_str(s);
         if has_any_context {
@@ -121,36 +118,36 @@ impl<'gc> crate::Vm<'gc> {
         }
     }
 
-        self.stack.truncate(self.stack.len() - count);
+    m.drop_n(count);
 
     if merged.is_empty() {
         let sid = ctx.intern_string(result);
-            self.push(Value::new_inline(sid));
+        m.push(Value::new_inline(sid));
     } else {
         let ns = gc_arena::Gc::new(mc, NixString::with_context(result, merged));
-            self.push(Value::new_gc(ns));
+        m.push(Value::new_gc(ns));
     }
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_resolve_path(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_resolve_path<'gc, M: MachineExt<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
-        let path_val = self.force_and_retry::<StrictValue>(reader, mc)?;
+) -> Step {
+    let path_val = m.force_and_retry::<StrictValue>(reader, mc)?;
     let dir_id = reader.read_string_id();
     // Already a path: keep as-is. ResolvePath is idempotent on paths.
     if let Some(p) = path_val.as_inline::<Path>() {
-            self.push(Value::new_inline(p));
+        m.push(Value::new_inline(p));
         return Step::Continue(());
     }
     let path = match ctx.get_string(path_val) {
         Some(s) => s.to_owned(),
         None => {
-                return self.finish_err(Error::eval_error(format!(
+            return m.finish_err(Error::eval_error(format!(
                 "expected a string for path, got {}",
                 path_val.ty()
             )));
@@ -158,12 +155,11 @@ impl<'gc> crate::Vm<'gc> {
     };
     let resolved = match resolve_path_str(ctx.resolve_string(dir_id), &path) {
         Ok(s) => s,
-            Err(e) => return self.finish_err(e),
+        Err(e) => return m.finish_err(e),
     };
     let sid = ctx.intern_string(resolved);
-        self.push(Value::new_inline(Path(sid)));
+    m.push(Value::new_inline(Path(sid)));
     Step::Continue(())
-    }
 }
 
 fn resolve_path_str(current_dir: &str, path: &str) -> Result<String, Box<Error>> {

fix-vm/src/instructions/mod.rs

@@ -7,3 +7,13 @@ pub(crate) mod literals;
 pub(crate) mod misc;
 pub(crate) mod variables;
 pub(crate) mod with_scope;
+
+pub(crate) use arithmetic::*;
+pub(crate) use calls::*;
+pub(crate) use closures::*;
+pub(crate) use collections::*;
+pub(crate) use control::*;
+pub(crate) use literals::*;
+pub(crate) use misc::*;
+pub(crate) use variables::*;
+pub(crate) use with_scope::*;

fix-vm/src/instructions/variables.rs

@@ -1,50 +1,56 @@
+use fix_runtime::Machine;
+
 use crate::{BytecodeReader, Mutation, Step, Value};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_load_local(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_load_local<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
     let idx = reader.read_u32() as usize;
-        self.push(self.env.borrow().locals[idx]);
+    m.push(m.env().borrow().locals[idx]);
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_load_outer(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
+#[inline(always)]
+pub(crate) fn op_load_outer<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+) -> Step {
     let layer = reader.read_u8();
     let idx = reader.read_u32() as usize;
-        let mut cur = self.env;
+    let mut cur = m.env();
     for _ in 0..layer {
         let prev = cur.borrow().prev.expect("LoadOuter: env chain too short");
         cur = prev;
     }
     let val = cur.borrow().locals[idx];
-        self.push(val);
+    m.push(val);
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_store_local(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_store_local<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let idx = reader.read_u32() as usize;
-        let val = self.pop();
-        self.env.borrow_mut(mc).locals[idx] = val;
+    let val = m.pop();
+    m.env().borrow_mut(mc).locals[idx] = val;
     Step::Continue(())
-    }
+}
 
-    #[inline(always)]
-    pub(crate) fn op_alloc_locals(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_alloc_locals<'gc, M: Machine<'gc>>(
+    m: &mut M,
     reader: &mut BytecodeReader<'_>,
     mc: &Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     let count = reader.read_u32() as usize;
-        self.env
+    m.env()
         .borrow_mut(mc)
         .locals
         .extend(std::iter::repeat_n(Value::default(), count));
     Step::Continue(())
-    }
 }

fix-vm/src/instructions/with_scope.rs

@@ -1,26 +1,25 @@
-use fix_abstract_vm::{resolve_operand, *};
-use fix_common::Symbol;
 use fix_error::Error;
+use fix_lang::Symbol;
+use fix_runtime::{resolve_operand, *};
 use smallvec::SmallVec;
 
 use crate::{Break, BytecodeReader, CallFrame, Step, VmRuntimeCtx};
 
-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_lookup_with(
-        &mut self,
+#[inline(always)]
+pub(crate) fn op_lookup_with<'gc, M: Machine<'gc>>(
+    m: &mut M,
     ctx: &mut impl VmRuntimeCtx,
     reader: &mut BytecodeReader<'_>,
     mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
+) -> Step {
     #[allow(clippy::unwrap_used)]
-        let counter = self.peek_forced(0).as_inline::<i32>().unwrap();
+    let counter = m.peek_forced(0).as_inline::<i32>().unwrap();
 
     let name = reader.read_string_id();
     let n = reader.read_u8();
     let mut namespaces = SmallVec::<[_; 2]>::new();
     for _ in 0..n {
-            namespaces.push(resolve_operand(&reader.read_operand_data(ctx), mc, self));
+        namespaces.push(resolve_operand(&reader.read_operand_data(), mc, ctx, m));
     }
 
     let resume_pc = reader.inst_start_pc();
@@ -31,28 +30,27 @@ impl<'gc> crate::Vm<'gc> {
             match *state {
                 ThunkState::Pending { ip, env } => {
                     *state = ThunkState::Blackhole;
-                        self.call_stack.push(CallFrame {
+                    m.push_call_frame(CallFrame {
                         thunk: Some(thunk),
                         pc: resume_pc,
-                            env: self.env,
+                        env: m.env(),
                     });
-                        self.env = env;
+                    m.set_env(env);
                     reader.set_pc(ip);
                     return Step::Break(Break::Force);
                 }
                 ThunkState::Evaluated(v) => v,
                 ThunkState::Apply { func, arg } => {
-                        self.call_stack.push(CallFrame {
+                    m.push_call_frame(CallFrame {
                         thunk: Some(thunk),
                         pc: resume_pc,
-                            env: self.env,
+                        env: m.env(),
                     });
-                        self.push(func);
-                        return self.call(reader, mc, arg, resume_pc);
+                    m.push(func);
+                    return m.call(reader, mc, arg, resume_pc);
                 }
                 ThunkState::Blackhole => {
-                        return self
-                            .finish_err(Error::eval_error("infinite recursion encountered"));
+                    return m.finish_err(Error::eval_error("infinite recursion encountered"));
                 }
             }
         }
@@ -62,17 +60,16 @@ impl<'gc> crate::Vm<'gc> {
         .as_gc::<AttrSet>()
         .and_then(|attrs| attrs.lookup(name))
     {
-            self.replace(0, val);
+        m.replace(0, val);
     } else if counter + 1 == n as i32 {
-            return self.finish_err(Error::eval_error(format!(
+        return m.finish_err(Error::eval_error(format!(
             "undefined variable '{}'",
             Symbol::from(ctx.resolve_string(name))
         )));
     } else {
-            self.replace(0, Value::new_inline(counter + 1));
+        m.replace(0, Value::new_inline(counter + 1));
         reader.set_pc(resume_pc);
     }
 
     Step::Continue(())
-    }
 }

fix-vm/src/lib.rs

@@ -7,20 +7,19 @@
 
 use std::path::PathBuf;
 
-use fix_builtins::{BUILTINS, BuiltinId};
-use fix_codegen::InstructionPtr;
-use fix_common::StringId;
+use fix_bytecode::{InstructionPtr, PrimOpPhase};
 use fix_error::{Error, Result, Source};
+use fix_lang::{BUILTINS, BuiltinId, StringId};
 use gc_arena::metrics::Pacing;
 use gc_arena::{Arena, Collect, Gc, Mutation, RefLock, Rootable};
 use hashbrown::HashMap;
-use num_enum::TryFromPrimitive;
 use smallvec::SmallVec;
 
 #[cfg(feature = "tailcall")]
 mod dispatch_tailcall;
-pub use fix_abstract_vm::*;
+pub use fix_runtime::*;
 mod instructions;
+mod primops;
 
 type VmResult<T> = std::result::Result<T, VmError>;
 
@@ -46,7 +45,7 @@ pub struct Vm<'gc> {
     force_mode: ForceMode,
 
     #[collect(require_static)]
-    result: Option<Result<fix_common::Value>>,
+    result: Option<Result<fix_lang::Value>>,
 
     #[collect(require_static)]
     pending_load: Option<PendingLoad>,
@@ -58,10 +57,10 @@ fn init_builtins<'gc>(mc: &Mutation<'gc>, ctx: &mut impl VmRuntimeCtx) -> Value<
     let mut entries = SmallVec::with_capacity(BUILTINS.len());
 
     for (idx, &(name, arity)) in BUILTINS.iter().enumerate() {
-        let id = BuiltinId::try_from_primitive(idx as u8).expect("infallible");
+        let id = BuiltinId::try_from(idx as u8).expect("infallible");
         let name = name.strip_prefix("__").unwrap_or(name);
         let name = ctx.intern_string(name);
-        let dispatch_ip = id.entry_phase().ip();
+        let dispatch_ip = PrimOpPhase::entry_for_builtin(id).ip();
         entries.push((
             name,
             Value::new_inline(PrimOp {
@@ -137,45 +136,20 @@ impl<'gc> Vm<'gc> {
             functor_sym: ctx.intern_string("__functor"),
         }
     }
+}
 
-    #[inline(always)]
-    fn finish_ok(&mut self, val: fix_common::Value) -> Step {
-        self.result = Some(Ok(val));
-        Step::Break(Break::Done)
-    }
-
-    #[inline(always)]
-    fn finish_err(&mut self, err: Box<Error>) -> Step {
-        self.result = Some(Err(err));
-        Step::Break(Break::Done)
-    }
-
-    #[inline(always)]
-    fn finish_type_err(&mut self, expected: NixType, got: NixType) -> Step {
-        self.result = Some(Err(Error::eval_error(format!(
-            "expected {expected}, got {got}"
-        ))));
-        Step::Break(Break::Done)
-    }
-
-    #[inline(always)]
-    fn finish_vm_err(&mut self, err: VmError) -> Step {
-        self.finish_err(err.into_error())
-    }
-
+impl<'gc> Machine<'gc> for Vm<'gc> {
     #[inline(always)]
     fn push(&mut self, val: Value<'gc>) {
         self.stack.push(val);
     }
 
     #[inline(always)]
-    #[must_use]
     fn pop(&mut self) -> Value<'gc> {
         self.stack.pop().expect("stack underflow")
     }
 
     #[inline(always)]
-    #[must_use]
     fn peek(&self, depth: usize) -> Value<'gc> {
         *self
             .stack
@@ -184,7 +158,6 @@ impl<'gc> Vm<'gc> {
     }
 
     #[inline(always)]
-    #[must_use]
     fn peek_forced(&self, depth: usize) -> StrictValue<'gc> {
         self.stack
             .get(self.stack.len() - depth - 1)
@@ -193,6 +166,15 @@ impl<'gc> Vm<'gc> {
             .expect("forced")
     }
 
+    #[inline(always)]
+    fn pop_forced(&mut self) -> StrictValue<'gc> {
+        self.stack
+            .pop()
+            .expect("stack underflow")
+            .restrict()
+            .expect("forced")
+    }
+
     #[inline(always)]
     fn replace(&mut self, depth: usize, val: Value<'gc>) {
         let len = self.stack.len();
@@ -203,72 +185,13 @@ impl<'gc> Vm<'gc> {
     }
 
     #[inline(always)]
-    #[cfg_attr(debug_assertions, track_caller)]
-    fn pop_forced(&mut self) -> StrictValue<'gc> {
-        self.stack
-            .pop()
-            .expect("stack underflow")
-            .restrict()
-            .expect("forced")
-    }
-
-    /// Force the top `T::WIDTH` stack slots and return them as `T`.
-    ///
-    /// If any slot holds a pending thunk, this method pushes a call frame
-    /// whose resume PC is the **start of the current instruction**
-    /// (`reader.inst_start_pc()`), enters the thunk, and returns
-    /// `Break::Force`.  When the thunk eventually returns, the VM will
-    /// **re-execute the entire opcode handler from the beginning**.
-    ///
-    /// # Invariants
-    ///
-    /// * **Do not call this method more than once in a single handler.**
-    ///   If you need to force multiple values, use a tuple type such as
-    ///   `(StrictValue, StrictValue)` so they are forced and popped in one
-    ///   atomic operation.  Calling `force_and_retry` twice (or more)
-    ///   means the handler will be re-run from the top after each retry;
-    ///   any stack modifications between the two calls would be duplicated
-    ///   and corrupt the stack layout.
-    ///
-    /// * The caller must ensure that the stack layout at the point of
-    ///   invocation is **identical** every time the handler is re-entered.
-    ///   In practice this means no pushes, pops, or local mutations may
-    ///   happen before the call, and the call must be the first thing
-    ///   that consumes the instruction's operand values.
-    ///
-    /// * The return value must be propagated with `?` so that
-    ///   `Break::Force` correctly unwinds to the dispatch loop.
-    #[inline(always)]
-    fn force_and_retry<T: Forced<'gc>>(
-        &mut self,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> std::ops::ControlFlow<Break, T> {
-        self.force_and_retry_pc(reader, mc, reader.inst_start_pc())
-    }
-
-    /// Same as [`force_and_retry`](Self::force_and_retry) but allows
-    /// specifying a custom resume PC.
-    #[inline(always)]
-    fn force_and_retry_pc<T: Forced<'gc>>(
-        &mut self,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-        resume_pc: usize,
-    ) -> std::ops::ControlFlow<Break, T> {
-        T::force_and_check(self, reader, mc, 0, resume_pc)?;
-        std::ops::ControlFlow::Continue(T::pop_converted(self))
+    fn drop_n(&mut self, depth: usize) {
+        self.stack.truncate(self.stack.len() - depth);
     }
 
     #[inline(always)]
-    #[allow(unused)]
-    fn force_slot(
-        &mut self,
-        depth: usize,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> Step {
-        self.force_slot_to_pc(depth, reader, mc, reader.inst_start_pc())
+    fn stack_len(&self) -> usize {
+        self.stack.len()
     }
 
     #[inline(always)]
@@ -313,54 +236,6 @@ impl<'gc> Vm<'gc> {
             }
         }
     }
-}
-
-impl<'gc> Machine<'gc> for Vm<'gc> {
-    #[inline(always)]
-    fn push(&mut self, val: Value<'gc>) {
-        self.push(val);
-    }
-
-    #[inline(always)]
-    fn pop(&mut self) -> Value<'gc> {
-        self.pop()
-    }
-
-    #[inline(always)]
-    fn peek(&self, depth: usize) -> Value<'gc> {
-        Vm::peek(self, depth)
-    }
-
-    #[inline(always)]
-    fn peek_forced(&self, depth: usize) -> StrictValue<'gc> {
-        Vm::peek_forced(self, depth)
-    }
-
-    #[inline(always)]
-    fn pop_forced(&mut self) -> StrictValue<'gc> {
-        self.pop_forced()
-    }
-
-    #[inline(always)]
-    fn replace(&mut self, depth: usize, val: Value<'gc>) {
-        self.replace(depth, val);
-    }
-
-    #[inline(always)]
-    fn stack_len(&self) -> usize {
-        self.stack.len()
-    }
-
-    #[inline(always)]
-    fn force_slot_to_pc(
-        &mut self,
-        depth: usize,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-        resume_pc: usize,
-    ) -> Step {
-        self.force_slot_to_pc(depth, reader, mc, resume_pc)
-    }
 
     #[inline(always)]
     fn call(
@@ -370,7 +245,7 @@ impl<'gc> Machine<'gc> for Vm<'gc> {
         arg: Value<'gc>,
         resume_pc: usize,
     ) -> Step {
-        self.call(reader, mc, arg, resume_pc)
+        instructions::call(self, reader, mc, arg, resume_pc)
     }
 
     #[inline(always)]
@@ -409,18 +284,23 @@ impl<'gc> Machine<'gc> for Vm<'gc> {
     }
 
     #[inline(always)]
-    fn finish_ok(&mut self, val: fix_common::Value) -> Step {
-        self.finish_ok(val)
+    fn finish_ok(&mut self, val: fix_lang::Value) -> Step {
+        self.result = Some(Ok(val));
+        Step::Break(Break::Done)
     }
 
     #[inline(always)]
     fn finish_err(&mut self, err: Box<Error>) -> Step {
-        self.finish_err(err)
+        self.result = Some(Err(err));
+        Step::Break(Break::Done)
     }
 
     #[inline(always)]
     fn finish_type_err(&mut self, expected: NixType, got: NixType) -> Step {
-        self.finish_type_err(expected, got)
+        self.result = Some(Err(Error::eval_error(format!(
+            "expected {expected}, got {got}"
+        ))));
+        Step::Break(Break::Done)
     }
 
     #[inline(always)]
@@ -481,7 +361,7 @@ impl<'gc> Machine<'gc> for Vm<'gc> {
 
 enum Action {
     Continue { pc: usize },
-    Done(Result<fix_common::Value>),
+    Done(Result<fix_lang::Value>),
     LoadFile(PendingLoad),
 }
 
@@ -504,7 +384,7 @@ impl Vm<'_> {
         ctx: &mut C,
         ip: InstructionPtr,
         force_mode: ForceMode,
-    ) -> Result<fix_common::Value> {
+    ) -> Result<fix_lang::Value> {
         let (code, runtime) = ctx.split();
         let mut arena: Arena<Rootable![Vm<'_>]> = Arena::new(|mc| Vm::new(force_mode, mc, runtime));
         arena.metrics().set_pacing(Pacing {
@@ -589,7 +469,8 @@ impl<'gc> Vm<'gc> {
         pc: usize,
         mc: &Mutation<'gc>,
     ) -> Action {
-        use fix_codegen::Op::*;
+        use fix_bytecode::Op::*;
+        use instructions::*;
 
         let mut reader = BytecodeReader::new(bytecode, pc);
         let mut fuel = Self::DEFAULT_FUEL_AMOUNT;
@@ -603,75 +484,75 @@ impl<'gc> Vm<'gc> {
             let op = reader.read_op();
 
             let result = match op {
-                PushSmi => self.op_push_smi(&mut reader),
-                PushBigInt => self.op_push_bigint(&mut reader, mc),
-                PushFloat => self.op_push_float(&mut reader),
-                PushString => self.op_push_string(&mut reader),
-                PushNull => self.op_push_null(),
-                PushTrue => self.op_push_true(),
-                PushFalse => self.op_push_false(),
+                PushSmi => op_push_smi(self, &mut reader),
+                PushBigInt => op_push_bigint(self, &mut reader, mc),
+                PushFloat => op_push_float(self, &mut reader),
+                PushString => op_push_string(self, &mut reader),
+                PushNull => op_push_null(self),
+                PushTrue => op_push_true(self),
+                PushFalse => op_push_false(self),
 
-                LoadLocal => self.op_load_local(&mut reader),
-                LoadOuter => self.op_load_outer(&mut reader),
-                StoreLocal => self.op_store_local(&mut reader, mc),
-                AllocLocals => self.op_alloc_locals(&mut reader, mc),
+                LoadLocal => op_load_local(self, &mut reader),
+                LoadOuter => op_load_outer(self, &mut reader),
+                StoreLocal => op_store_local(self, &mut reader, mc),
+                AllocLocals => op_alloc_locals(self, &mut reader, mc),
 
-                MakeThunk => self.op_make_thunk(&mut reader, mc),
-                MakeClosure => self.op_make_closure(&mut reader, mc),
-                MakePatternClosure => self.op_make_pattern_closure(&mut reader, mc),
+                MakeThunk => op_make_thunk(self, &mut reader, mc),
+                MakeClosure => op_make_closure(self, &mut reader, mc),
+                MakePatternClosure => op_make_pattern_closure(self, &mut reader, mc),
 
-                Call => self.op_call(ctx, &mut reader, mc),
-                DispatchPrimOp => self.op_dispatch_primop(ctx, &mut reader, mc),
-                Return => self.op_return(ctx, &mut reader, mc),
+                Call => op_call(self, ctx, &mut reader, mc),
+                DispatchPrimOp => op_dispatch_primop(self, ctx, &mut reader, mc),
+                Return => op_return(self, ctx, &mut reader, mc),
 
-                MakeAttrs => self.op_make_attrs(ctx, &mut reader, mc),
-                MakeEmptyAttrs => self.op_make_empty_attrs(),
-                SelectStatic => self.op_select_static(ctx, &mut reader, mc),
-                SelectDynamic => self.op_select_dynamic(ctx, &mut reader, mc),
-                HasAttrPathStatic => self.op_has_attr_path_static(ctx, &mut reader, mc),
-                HasAttrPathDynamic => self.op_has_attr_path_dynamic(ctx, &mut reader, mc),
-                HasAttrStatic => self.op_has_attr_static(&mut reader, mc),
-                HasAttrDynamic => self.op_has_attr_dynamic(ctx, &mut reader, mc),
-                HasAttrResolve => self.op_has_attr_resolve(),
-                JumpIfSelectFailed => self.op_jump_if_select_failed(&mut reader),
-                JumpIfSelectSucceeded => self.op_jump_if_select_succeeded(&mut reader),
+                MakeAttrs => op_make_attrs(self, ctx, &mut reader, mc),
+                MakeEmptyAttrs => op_make_empty_attrs(self),
+                SelectStatic => op_select_static(self, ctx, &mut reader, mc),
+                SelectDynamic => op_select_dynamic(self, ctx, &mut reader, mc),
+                HasAttrPathStatic => op_has_attr_path_static(self, ctx, &mut reader, mc),
+                HasAttrPathDynamic => op_has_attr_path_dynamic(self, ctx, &mut reader, mc),
+                HasAttrStatic => op_has_attr_static(self, &mut reader, mc),
+                HasAttrDynamic => op_has_attr_dynamic(self, ctx, &mut reader, mc),
+                HasAttrResolve => op_has_attr_resolve(self),
+                JumpIfSelectFailed => op_jump_if_select_failed(self, &mut reader),
+                JumpIfSelectSucceeded => op_jump_if_select_succeeded(self, &mut reader),
 
-                MakeList => self.op_make_list(ctx, &mut reader, mc),
-                MakeEmptyList => self.op_make_empty_list(),
+                MakeList => op_make_list(self, ctx, &mut reader, mc),
+                MakeEmptyList => op_make_empty_list(self),
 
-                OpAdd => self.op_add(ctx, &mut reader, mc),
-                OpSub => self.op_sub(&mut reader, mc),
-                OpMul => self.op_mul(&mut reader, mc),
-                OpDiv => self.op_div(&mut reader, mc),
-                OpEq => self.op_eq(ctx, &mut reader, mc),
-                OpNeq => self.op_neq(ctx, &mut reader, mc),
-                OpLt => self.op_lt(ctx, &mut reader, mc),
-                OpGt => self.op_gt(ctx, &mut reader, mc),
-                OpLeq => self.op_leq(ctx, &mut reader, mc),
-                OpGeq => self.op_geq(ctx, &mut reader, mc),
-                OpConcat => self.op_concat(&mut reader, mc),
-                OpUpdate => self.op_update(&mut reader, mc),
+                OpAdd => op_add(self, ctx, &mut reader, mc),
+                OpSub => op_sub(self, &mut reader, mc),
+                OpMul => op_mul(self, &mut reader, mc),
+                OpDiv => op_div(self, &mut reader, mc),
+                OpEq => op_eq(self, ctx, &mut reader, mc),
+                OpNeq => op_neq(self, ctx, &mut reader, mc),
+                OpLt => op_lt(self, ctx, &mut reader, mc),
+                OpGt => op_gt(self, ctx, &mut reader, mc),
+                OpLeq => op_leq(self, ctx, &mut reader, mc),
+                OpGeq => op_geq(self, ctx, &mut reader, mc),
+                OpConcat => op_concat(self, &mut reader, mc),
+                OpUpdate => op_update(self, &mut reader, mc),
 
-                OpNeg => self.op_neg(&mut reader, mc),
-                OpNot => self.op_not(&mut reader, mc),
+                OpNeg => op_neg(self, &mut reader, mc),
+                OpNot => op_not(self, &mut reader, mc),
 
-                JumpIfFalse => self.op_jump_if_false(&mut reader, mc),
-                JumpIfTrue => self.op_jump_if_true(&mut reader, mc),
-                Jump => self.op_jump(&mut reader),
+                JumpIfFalse => op_jump_if_false(self, &mut reader, mc),
+                JumpIfTrue => op_jump_if_true(self, &mut reader, mc),
+                Jump => op_jump(self, &mut reader),
 
-                ConcatStrings => self.op_concat_strings(ctx, &mut reader, mc),
-                CoerceToString => self.op_coerce_to_string(&mut reader, mc),
-                ResolvePath => self.op_resolve_path(ctx, &mut reader, mc),
+                ConcatStrings => op_concat_strings(self, ctx, &mut reader, mc),
+                CoerceToString => op_coerce_to_string(self, &mut reader, mc),
+                ResolvePath => op_resolve_path(self, ctx, &mut reader, mc),
 
-                Assert => self.op_assert(ctx, &mut reader, mc),
+                Assert => op_assert(self, ctx, &mut reader, mc),
 
-                LookupWith => self.op_lookup_with(ctx, &mut reader, mc),
+                LookupWith => op_lookup_with(self, ctx, &mut reader, mc),
 
-                LoadBuiltins => self.op_load_builtins(),
-                LoadBuiltin => self.op_load_builtin(&mut reader),
+                LoadBuiltins => op_load_builtins(self),
+                LoadBuiltin => op_load_builtin(self, &mut reader),
 
-                LoadReplBinding => self.op_load_repl_binding(&mut reader),
-                LoadScopedBinding => self.op_load_scoped_binding(ctx, &mut reader, mc),
+                LoadReplBinding => op_load_repl_binding(self, &mut reader),
+                LoadScopedBinding => op_load_scoped_binding(self, ctx, &mut reader, mc),
 
                 Illegal => unreachable!(),
             };

fix-vm/src/primops/context.rs

@@ -2,16 +2,16 @@
 //! `builtins.unsafeDiscardStringContext`,
 //! `builtins.unsafeDiscardOutputDependency`.
 //!
-//! See `fix-abstract-vm/src/string_context.rs` for the
+//! See `fix-runtime/src/string_context.rs` for the
 //! `StringContextElem` type.
 
-use fix_abstract_vm::{
+use fix_bytecode::PrimOpPhase;
+use fix_error::Error;
+use fix_lang::StringId;
+use fix_runtime::{
     AttrSet, BytecodeReader, List as VmList, Machine, MachineExt, NixString, NixType, Step,
     StrictValue, StringContext, StringContextElem, Value, VmRuntimeCtx, VmRuntimeCtxExt,
 };
-use fix_builtins::PrimOpPhase;
-use fix_common::StringId;
-use fix_error::Error;
 use gc_arena::{Gc, Mutation};
 use smallvec::SmallVec;
 

fix-vm/src/primops/control.rs

@@ -1,9 +1,9 @@
-use fix_abstract_vm::{
+use fix_bytecode::PrimOpPhase;
+use fix_error::Error;
+use fix_runtime::{
     AttrSet, BytecodeReader, Closure, Env, List, Machine, MachineExt, Step, StrictValue, Value,
     VmRuntimeCtx, VmRuntimeCtxExt,
 };
-use fix_builtins::PrimOpPhase;
-use fix_error::Error;
 use gc_arena::{Gc, Mutation, RefLock};
 use smallvec::SmallVec;
 

fix-vm/src/primops/conv.rs

@@ -1,9 +1,9 @@
-use fix_abstract_vm::{
+use fix_error::Error;
+use fix_lang::StringId;
+use fix_runtime::{
     BytecodeReader, Machine, MachineExt, NixString, NixType, Path, Step, StrictValue, Value,
     VmRuntimeCtx,
 };
-use fix_common::StringId;
-use fix_error::Error;
 use gc_arena::Mutation;
 
 pub fn to_string<'gc, M: Machine<'gc>>(

fix-vm/src/primops/eq.rs

@@ -1,8 +1,8 @@
-use fix_abstract_vm::{
+use fix_bytecode::PrimOpPhase;
+use fix_runtime::{
     AttrSet, BytecodeReader, CallFrame, List, Machine, MachineExt, NixNum, Null, Path, Step,
     StrictValue, Value, VmRuntimeCtx, VmRuntimeCtxExt,
 };
-use fix_builtins::PrimOpPhase;
 use gc_arena::{Gc, Mutation};
 use smallvec::SmallVec;
 
@@ -30,10 +30,8 @@ pub fn start_eq<'gc, M: Machine<'gc>>(
             enter_eq_machine(m, reader, mc, negate, lhs_init, rhs_init)
         }
         ShallowEq::RecurseAttrs(a, b) => {
-            let lhs_init: SmallVec<[Value<'gc>; 4]> =
-                a.entries.iter().map(|&(_, v)| v).collect();
-            let rhs_init: SmallVec<[Value<'gc>; 4]> =
-                b.entries.iter().map(|&(_, v)| v).collect();
+            let lhs_init: SmallVec<[Value<'gc>; 4]> = a.entries.iter().map(|&(_, v)| v).collect();
+            let rhs_init: SmallVec<[Value<'gc>; 4]> = b.entries.iter().map(|&(_, v)| v).collect();
             enter_eq_machine(m, reader, mc, negate, lhs_init, rhs_init)
         }
     }
@@ -116,7 +114,12 @@ fn apply_pair<'gc, M: Machine<'gc>>(
             m.replace(2, Value::new_inline(false));
         }
         ShallowEq::RecurseList(la, lb) => {
-            extend_queues(m, mc, la.inner.borrow().iter().copied(), lb.inner.borrow().iter().copied());
+            extend_queues(
+                m,
+                mc,
+                la.inner.borrow().iter().copied(),
+                lb.inner.borrow().iter().copied(),
+            );
         }
         ShallowEq::RecurseAttrs(a, b) => {
             extend_queues(
@@ -230,9 +233,5 @@ fn shallow_eq<'gc>(
 }
 
 fn bool_outcome<'gc>(b: bool) -> ShallowEq<'gc> {
-    if b {
-        ShallowEq::True
-    } else {
-        ShallowEq::False
-    }
+    if b { ShallowEq::True } else { ShallowEq::False }
 }

fix-vm/src/primops/io.rs

@@ -1,12 +1,12 @@
 use std::path::PathBuf;
 
-use fix_abstract_vm::{
+use fix_bytecode::PrimOpPhase;
+use fix_error::Error;
+use fix_lang::StringId;
+use fix_runtime::{
     AttrSet, Break, BytecodeReader, CallFrame, Machine, MachineExt, Path, PendingLoad,
     PendingScope, Step, StrictValue, Value, VmRuntimeCtx, VmRuntimeCtxExt, canon_path_str,
 };
-use fix_builtins::PrimOpPhase;
-use fix_common::StringId;
-use fix_error::Error;
 use gc_arena::{Gc, Mutation};
 use hashbrown::HashSet;
 

fix-vm/src/primops/list.rs

@@ -1,7 +1,5 @@
-use fix_abstract_vm::{
-    BytecodeReader, List, Machine, MachineExt, NixType, Step, StrictValue, Value,
-};
-use fix_builtins::PrimOpPhase;
+use fix_bytecode::PrimOpPhase;
+use fix_runtime::{BytecodeReader, List, Machine, MachineExt, NixType, Step, StrictValue, Value};
 use gc_arena::Mutation;
 
 pub fn filter_force_list<'gc, M: Machine<'gc>>(
@@ -16,6 +14,7 @@ pub fn filter_force_list<'gc, M: Machine<'gc>>(
     };
     if list.inner.borrow().is_empty() {
         let val = m.pop();
+        let _pred = m.pop();
         return m.return_from_primop(val, reader);
     }
     // prepare stack layout: [ pred list idx acc ]
@@ -164,3 +163,121 @@ pub fn foldl_strict_update<'gc, M: Machine<'gc>>(
     reader.set_pc(PrimOpPhase::FoldlStrictCall1.ip() as usize);
     Step::Continue(())
 }
+
+pub fn all_entry<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    m.force_slot(0, reader, mc)?;
+    let list = match m.peek_forced(0).expect_gc::<List>() {
+        Ok(list) => list,
+        Err(got) => return m.finish_type_err(NixType::List, got),
+    };
+    // FIXME: force callable
+    m.force_slot(1, reader, mc)?;
+    if list.inner.borrow().is_empty() {
+        let _list = m.pop();
+        let _pred = m.pop();
+        return m.return_from_primop(Value::new_inline(true), reader);
+    }
+    // prepare stack layout: [ pred list idx ]
+    m.push(Value::new_inline(0));
+    reader.set_pc(PrimOpPhase::AllCallPred.ip() as usize);
+    Step::Continue(())
+}
+
+pub fn all_call_pred<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let pred = m.peek_forced(2);
+    #[allow(clippy::unwrap_used)]
+    let idx = m.peek(0).as_inline::<i32>().unwrap();
+    #[allow(clippy::unwrap_used)]
+    let elem = m.peek_forced(1).as_gc::<List>().unwrap().inner.borrow()[idx as usize];
+    m.push(pred.relax());
+    m.call(reader, mc, elem, PrimOpPhase::AllCheck.ip() as usize)
+}
+
+pub fn all_check<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let ret = m.force_and_retry::<bool>(reader, mc)?;
+    #[allow(clippy::unwrap_used)]
+    let idx = m.peek(0).as_inline::<i32>().unwrap();
+    #[allow(clippy::unwrap_used)]
+    let list = m.peek_forced(1).as_gc::<List>().unwrap();
+    let list = list.inner.borrow();
+    if idx as usize == list.len() - 1 || !ret {
+        let _ = m.pop(); // idx
+        let _ = m.pop(); // list
+        let _ = m.pop(); // pred
+        return m.return_from_primop(Value::new_inline(ret), reader);
+    }
+    m.replace(0, Value::new_inline(idx + 1));
+    reader.set_pc(PrimOpPhase::AllCallPred.ip() as usize);
+    Step::Continue(())
+}
+
+pub fn any_entry<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    m.force_slot(0, reader, mc)?;
+    let list = match m.peek_forced(0).expect_gc::<List>() {
+        Ok(list) => list,
+        Err(got) => return m.finish_type_err(NixType::List, got),
+    };
+    // FIXME: force callable
+    m.force_slot(1, reader, mc)?;
+    if list.inner.borrow().is_empty() {
+        let _list = m.pop();
+        let _pred = m.pop();
+        return m.return_from_primop(Value::new_inline(false), reader);
+    }
+    // prepare stack layout: [ pred list idx ]
+    m.push(Value::new_inline(0));
+    reader.set_pc(PrimOpPhase::AnyCallPred.ip() as usize);
+    Step::Continue(())
+}
+
+pub fn any_call_pred<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let pred = m.peek_forced(2);
+    #[allow(clippy::unwrap_used)]
+    let idx = m.peek(0).as_inline::<i32>().unwrap();
+    #[allow(clippy::unwrap_used)]
+    let elem = m.peek_forced(1).as_gc::<List>().unwrap().inner.borrow()[idx as usize];
+    m.push(pred.relax());
+    m.call(reader, mc, elem, PrimOpPhase::AnyCheck.ip() as usize)
+}
+
+pub fn any_check<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let ret = m.force_and_retry::<bool>(reader, mc)?;
+    #[allow(clippy::unwrap_used)]
+    let idx = m.peek(0).as_inline::<i32>().unwrap();
+    #[allow(clippy::unwrap_used)]
+    let list = m.peek_forced(1).as_gc::<List>().unwrap();
+    let list = list.inner.borrow();
+    if idx as usize == list.len() - 1 || ret {
+        let _ = m.pop(); // idx
+        let _ = m.pop(); // list
+        let _ = m.pop(); // pred
+        return m.return_from_primop(Value::new_inline(ret), reader);
+    }
+    m.replace(0, Value::new_inline(idx + 1));
+    reader.set_pc(PrimOpPhase::AnyCallPred.ip() as usize);
+    Step::Continue(())
+}

fix-vm/src/primops/mod.rs

@@ -10,9 +10,9 @@ pub use context::*;
 pub use control::*;
 pub use conv::*;
 pub use eq::*;
-use fix_abstract_vm::{BytecodeReader, Machine, Step, VmRuntimeCtx};
-use fix_builtins::PrimOpPhase;
+use fix_bytecode::PrimOpPhase;
 use fix_error::Error;
+use fix_runtime::{BytecodeReader, Machine, Step, VmRuntimeCtx};
 use gc_arena::Mutation;
 pub use io::*;
 pub use list::*;
@@ -33,6 +33,14 @@ pub fn dispatch_primop<'gc, M: Machine<'gc>>(
     match phase {
         Abort => abort(m, ctx, reader, mc),
 
+        All => all_entry(m, reader, mc),
+        AllCallPred => all_call_pred(m, reader, mc),
+        AllCheck => all_check(m, reader, mc),
+
+        Any => any_entry(m, reader, mc),
+        AnyCallPred => any_call_pred(m, reader, mc),
+        AnyCheck => any_check(m, reader, mc),
+
         DeepSeq => deep_seq_force_top(m, reader, mc),
         DeepSeqPush => deep_seq_push(m, reader, mc),
         DeepSeqLoop => deep_seq_loop(m, reader, mc),
@@ -78,7 +86,9 @@ pub fn dispatch_primop<'gc, M: Machine<'gc>>(
         AppendContextEntryForced => append_context_entry_forced(m, ctx, reader, mc),
         AppendContextOutputsForced => append_context_outputs_forced(m, ctx, reader, mc),
         AppendContextOutputElementLoop => append_context_output_element_loop(m, ctx, reader, mc),
-        AppendContextOutputElementForced => append_context_output_element_forced(m, ctx, reader, mc),
+        AppendContextOutputElementForced => {
+            append_context_output_element_forced(m, ctx, reader, mc)
+        }
         UnsafeDiscardStringContext => unsafe_discard_string_context(m, ctx, reader, mc),
         UnsafeDiscardOutputDependency => unsafe_discard_output_dependency(m, ctx, reader, mc),
 

fix-vm/src/primops/path.rs

@@ -1,8 +1,8 @@
-use fix_abstract_vm::{
+use fix_error::Error;
+use fix_runtime::{
     BytecodeReader, Machine, MachineExt, Path, Step, StrictValue, Value, VmRuntimeCtx,
     VmRuntimeCtxExt, canon_path_str,
 };
-use fix_error::Error;
 use gc_arena::Mutation;
 
 pub fn to_path<'gc, M: Machine<'gc>>(

fix/Cargo.toml

@@ -3,6 +3,18 @@ name = "fix"
 version = "0.1.0"
 edition = "2024"
 
+[[bench]]
+harness = false
+name = "basic_ops"
+
+[[bench]]
+harness = false
+name = "builtins"
+
+[[bench]]
+harness = false
+name = "thunk_scope"
+
 [dependencies]
 mimalloc = "0.1"
 
@@ -17,43 +29,24 @@ clap = { version = "4", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
+miette = { version = "7.4", features = ["fancy"] }
 # Error Reporting
 thiserror = "2"
-miette = { version = "7.4", features = ["fancy"] }
 
 # Data Structure
 hashbrown = { workspace = true }
 string-interner = { workspace = true }
 
-# Memory Management
-bumpalo = { workspace = true }
-
-rnix = { workspace = true }
-
 ere = { workspace = true }
-ghost-cell = { workspace = true }
 
-fix-abstract-vm = { path = "../fix-abstract-vm" }
-fix-builtins = { path = "../fix-builtins" }
-fix-common = { path = "../fix-common" }
-fix-codegen = { path = "../fix-codegen" }
+fix-bytecode = { path = "../fix-bytecode" }
+fix-compiler = { path = "../fix-compiler" }
 fix-error = { path = "../fix-error" }
-fix-ir = { path = "../fix-ir" }
+fix-lang = { path = "../fix-lang" }
+fix-runtime = { path = "../fix-runtime" }
 fix-vm = { path = "../fix-vm" }
 
 [dev-dependencies]
 criterion = { version = "0.8", features = ["html_reports"] }
 tempfile = "3.24"
 test-log = { version = "0.2", features = ["trace"] }
-
-[[bench]]
-name = "basic_ops"
-harness = false
-
-[[bench]]
-name = "builtins"
-harness = false
-
-[[bench]]
-name = "thunk_scope"
-harness = false

fix/benches/utils.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code)]
 
 use fix::Evaluator;
-use fix_common::Value;
 use fix_error::{Result, Source};
+use fix_lang::Value;
 
 pub fn eval(expr: &str) -> Value {
     Evaluator::new()

fix/src/lib.rs

@@ -1,20 +1,13 @@
 #![warn(clippy::unwrap_used)]
 #![allow(dead_code)]
 
-use bumpalo::Bump;
-use fix_abstract_vm::{ForceMode, StaticValue, VmCode, VmContext, VmRuntimeCtx};
-use fix_builtins::PrimOpPhase;
-use fix_codegen::disassembler::{Disassembler, DisassemblerContext};
-use fix_codegen::{BytecodeContext, InstructionPtr, Op};
-use fix_common::{StringId, Symbol};
-use fix_error::{Error, Result, Source};
-use fix_ir::downgrade::{Downgrade as _, DowngradeContext};
-use fix_ir::{
-    GhostMaybeThunkRef, GhostRoIrRef, GhostRoMaybeThunkRef, GhostRoRef, Ir, MaybeThunk, RawIrRef,
-    ThunkId,
-};
+use fix_bytecode::InstructionPtr;
+use fix_bytecode::disassembler::{Disassembler, DisassemblerContext};
+use fix_compiler::{CodeState, ExtraScope};
+use fix_error::{Result, Source};
+use fix_lang::StringId;
+use fix_runtime::{ForceMode, StaticValue, VmCode, VmContext, VmRuntimeCtx};
 use fix_vm::Vm;
-use ghost_cell::{GhostCell, GhostToken};
 use hashbrown::{HashMap, HashSet};
 use string_interner::{DefaultStringInterner, Symbol as _};
 
@@ -29,15 +22,6 @@ pub struct RuntimeState {
     pub constants: Constants,
 }
 
-pub struct CodeState {
-    pub bytecode: Vec<u8>,
-    pub sources: Vec<Source>,
-    pub spans: Vec<(usize, rnix::TextRange)>,
-    pub thunk_count: usize,
-    pub global_env: HashMap<StringId, MaybeThunk>,
-    pub current_scope_slot: Option<u32>,
-}
-
 pub struct Evaluator {
     pub runtime: RuntimeState,
     pub code: CodeState,
@@ -52,37 +36,25 @@ impl Default for Evaluator {
 impl Evaluator {
     pub fn new() -> Self {
         let mut strings = DefaultStringInterner::new();
-        let global_env = fix_ir::new_global_env(&mut strings);
-        let mut bytecode = Vec::with_capacity(PrimOpPhase::Illegal as usize * 2);
-        for phase in 0..=PrimOpPhase::Illegal as u8 {
-            bytecode.push(Op::DispatchPrimOp as u8);
-            bytecode.push(phase);
-        }
+        let code = CodeState::new(&mut strings);
         Self {
             runtime: RuntimeState {
                 strings,
                 constants: Constants::default(),
             },
-            code: CodeState {
-                sources: Vec::new(),
-                spans: Vec::new(),
-                thunk_count: 0,
-                bytecode,
-                global_env,
-                current_scope_slot: None,
-            },
+            code,
         }
     }
 
-    pub fn eval(&mut self, source: Source) -> Result<fix_common::Value> {
+    pub fn eval(&mut self, source: Source) -> Result<fix_lang::Value> {
         self.do_eval(source, None, ForceMode::AsIs)
     }
 
-    pub fn eval_shallow(&mut self, source: Source) -> Result<fix_common::Value> {
+    pub fn eval_shallow(&mut self, source: Source) -> Result<fix_lang::Value> {
         self.do_eval(source, None, ForceMode::Shallow)
     }
 
-    pub fn eval_deep(&mut self, source: Source) -> Result<fix_common::Value> {
+    pub fn eval_deep(&mut self, source: Source) -> Result<fix_lang::Value> {
         self.do_eval(source, None, ForceMode::Deep)
     }
 
@@ -90,7 +62,7 @@ impl Evaluator {
         &mut self,
         source: Source,
         scope: &HashSet<StringId>,
-    ) -> Result<fix_common::Value> {
+    ) -> Result<fix_lang::Value> {
         self.do_eval(source, Some(ExtraScope::Repl(scope)), ForceMode::Shallow)
     }
 
@@ -99,14 +71,10 @@ impl Evaluator {
         source: Source,
         extra_scope: Option<ExtraScope<'ctx>>,
         force_mode: ForceMode,
-    ) -> Result<fix_common::Value> {
-        let ip = {
-            let mut compiler = CompilerCtx {
-                code: &mut self.code,
-                runtime: &mut self.runtime,
-            };
-            compiler.compile_bytecode(source, extra_scope)?
-        };
+    ) -> Result<fix_lang::Value> {
+        let ip = self
+            .code
+            .compile_bytecode(source, extra_scope, &mut self.runtime)?;
         Vm::run(self, ip, force_mode)
     }
 
@@ -115,16 +83,12 @@ impl Evaluator {
         _ident: &str,
         _expr: &str,
         _scope: &mut HashSet<StringId>,
-    ) -> Result<fix_common::Value> {
+    ) -> Result<fix_lang::Value> {
         todo!("add_binding")
     }
 
     pub fn compile_bytecode(&mut self, source: Source) -> Result<InstructionPtr> {
-        let mut compiler = CompilerCtx {
-            code: &mut self.code,
-            runtime: &mut self.runtime,
-        };
-        compiler.compile_bytecode(source, None)
+        self.code.compile_bytecode(source, None, &mut self.runtime)
     }
 
     pub fn disassemble_colored(&self, ip: InstructionPtr) -> String {
@@ -149,151 +113,12 @@ impl VmRuntimeCtx for RuntimeState {
     }
 }
 
-impl VmCode for CodeState {
-    fn bytecode(&self) -> &[u8] {
-        &self.bytecode
-    }
-    fn compile_with_scope(
-        &mut self,
-        source: Source,
-        extra_scope: Option<fix_abstract_vm::ExtraScope>,
-        runtime: &mut impl VmRuntimeCtx,
-    ) -> Result<InstructionPtr> {
-        let mut compiler = CompilerCtx {
-            code: self,
-            runtime,
-        };
-        let extra = extra_scope.map(|s| match s {
-            fix_abstract_vm::ExtraScope::ScopedImport { keys, slot_id } => {
-                ExtraScope::ScopedImport { keys, slot_id }
-            }
-        });
-        compiler.compile_bytecode(source, extra)
-    }
-}
-
 impl VmContext for Evaluator {
     fn split(&mut self) -> (&mut impl VmCode, &mut impl VmRuntimeCtx) {
         (&mut self.code, &mut self.runtime)
     }
 }
 
-struct CompilerCtx<'a, R: VmRuntimeCtx> {
-    code: &'a mut CodeState,
-    runtime: &'a mut R,
-}
-
-impl<'a, R: VmRuntimeCtx> CompilerCtx<'a, R> {
-    fn compile_bytecode(
-        &mut self,
-        source: Source,
-        extra_scope: Option<ExtraScope>,
-    ) -> Result<InstructionPtr> {
-        let prev_scope_slot = self.code.current_scope_slot;
-        self.code.current_scope_slot = match &extra_scope {
-            Some(ExtraScope::ScopedImport { slot_id, .. }) => Some(*slot_id),
-            _ => None,
-        };
-        let result = (|| -> Result<InstructionPtr> {
-            let root = self.downgrade(source, extra_scope)?;
-            let ip = fix_codegen::compile_bytecode(root.as_ref(), self);
-            Ok(ip)
-        })();
-        self.code.current_scope_slot = prev_scope_slot;
-        result
-    }
-
-    fn downgrade(&mut self, source: Source, extra_scope: Option<ExtraScope>) -> Result<OwnedIr> {
-        tracing::debug!("Parsing Nix expression");
-
-        self.code.sources.push(source.clone());
-
-        let root = rnix::Root::parse(&source.src);
-        handle_parse_error(root.errors(), source.clone()).map_or(Ok(()), Err)?;
-
-        tracing::debug!("Downgrading Nix expression");
-        let expr = root
-            .tree()
-            .expr()
-            .ok_or_else(|| Error::parse_error("unexpected EOF".into()))?;
-        let bump = Bump::new();
-        GhostToken::new(|token| {
-            let downgrade_ctx = DowngradeCtx::new(
-                &bump,
-                token,
-                self.runtime,
-                &self.code.global_env,
-                extra_scope.map(Into::into),
-                &mut self.code.thunk_count,
-                source,
-            );
-            let ir = downgrade_ctx.downgrade_toplevel(expr)?;
-            let ir = unsafe { std::mem::transmute::<RawIrRef<'_>, RawIrRef<'static>>(ir) };
-            Ok(OwnedIr { _bump: bump, ir })
-        })
-    }
-}
-
-impl<'a, R: VmRuntimeCtx> BytecodeContext for CompilerCtx<'a, R> {
-    fn intern_string(&mut self, s: &str) -> StringId {
-        self.runtime.intern_string(s)
-    }
-
-    fn register_span(&mut self, range: rnix::TextRange) -> u32 {
-        let id = self.code.spans.len();
-        let source_id = self
-            .code
-            .sources
-            .len()
-            .checked_sub(1)
-            .expect("current_source not set");
-        self.code.spans.push((source_id, range));
-        id as u32
-    }
-
-    fn get_code(&self) -> &[u8] {
-        &self.code.bytecode
-    }
-
-    fn get_code_mut(&mut self) -> &mut Vec<u8> {
-        &mut self.code.bytecode
-    }
-
-    fn add_constant(&mut self, val: fix_codegen::Const) -> u32 {
-        use fix_codegen::Const::*;
-        let val = match val {
-            Smi(x) => StaticValue::new_inline(x),
-            Float(x) => StaticValue::new_float(x),
-            Bool(x) => StaticValue::new_inline(x),
-            String(x) => StaticValue::new_inline(x),
-            Path(_) => todo!("path value type"),
-            PrimOp {
-                id,
-                arity,
-                dispatch_ip,
-            } => StaticValue::new_primop(id, arity, dispatch_ip),
-            Null => StaticValue::default(),
-        };
-        self.runtime.add_const(val)
-    }
-
-    fn current_source_dir(&mut self) -> StringId {
-        let dir = self
-            .code
-            .sources
-            .last()
-            .expect("current_source not set")
-            .get_dir()
-            .to_string_lossy()
-            .into_owned();
-        self.runtime.intern_string(dir)
-    }
-
-    fn current_scope_slot(&self) -> Option<u32> {
-        self.code.current_scope_slot
-    }
-}
-
 #[derive(Default)]
 pub struct Constants {
     data: Vec<StaticValue>,
@@ -315,402 +140,6 @@ impl Constants {
     }
 }
 
-fn parse_error_span(error: &rnix::ParseError) -> Option<rnix::TextRange> {
-    use rnix::ParseError::*;
-    match error {
-        Unexpected(range)
-        | UnexpectedExtra(range)
-        | UnexpectedWanted(_, range, _)
-        | UnexpectedDoubleBind(range)
-        | DuplicatedArgs(range, _) => Some(*range),
-        _ => None,
-    }
-}
-
-fn handle_parse_error<'a>(
-    errors: impl IntoIterator<Item = &'a rnix::ParseError>,
-    source: Source,
-) -> Option<Box<Error>> {
-    for err in errors {
-        if let Some(span) = parse_error_span(err) {
-            return Some(
-                Error::parse_error(err.to_string())
-                    .with_source(source)
-                    .with_span(span),
-            );
-        }
-    }
-    None
-}
-
-struct DowngradeCtx<'ctx, 'id, 'ir, R: VmRuntimeCtx> {
-    bump: &'ir Bump,
-    token: GhostToken<'id>,
-    runtime: &'ctx mut R,
-    source: Source,
-    scopes: Vec<Scope<'ctx, 'id, 'ir>>,
-    with_stack: Vec<GhostRoMaybeThunkRef<'id, 'ir>>,
-    arg_count: u32,
-    thunk_count: &'ctx mut usize,
-    thunk_scopes: Vec<ThunkScope<'id, 'ir>>,
-}
-
-impl<'ctx, 'id, 'ir, R: VmRuntimeCtx> DowngradeCtx<'ctx, 'id, 'ir, R> {
-    fn new(
-        bump: &'ir Bump,
-        token: GhostToken<'id>,
-        runtime: &'ctx mut R,
-        global: &'ctx HashMap<StringId, MaybeThunk>,
-        extra_scope: Option<Scope<'ctx, 'id, 'ir>>,
-        thunk_count: &'ctx mut usize,
-        source: Source,
-    ) -> Self {
-        Self {
-            bump,
-            token,
-            runtime,
-            source,
-            scopes: std::iter::once(Scope::Global(global))
-                .chain(extra_scope)
-                .collect(),
-            thunk_count,
-            arg_count: 0,
-            with_stack: Vec::new(),
-            thunk_scopes: vec![ThunkScope::new_in(bump)],
-        }
-    }
-}
-
-impl<'ctx: 'ir, 'id, 'ir, R: VmRuntimeCtx> DowngradeContext<'id, 'ir>
-    for DowngradeCtx<'ctx, 'id, 'ir, R>
-{
-    fn new_expr(&self, expr: Ir<'ir, GhostRoRef<'id, 'ir>>) -> GhostRoIrRef<'id, 'ir> {
-        self.bump.alloc(GhostCell::new(expr).into())
-    }
-
-    fn maybe_thunk(&mut self, ir: GhostRoIrRef<'id, 'ir>) -> GhostRoMaybeThunkRef<'id, 'ir> {
-        use MaybeThunk::*;
-        let expr = (|| {
-            let expr = match *ir.borrow(&self.token) {
-                Ir::Builtin(x) => Builtin(x),
-                Ir::Int(x) => Int(x),
-                Ir::Float(x) => Float(x),
-                Ir::Bool(x) => Bool(x),
-                Ir::Str(x) => Str(x),
-                Ir::Arg { layer } => Arg { layer },
-                Ir::Builtins => Builtins,
-                Ir::Null => Null,
-                Ir::MaybeThunk(thunk) => return Some(thunk),
-                _ => return None,
-            };
-            Some(self.bump.alloc(GhostCell::new(expr).into()))
-        })();
-        if let Some(thunk) = expr {
-            return thunk;
-        }
-        let id = ThunkId(*self.thunk_count);
-        *self.thunk_count = self.thunk_count.checked_add(1).expect("thunk id overflow");
-        self.thunk_scopes
-            .last_mut()
-            .expect("no active cache scope")
-            .add_binding(id, ir);
-        self.bump.alloc(GhostCell::new(Thunk(id)).into())
-    }
-
-    fn intern_string(&mut self, sym: impl AsRef<str>) -> StringId {
-        self.runtime.intern_string(sym)
-    }
-
-    fn resolve_sym(&self, id: StringId) -> Symbol<'_> {
-        self.runtime.resolve_string(id).into()
-    }
-
-    fn lookup(
-        &mut self,
-        sym: StringId,
-        span: rnix::TextRange,
-    ) -> Result<GhostRoMaybeThunkRef<'id, 'ir>> {
-        for scope in self.scopes.iter().rev() {
-            match scope {
-                &Scope::Global(global_scope) => {
-                    if let Some(expr) = global_scope.get(&sym) {
-                        return Ok(expr.into());
-                    }
-                }
-                &Scope::Repl(repl_bindings) => {
-                    if repl_bindings.contains(&sym) {
-                        return Ok(self
-                            .bump
-                            .alloc(GhostCell::new(MaybeThunk::ReplBinding(sym)).into()));
-                    }
-                }
-                Scope::ScopedImport { keys, .. } => {
-                    if keys.contains(&sym) {
-                        return Ok(self
-                            .bump
-                            .alloc(GhostCell::new(MaybeThunk::ScopedImportBinding(sym)).into()));
-                    }
-                }
-                Scope::Let(let_scope) => {
-                    if let Some(&expr) = let_scope.get(&sym) {
-                        return Ok(expr.into());
-                    }
-                }
-                &Scope::Param {
-                    sym: param_sym,
-                    abs_layer,
-                } => {
-                    if param_sym == sym {
-                        let layers: u8 =
-                            self.thunk_scopes.len().try_into().expect("scope too deep!");
-                        let layer = layers - abs_layer;
-                        return Ok(self
-                            .bump
-                            .alloc(GhostCell::new(MaybeThunk::Arg { layer }).into()));
-                    }
-                }
-            }
-        }
-
-        if !self.with_stack.is_empty() {
-            let id = ThunkId(*self.thunk_count);
-            *self.thunk_count = self.thunk_count.checked_add(1).expect("thunk id overflow");
-            let mut namespaces =
-                bumpalo::collections::Vec::with_capacity_in(self.with_stack.len(), self.bump);
-            namespaces.extend(self.with_stack.iter().rev().copied());
-            let body = self
-                .bump
-                .alloc(GhostCell::new(Ir::WithLookup { sym, namespaces }).into());
-            self.thunk_scopes
-                .last_mut()
-                .expect("no active thunk scope")
-                .add_binding(id, body);
-            Ok(self
-                .bump
-                .alloc(GhostCell::new(MaybeThunk::Thunk(id)).into()))
-        } else {
-            Err(Error::downgrade_error(
-                format!("'{}' not found", self.resolve_sym(sym)),
-                self.get_current_source(),
-                span,
-            ))
-        }
-    }
-
-    fn get_current_source(&self) -> Source {
-        self.source.clone()
-    }
-
-    fn with_let_scope<F, Ret>(&mut self, keys: &[StringId], f: F) -> Result<Ret>
-    where
-        F: FnOnce(
-            &mut Self,
-        ) -> Result<(
-            bumpalo::collections::Vec<'ir, GhostRoMaybeThunkRef<'id, 'ir>>,
-            Ret,
-        )>,
-    {
-        let base = *self.thunk_count;
-        *self.thunk_count = self
-            .thunk_count
-            .checked_add(keys.len())
-            .expect("thunk id overflow");
-        let handles = (base..base + keys.len())
-            .map(|id| {
-                &*self
-                    .bump
-                    .alloc(GhostCell::new(MaybeThunk::Thunk(ThunkId(id))))
-            })
-            .collect::<Vec<_>>();
-        let scope = keys.iter().copied().zip(handles.iter().copied()).collect();
-        self.scopes.push(Scope::Let(scope));
-        let (vals, ret) = { f(self)? };
-        self.scopes.pop();
-        assert_eq!(keys.len(), vals.len());
-        let scope = self.thunk_scopes.last_mut().expect("no active thunk scope");
-        for (i, (val, handle)) in vals.into_iter().zip(handles).enumerate() {
-            let thunk = *val.borrow(&self.token);
-            *handle.borrow_mut(&mut self.token) = thunk;
-            let id = ThunkId(base + i);
-            let ir_ref = self
-                .bump
-                .alloc(GhostCell::new(Ir::MaybeThunk(handle.into())).into());
-            scope.add_binding(id, ir_ref);
-        }
-        Ok(ret)
-    }
-
-    fn with_param_scope<F, Ret>(&mut self, sym: StringId, f: F) -> Ret
-    where
-        F: FnOnce(&mut Self) -> Ret,
-    {
-        self.scopes.push(Scope::Param {
-            sym,
-            abs_layer: self.thunk_scopes.len().try_into().expect("scope too deep!"),
-        });
-        let mut guard = ScopeGuard { ctx: self };
-        f(guard.as_ctx())
-    }
-
-    fn with_with_scope<F, Ret>(&mut self, namespace: GhostRoMaybeThunkRef<'id, 'ir>, f: F) -> Ret
-    where
-        F: FnOnce(&mut Self) -> Ret,
-    {
-        self.with_stack.push(namespace);
-        let ret = f(self);
-        self.with_stack.pop();
-        ret
-    }
-
-    fn with_thunk_scope<F, Ret>(
-        &mut self,
-        f: F,
-    ) -> (
-        Ret,
-        bumpalo::collections::Vec<'ir, (ThunkId, GhostRoIrRef<'id, 'ir>)>,
-    )
-    where
-        F: FnOnce(&mut Self) -> Ret,
-    {
-        if self.thunk_scopes.len() == u8::MAX as usize {
-            panic!("scope too deep!");
-        }
-        self.thunk_scopes.push(ThunkScope::new_in(self.bump));
-        let ret = f(self);
-        (
-            ret,
-            self.thunk_scopes
-                .pop()
-                .expect("no thunk scope left???")
-                .bindings,
-        )
-    }
-
-    fn bump(&self) -> &'ir bumpalo::Bump {
-        self.bump
-    }
-}
-
-impl<'id, 'ir, 'ctx: 'ir, R: VmRuntimeCtx> DowngradeCtx<'ctx, 'id, 'ir, R> {
-    fn downgrade_toplevel(mut self, root: rnix::ast::Expr) -> Result<RawIrRef<'ir>> {
-        let body = root.downgrade(&mut self)?;
-        let thunks = self
-            .thunk_scopes
-            .pop()
-            .expect("no thunk scope left???")
-            .bindings;
-        Ok(Ir::freeze(
-            self.new_expr(Ir::TopLevel { body, thunks }),
-            self.token,
-        ))
-    }
-}
-
-struct ThunkScope<'id, 'ir> {
-    bindings: bumpalo::collections::Vec<'ir, (ThunkId, GhostRoIrRef<'id, 'ir>)>,
-}
-
-impl<'id, 'ir> ThunkScope<'id, 'ir> {
-    fn new_in(bump: &'ir Bump) -> Self {
-        Self {
-            bindings: bumpalo::collections::Vec::new_in(bump),
-        }
-    }
-
-    fn add_binding(&mut self, id: ThunkId, ir: GhostRoIrRef<'id, 'ir>) {
-        self.bindings.push((id, ir));
-    }
-
-    fn extend_bindings(
-        &mut self,
-        iter: impl IntoIterator<Item = (ThunkId, GhostRoIrRef<'id, 'ir>)>,
-    ) {
-        self.bindings.extend(iter);
-    }
-}
-
-enum Scope<'ctx, 'id, 'ir> {
-    Global(&'ctx HashMap<StringId, MaybeThunk>),
-    Repl(&'ctx HashSet<StringId>),
-    ScopedImport {
-        keys: HashSet<StringId>,
-        slot_id: u32,
-    },
-    Let(HashMap<StringId, GhostMaybeThunkRef<'id, 'ir>>),
-    Param {
-        sym: StringId,
-        abs_layer: u8,
-    },
-}
-
-pub enum ExtraScope<'ctx> {
-    Repl(&'ctx HashSet<StringId>),
-    ScopedImport {
-        keys: HashSet<StringId>,
-        slot_id: u32,
-    },
-}
-
-impl<'ctx> From<ExtraScope<'ctx>> for Scope<'ctx, '_, '_> {
-    fn from(value: ExtraScope<'ctx>) -> Self {
-        use ExtraScope::*;
-        match value {
-            ScopedImport { keys, slot_id } => Scope::ScopedImport { keys, slot_id },
-            Repl(scope) => Scope::Repl(scope),
-        }
-    }
-}
-
-struct ScopeGuard<'a, 'ctx, 'id, 'ir, R: VmRuntimeCtx> {
-    ctx: &'a mut DowngradeCtx<'ctx, 'id, 'ir, R>,
-}
-
-impl<'a, 'ctx, 'id, 'ir, R: VmRuntimeCtx> Drop for ScopeGuard<'a, 'ctx, 'id, 'ir, R> {
-    fn drop(&mut self) {
-        self.ctx.scopes.pop();
-    }
-}
-
-impl<'a, 'ctx, 'id, 'ir, R: VmRuntimeCtx> ScopeGuard<'a, 'ctx, 'id, 'ir, R> {
-    fn as_ctx(&mut self) -> &mut DowngradeCtx<'ctx, 'id, 'ir, R> {
-        self.ctx
-    }
-}
-
-struct OwnedIr {
-    _bump: Bump,
-    ir: RawIrRef<'static>,
-}
-
-impl OwnedIr {
-    /// # Safety
-    /// `ir` must be an allocation backed by `bump`. The reference's
-    /// lifetime is extended to `'static` as a placeholder; the stored IR
-    /// must only be re-borrowed via [`OwnedIr::as_ref`], which narrows
-    /// the lifetime back to that of the `&self` borrow. Moving `bump`
-    /// into the struct keeps the underlying allocation live for the
-    /// lifetime of the `OwnedIr`.
-    unsafe fn new(ir: RawIrRef<'_>, bump: Bump) -> Self {
-        Self {
-            _bump: bump,
-            // SAFETY: see function docs - caller guarantees `ir` is in `bump`,
-            // and the `'static` lifetime is a placeholder narrowed by `as_ref`.
-            ir: unsafe { std::mem::transmute::<RawIrRef<'_>, RawIrRef<'static>>(ir) },
-        }
-    }
-
-    fn as_ref<'ir>(&'ir self) -> RawIrRef<'ir> {
-        // SAFETY: narrows the placeholder `'static` lifetime stored in
-        // `self.ir` down to `'ir = &'ir self`. Lifetime shortening is
-        // logically sound for covariant positions; the transmute is only
-        // needed because `RawRef<'ir>` carries `'ir` through a GAT
-        // (`Ref::Ref<T>`), which prevents the compiler from inferring
-        // covariance automatically. The bump arena that backs the IR is
-        // owned by `self._bump`, so the data is live for at least `'ir`.
-        unsafe { std::mem::transmute::<RawIrRef<'static>, RawIrRef<'ir>>(self.ir) }
-    }
-}
-
 impl DisassemblerContext for Evaluator {
     fn get_code(&self) -> &[u8] {
         &self.code.bytecode

fix/tests/tests/derivation.rs

@@ -1,4 +1,4 @@
-use fix_common::Value;
+use fix_lang::Value;
 
 use crate::utils::{eval_deep, eval_deep_result};
 

fix/tests/tests/io_operations.rs

@@ -1,6 +1,6 @@
 use fix::Evaluator;
-use fix_common::Value;
 use fix_error::Source;
+use fix_lang::Value;
 
 use crate::utils::{eval, eval_result};
 

fix/tests/tests/lang.rs

@@ -3,8 +3,8 @@
 use std::path::PathBuf;
 
 use fix::Evaluator;
-use fix_common::Value;
 use fix_error::{Source, SourceType};
+use fix_lang::Value;
 
 fn get_lang_dir() -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/tests/lang")

fix/tests/tests/string_context.rs

@@ -1,5 +1,5 @@
 use fix::Evaluator;
-use fix_common::Value;
+use fix_lang::Value;
 
 use crate::utils::eval_result;
 

fix/tests/tests/utils.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code)]
 
 use fix::Evaluator;
-use fix_common::Value;
 use fix_error::{Result, Source};
+use fix_lang::Value;
 
 pub fn eval(expr: &str) -> Value {
     Evaluator::new()

flake.lock

@@ -45,16 +45,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1778445566,
+        "lastModified": 1778446047,
         "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=",
         "owner": "nix-community",
         "repo": "bun2nix",
-        "rev": "2499dedd70744dba1815875b854818a3019e9e4c",
+        "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "staging-2.1.0",
         "repo": "bun2nix",
         "type": "github"
       }
@@ -67,11 +66,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1778919578,
-        "narHash": "sha256-+z+jgTly48gsAiX8rOe/vs8C/2G4vdCpcEtqMJUpFqw=",
+        "lastModified": 1781343250,
+        "narHash": "sha256-KBJktAwDG9+10j2wMfvOVkBEhZr3yS769xoqqdFI62s=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "ecd6d4ff22cfdb1339b2915455a2ff4dc85bf52e",
+        "rev": "aad7d8bb6936d473c2b9d1a5846a1fe1bc92767a",
         "type": "github"
       },
       "original": {
@@ -127,11 +126,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1778929997,
-        "narHash": "sha256-iAfbBUHBbR0N4DFqFWr4Jtmpc1YcOK7kpVM4f0MK1V8=",
+        "lastModified": 1781330261,
+        "narHash": "sha256-2fFAGel2VVXr5mwrTXldqXva2ng3T3HHxyuBKRIxauI=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "0da8f0313c9f68c155e0932f880fc1913e7be846",
+        "rev": "24ec6b7b1ddf8896ac8df3b65dc564575e0a1928",
         "type": "github"
       },
       "original": {
@@ -142,11 +141,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -167,11 +166,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1778854817,
-        "narHash": "sha256-iG+VuMy8W585geVVCUd7pR025WsY3ZkgSv5Yt5bxDmQ=",
+        "lastModified": 1781294997,
+        "narHash": "sha256-XjCyIvJw4JtcwItTKRdQz5h1pLF9hr8ZSYeMP+/1d3A=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "1a68212c5683555ad80f0eab71db9715c6d52145",
+        "rev": "3f92cd1612268995d5667bd04fa03ba2916413d9",
         "type": "github"
       },
       "original": {
@@ -204,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "lastModified": 1780220602,
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
         "type": "github"
       },
       "original": {

flake.nix

@@ -47,11 +47,12 @@
               just
               samply
               tokei
+              tombi
 
-              llm-agents.codex
+              # llm-agents.codex
               llm-agents.claude-code
               llm-agents.opencode
-              llm-agents.forge
+              # llm-agents.forge
             ];
           };
         }