implement import & scopedImport (WIP, ResolvePath resolves to string)

Cargo.lock

@@ -445,18 +445,21 @@ name = "fix"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "bumpalo",
  "clap",
  "criterion",
  "ere",
- "fix-bytecode",
+ "fix-builtins",
- "fix-compiler",
+ "fix-codegen",
+ "fix-common",
  "fix-error",
- "fix-lang",
+ "fix-ir",
- "fix-runtime",
  "fix-vm",
+ "ghost-cell",
  "hashbrown 0.16.1",
  "miette",
  "mimalloc",
+ "rnix",
  "rustyline",
  "string-interner",
  "tempfile",
@@ -467,31 +470,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "fix-bytecode"
+name = "fix-builtins"
+version = "0.1.0"
+dependencies = [
+ "gc-arena",
+ "num_enum",
+]
+
+[[package]]
+name = "fix-codegen"
 version = "0.1.0"
 dependencies = [
  "colored",
- "fix-lang",
+ "fix-builtins",
+ "fix-common",
+ "fix-ir",
+ "hashbrown 0.16.1",
  "num_enum",
+ "rnix",
  "string-interner",
 ]
 
 [[package]]
-name = "fix-compiler"
+name = "fix-common"
 version = "0.1.0"
 dependencies = [
- "bumpalo",
+ "ere",
- "colored",
+ "gc-arena",
- "fix-bytecode",
- "fix-error",
- "fix-lang",
- "fix-runtime",
- "ghost-cell",
- "hashbrown 0.16.1",
- "rnix",
- "rowan",
  "string-interner",
- "tracing",
 ]
 
 [[package]]
@@ -504,26 +510,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "fix-lang"
+name = "fix-ir"
 version = "0.1.0"
 dependencies = [
- "ere",
+ "bumpalo",
- "gc-arena",
+ "fix-builtins",
- "num_enum",
+ "fix-common",
- "string-interner",
-]
-
-[[package]]
-name = "fix-runtime"
-version = "0.1.0"
-dependencies = [
- "fix-bytecode",
  "fix-error",
- "fix-lang",
+ "ghost-cell",
- "gc-arena",
  "hashbrown 0.16.1",
- "smallvec",
+ "num_enum",
- "sptr",
+ "rnix",
+ "rowan",
  "string-interner",
 ]
 
@@ -531,14 +529,17 @@ dependencies = [
 name = "fix-vm"
 version = "0.1.0"
 dependencies = [
- "fix-bytecode",
+ "fix-builtins",
+ "fix-codegen",
+ "fix-common",
  "fix-error",
- "fix-lang",
- "fix-runtime",
  "gc-arena",
  "hashbrown 0.16.1",
+ "likely_stable",
+ "num_enum",
  "smallvec",
- "sysinfo",
+ "sptr",
+ "string-interner",
 ]
 
 [[package]]
@@ -735,6 +736,15 @@ 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"
@@ -831,15 +841,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ntapi"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -880,25 +881,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "objc2-core-foundation"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "objc2-io-kit"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
-dependencies = [
- "libc",
- "objc2-core-foundation",
-]
-
 [[package]]
 name = "object"
 version = "0.37.3"
@@ -1111,6 +1093,15 @@ 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"
@@ -1295,20 +1286,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.38.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f"
-dependencies = [
- "libc",
- "memchr",
- "ntapi",
- "objc2-core-foundation",
- "objc2-io-kit",
- "windows",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.27.0"
@@ -1702,107 +1679,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
-dependencies = [
- "windows-collections",
- "windows-core",
- "windows-future",
- "windows-numerics",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
-dependencies = [
- "windows-core",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
-dependencies = [
- "windows-core",
- "windows-link",
- "windows-threading",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
-[[package]]
-name = "windows-numerics"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
-dependencies = [
- "windows-core",
- "windows-link",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -1812,15 +1694,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-threading"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "winnow"
 version = "1.0.1"

Cargo.toml

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

fix-builtins/Cargo.toml

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

fix-builtins/src/lib.rs

@@ -0,0 +1,371 @@
+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),
+    ("__unsafeGetAttrPos",         UnsafeGetAttrPos,         2),
+    ("__warn",                     Warn,                     2),
+    ("__zipAttrsWith",             ZipAttrsWith,             2),
+}
+
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, TryFromPrimitive)]
+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,
+    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,
+
+    // TODO: split into separate enums
+    CallPattern,
+    CallFunctor1,
+    CallFunctor2,
+
+    ImportFinalize,
+    ScopedImportFinalize,
+
+    Illegal,
+}
+
+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,
+            UnsafeGetAttrPos => PrimOpPhase::UnsafeGetAttrPos,
+            Warn => PrimOpPhase::Warn,
+            ZipAttrsWith => PrimOpPhase::ZipAttrsWith,
+        }
+    }
+}
+
+impl PrimOpPhase {
+    pub fn ip(self) -> u32 {
+        self as u32 * 2
+    }
+}

fix-bytecode/Cargo.toml

@@ -1,11 +0,0 @@
-[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/lib.rs

@@ -1,532 +0,0 @@
-#![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

@@ -0,0 +1,15 @@
+[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-codegen/src/disassembler.rs

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

fix-codegen/src/lib.rs

@@ -1,14 +1,14 @@
-use fix_bytecode::{Const, InstructionPtr, Op, OperandType, PrimOpPhase};
+use fix_builtins::{BUILTINS, BuiltinId};
-use fix_lang::{BUILTINS, StringId};
+use fix_common::StringId;
+use fix_ir::{Attr, BinOpKind, Ir, MaybeThunk, Param, RawIrRef, ThunkId, UnOpKind};
 use hashbrown::HashMap;
+use num_enum::TryFromPrimitive;
 use rnix::TextRange;
 use string_interner::Symbol as _;
 
-mod context;
+pub mod disassembler;
-pub mod ir;
+
-pub use context::{CodeState, ExtraScope};
+pub struct InstructionPtr(pub usize);
-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,6 +17,86 @@ 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 {
@@ -29,6 +109,39 @@ 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),
@@ -36,7 +149,7 @@ pub enum InlineOperand {
     BuiltinConst(StringId),
     Builtins,
     ReplBinding(StringId),
-    ScopedImportBinding { id: StringId, slot_id: u32 },
+    ScopedImportBinding(StringId),
 }
 
 pub fn compile_bytecode(ir: RawIrRef<'_>, ctx: &mut impl BytecodeContext) -> InstructionPtr {
@@ -80,15 +193,13 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                 InlineOperand::Const(Const::PrimOp {
                     id,
                     arity,
-                    dispatch_ip: PrimOpPhase::entry_for_builtin(id).ip(),
+                    dispatch_ip: id.entry_phase().ip(),
                 })
             }
             BuiltinConst(id) => InlineOperand::BuiltinConst(id),
             Builtins => InlineOperand::Builtins,
             ReplBinding(id) => InlineOperand::ReplBinding(id),
-            ScopedImportBinding { slot_id, sym: id } => {
+            ScopedImportBinding(id) => InlineOperand::ScopedImportBinding(id),
-                InlineOperand::ScopedImportBinding { slot_id, id }
-            }
         }
     }
 
@@ -121,9 +232,13 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                 self.emit_u8(OperandType::ReplBinding as u8);
                 self.emit_str_id(id);
             }
-            ScopedImportBinding { id, slot_id } => {
+            ScopedImportBinding(id) => {
                 self.emit_u8(OperandType::ScopedImportBinding as u8);
-                self.emit_u32(slot_id);
+                let slot = self
+                    .ctx
+                    .current_scope_slot()
+                    .expect("ScopedImportBinding outside scoped compilation");
+                self.emit_u32(slot);
                 self.emit_str_id(id);
             }
         }
@@ -440,10 +555,14 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                 self.emit_op(Op::LoadReplBinding);
                 self.emit_str_id(name);
             }
-            &Ir::ScopedImportBinding { sym, slot_id } => {
+            &Ir::ScopedImportBinding(name) => {
                 self.emit_op(Op::LoadScopedBinding);
-                self.emit_u32(slot_id);
+                let slot = self
-                self.emit_str_id(sym);
+                    .ctx
+                    .current_scope_slot()
+                    .expect("ScopedImportBinding outside scoped compilation");
+                self.emit_u32(slot);
+                self.emit_str_id(name);
             }
             Ir::WithLookup { sym, namespaces } => {
                 // counter
@@ -510,10 +629,14 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                         self.emit_op(Op::LoadReplBinding);
                         self.emit_str_id(name);
                     }
-                    ScopedImportBinding { slot_id, sym } => {
+                    ScopedImportBinding(name) => {
                         self.emit_op(Op::LoadScopedBinding);
-                        self.emit_u32(slot_id);
+                        let slot = self
-                        self.emit_str_id(sym);
+                            .ctx
+                            .current_scope_slot()
+                            .expect("ScopedImportBinding outside scoped compilation");
+                        self.emit_u32(slot);
+                        self.emit_str_id(name);
                     }
                 }
             }
@@ -652,7 +775,7 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
 
     fn emit_attrset(
         &mut self,
-        stcs: &ir::HashMap<'_, StringId, (&MaybeThunk, TextRange)>,
+        stcs: &fix_ir::HashMap<'_, StringId, (&MaybeThunk, TextRange)>,
         dyns: &[(RawIrRef<'_>, &MaybeThunk, TextRange)],
     ) {
         if stcs.is_empty() && dyns.is_empty() {

fix-common/Cargo.toml

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

fix-common/src/lib.rs

@@ -4,128 +4,6 @@ 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-compiler/src/context.rs

@@ -1,542 +0,0 @@
-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-error/Cargo.toml

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

fix-ir/Cargo.toml

@@ -1,19 +1,17 @@
 [package]
-name = "fix-compiler"
+name = "fix-ir"
 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-bytecode = { path = "../fix-bytecode" }
+fix-builtins = { path = "../fix-builtins" }
+fix-common = { path = "../fix-common" }
 fix-error = { path = "../fix-error" }
-fix-lang = { path = "../fix-lang" }
-fix-runtime = { path = "../fix-runtime" }
-tracing = "0.1"

fix-ir/src/downgrade.rs

@@ -1,6 +1,7 @@
 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-ir/src/lib.rs

@@ -3,8 +3,10 @@ use std::marker::PhantomData;
 
 use bumpalo::Bump;
 use bumpalo::collections::Vec;
-use fix_lang::{BUILTINS, BuiltinId, StringId};
+use fix_builtins::{BUILTINS, BuiltinId};
+use fix_common::StringId;
 use ghost_cell::{GhostCell, GhostToken};
+use num_enum::TryFromPrimitive as _;
 use rnix::{TextRange, ast};
 use string_interner::DefaultStringInterner;
 
@@ -28,7 +30,7 @@ impl<'id, 'ir> Ir<'ir, GhostRoRef<'id, 'ir>> {
         // - `Ir<'ir, R>` is `#[repr(C)]`, and for every field that depends on
         //   `R`, instantiating `R = GhostRef<'id, 'ir>` vs `R = RawRef<'ir>`
         //   produces types of identical layout:
-        //     - `R::IrRef` becomes `&'ir GhostCell<'id, Ir<...>>` vs `&'ir Ir<...>`
+        //     - `R::IrRef` becomes `&'ir GhostCell<'id, Ir<…>>` vs `&'ir Ir<…>`
         //     - `R::MaybeThunkRef` becomes `&'ir GhostCell<'id, MaybeThunk>`
         //       vs `&'ir MaybeThunk`
         //     - `R::Ref<Ir<'ir, R>>` (used in `ConcatStrings::parts`) reduces
@@ -90,7 +92,7 @@ pub enum MaybeThunk {
     BuiltinConst(StringId),
     Builtins,
     ReplBinding(StringId),
-    ScopedImportBinding { slot_id: u32, sym: StringId },
+    ScopedImportBinding(StringId),
 }
 
 pub trait Ref<'ir> {
@@ -211,16 +213,17 @@ pub enum Ir<'ir, R: RefExt<'ir> + ?Sized + 'ir> {
     },
     MaybeThunk(R::MaybeThunkRef),
     ReplBinding(StringId),
-    ScopedImportBinding {
+    ScopedImportBinding(StringId),
-        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)]
@@ -292,7 +295,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(idx as u8).expect("infallible");
+        let id = BuiltinId::try_from_primitive(idx as u8).expect("infallible");
         let name = StringId(strings.get_or_intern(name));
         global_env.insert(name, MaybeThunk::Builtin(id));
     }

fix-runtime/Cargo.toml

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

fix-runtime/src/host.rs

@@ -1,165 +0,0 @@
-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,
-};
-
-pub trait VmContext {
-    fn split(&mut self) -> (&mut impl VmCode, &mut impl VmRuntimeCtx);
-}
-
-pub trait VmRuntimeCtx {
-    fn intern_string(&mut self, s: impl AsRef<str>) -> StringId;
-    fn resolve_string(&self, id: StringId) -> &str;
-    fn get_const(&self, id: u32) -> StaticValue;
-    fn add_const(&mut self, val: StaticValue) -> u32;
-}
-
-pub trait VmCode {
-    fn bytecode(&self) -> &[u8];
-    fn compile_with_scope(
-        &mut self,
-        source: Source,
-        extra_scope: Option<ExtraScope>,
-        ctx: &mut impl VmRuntimeCtx,
-    ) -> fix_error::Result<InstructionPtr>;
-}
-
-pub trait VmRuntimeCtxExt: VmRuntimeCtx {
-    fn get_string<'a, 'gc: 'a>(&'a self, val: StrictValue<'gc>) -> Option<&'a str>;
-    fn get_string_or_path<'a, 'gc: 'a>(&'a self, val: StrictValue<'gc>) -> Option<&'a str>;
-    fn get_string_id<'a, 'gc: 'a>(
-        &'a mut self,
-        val: StrictValue<'gc>,
-    ) -> std::result::Result<StringId, NixType>;
-    /// 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_lang::Value;
-}
-
-impl<T: VmRuntimeCtx> VmRuntimeCtxExt for T {
-    fn get_string<'a, 'gc: 'a>(&'a self, val: StrictValue<'gc>) -> Option<&'a str> {
-        if let Some(sid) = val.as_inline::<StringId>() {
-            Some(self.resolve_string(sid))
-        } else {
-            val.as_gc::<NixString>().map(|ns| ns.as_ref().as_str())
-        }
-    }
-
-    /// Like `get_string`, but also accepts `Path` values (returning their
-    /// underlying canonical-path string). Use this in places where Nix
-    /// would coerce a path to a string (string interpolation, file IO
-    /// builtins, etc.).
-    fn get_string_or_path<'a, 'gc: 'a>(&'a self, val: StrictValue<'gc>) -> Option<&'a str> {
-        if let Some(p) = val.as_inline::<Path>() {
-            Some(self.resolve_string(p.0))
-        } else {
-            self.get_string(val)
-        }
-    }
-
-    fn get_string_id<'a, 'gc: 'a>(
-        &'a mut self,
-        val: StrictValue<'gc>,
-    ) -> std::result::Result<StringId, NixType> {
-        if let Some(sid) = val.as_inline::<StringId>() {
-            Ok(sid)
-        } else if let Some(s) = val.as_gc::<NixString>().map(|ns| ns.as_ref().as_str()) {
-            Ok(self.intern_string(s))
-        } else {
-            Err(val.ty())
-        }
-    }
-
-    fn get_string_context<'gc>(&self, val: StrictValue<'gc>) -> &'gc StringContext {
-        if let Some(ns) = val.as_gc::<NixString>() {
-            ns.as_ref().context()
-        } else {
-            StringContext::empty()
-        }
-    }
-
-    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_lang::Value;
-}
-
-impl<T: VmRuntimeCtx> ConvertValueWithSeen for T {
-    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>() {
-            Value::Int(*gc_i)
-        } else if let Some(f) = val.as_float() {
-            Value::Float(f)
-        } else if let Some(b) = val.as_inline::<bool>() {
-            Value::Bool(b)
-        } else if val.is::<Null>() {
-            Value::Null
-        } else if let Some(sid) = val.as_inline::<StringId>() {
-            let s = self.resolve_string(sid).to_owned();
-            Value::String(s)
-        } else if let Some(ns) = val.as_gc::<NixString>() {
-            Value::String(ns.as_str().to_owned())
-        } else if let Some(p) = val.as_inline::<Path>() {
-            Value::Path(self.resolve_string(p.0).to_owned())
-        } else if let Some(attrs) = val.as_gc::<AttrSet>() {
-            let bits = val.to_bits();
-            if attrs.entries.is_empty() {
-                return Value::AttrSet(Default::default());
-            }
-            if !seen.insert(bits) {
-                return Value::Repeated;
-            }
-            let mut map = std::collections::BTreeMap::new();
-            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_lang::Symbol::from(key), converted);
-            }
-            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() {
-                return Value::List(Default::default());
-            }
-            if !seen.insert(bits) {
-                return Value::Repeated;
-            }
-            let items: Vec<_> = list
-                .inner
-                .borrow()
-                .iter()
-                .copied()
-                .map(|v| self.convert_value_with_seen(v, seen))
-                .collect();
-            Value::List(fix_lang::List::new(items))
-        } else if val.is::<Closure>() {
-            Value::Func
-        } else if let Some(thunk) = val.as_gc::<Thunk>() {
-            if let ThunkState::Evaluated(v) = *thunk.borrow() {
-                self.convert_value_with_seen(v.relax(), seen)
-            } else {
-                Value::Thunk
-            }
-        } else if let Some(primop) = val.as_inline::<PrimOp>() {
-            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 = BUILTINS[app.primop.id as usize].0;
-            Value::PrimOpApp(name.strip_prefix("__").unwrap_or(name))
-        } else {
-            Value::Null
-        }
-    }
-}

fix-runtime/src/lib.rs

@@ -1,19 +0,0 @@
-mod boxing;
-mod forced;
-mod host;
-mod machine;
-mod path_util;
-mod resolve;
-mod state;
-mod string_context;
-mod value;
-
-pub use fix_bytecode::{BytecodeReader, OperandData};
-pub use forced::*;
-pub use host::*;
-pub use machine::*;
-pub use path_util::*;
-pub use resolve::*;
-pub use state::*;
-pub use string_context::*;
-pub use value::*;

fix-runtime/src/machine.rs

@@ -1,178 +0,0 @@
-use std::ops::ControlFlow;
-use std::path::{Path, PathBuf};
-
-use fix_error::Error;
-use fix_lang::{self, StringId};
-use gc_arena::Mutation;
-
-use crate::{
-    Break, BytecodeReader, CallFrame, ForceMode, Forced, GcEnv, NixType, PendingLoad, Step,
-    StrictValue, Value, VmError,
-};
-
-/// Abstract VM-side operations consumed by instruction handlers and primops.
-///
-/// Implementors maintain a value stack, a call stack, an environment chain,
-/// pending result/error state, and a set of GC-allocated globals. Methods
-/// fall into a few groups:
-///
-/// - Stack ops (`push` / `pop` / `peek` / `replace` / `pop_forced` / ...)
-/// - Forcing primitives (`force_slot` / `force_slot_to_pc`)
-/// - Calling (`call` / `return_from_primop`)
-/// - Call-frame management (`push_call_frame` / `pop_call_frame` / call-depth)
-/// - Environment access (`env` / `set_env` / `local`)
-/// - Result finalization (`finish_ok` / `finish_err` / ...)
-/// - Global lookup (`builtins` / `empty_list` / `empty_attrs` / ...)
-/// - 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(
-        &mut self,
-        depth: usize,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-        resume_pc: usize,
-    ) -> Step;
-
-    #[inline(always)]
-    fn force_slot(
-        &mut self,
-        depth: usize,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> Step {
-        let pc = reader.inst_start_pc();
-        self.force_slot_to_pc(depth, reader, mc, pc)
-    }
-
-    fn call(
-        &mut self,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-        arg: Value<'gc>,
-        resume_pc: usize,
-    ) -> Step;
-
-    #[inline(always)]
-    fn return_from_primop(&mut self, val: Value<'gc>, reader: &mut BytecodeReader<'_>) -> Step {
-        self.push(val);
-        let Some(CallFrame {
-            pc: ret_pc,
-            thunk: _,
-            env,
-        }) = self.pop_call_frame()
-        else {
-            unreachable!()
-        };
-        reader.set_pc(ret_pc);
-        self.dec_call_depth();
-        self.set_env(env);
-        Step::Continue(())
-    }
-
-    fn push_call_frame(&mut self, frame: CallFrame<'gc>);
-    fn pop_call_frame(&mut self) -> Option<CallFrame<'gc>>;
-    fn call_depth(&self) -> usize;
-    fn inc_call_depth(&mut self);
-    fn dec_call_depth(&mut self);
-
-    fn env(&self) -> GcEnv<'gc>;
-    fn set_env(&mut self, env: GcEnv<'gc>);
-
-    #[inline(always)]
-    fn local(&self, layer: u8, idx: u32) -> Value<'gc> {
-        let mut cur = self.env();
-        for _ in 0..layer {
-            let prev = cur.borrow().prev.expect("env chain too short");
-            cur = prev;
-        }
-        cur.borrow().locals[idx as usize]
-    }
-
-    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;
-
-    #[inline(always)]
-    fn finish_vm_err(&mut self, err: VmError) -> Step {
-        self.finish_err(err.into_error())
-    }
-
-    fn builtins(&self) -> Value<'gc>;
-    fn functor_sym(&self) -> StringId;
-    fn empty_list(&self) -> Value<'gc>;
-    fn empty_attrs(&self) -> Value<'gc>;
-    fn force_mode(&self) -> ForceMode;
-
-    fn import_cache_get(&self, path: &Path) -> Option<Value<'gc>>;
-    fn import_cache_insert(&mut self, path: PathBuf, val: Value<'gc>);
-    fn scope_slot(&self, idx: u32) -> Value<'gc>;
-    fn scope_slots_push(&mut self, val: Value<'gc>) -> u32;
-    fn set_pending_load(&mut self, load: PendingLoad);
-}
-
-/// Extension trait with convenience helpers built on top of [`Machine`].
-///
-/// Auto-implemented for every `Machine<'gc>` so callers just need to bring
-/// `MachineExt` (or `Machine`) into scope.
-pub trait MachineExt<'gc>: Machine<'gc> {
-    /// 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.
-    /// * The stack layout at the call site must be **identical** every time
-    ///   the handler is re-entered.
-    /// * Propagate the return value with `?` so `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>,
-    ) -> ControlFlow<Break, T>
-    where
-        Self: Sized,
-    {
-        let pc = reader.inst_start_pc();
-        self.force_and_retry_pc(reader, mc, 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,
-    ) -> ControlFlow<Break, T>
-    where
-        Self: Sized,
-    {
-        T::force_and_check(self, reader, mc, 0, resume_pc)?;
-        ControlFlow::Continue(T::pop_converted(self))
-    }
-}
-
-impl<'gc, M: Machine<'gc>> MachineExt<'gc> for M {}

fix-runtime/src/path_util.rs

@@ -1,18 +0,0 @@
-use std::path::{Component, PathBuf};
-
-pub fn canon_path_str(path: impl AsRef<std::path::Path>) -> String {
-    let p = path.as_ref();
-    let mut normalized = PathBuf::new();
-    for component in p.components() {
-        match component {
-            Component::Prefix(p) => normalized.push(p.as_os_str()),
-            Component::RootDir => normalized.push("/"),
-            Component::CurDir => {}
-            Component::ParentDir => {
-                normalized.pop();
-            }
-            Component::Normal(c) => normalized.push(c),
-        }
-    }
-    normalized.to_string_lossy().into_owned()
-}

fix-runtime/src/resolve.rs

@@ -1,35 +0,0 @@
-use fix_bytecode::OperandData;
-use gc_arena::{Gc, Mutation};
-
-use crate::{AttrSet, Machine, Value, VmRuntimeCtx};
-
-/// Resolve a decoded operand into a runtime [`Value`].
-///
-/// The operand decoder ([`crate::BytecodeReader::read_operand_data`])
-/// produces a static enum; this function materializes it against the
-/// running [`Machine`] (env chain, builtins, scope slots, ...).
-#[inline]
-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(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)]
-        BuiltinConst(id) => m.builtins().as_gc::<AttrSet>().unwrap().lookup(id).unwrap(),
-        Builtins => m.builtins(),
-        ReplBinding(_id) => todo!(),
-        ScopedImportBinding { slot_id, name } => {
-            let scope = m.scope_slot(slot_id);
-            #[allow(clippy::unwrap_used)]
-            let attrs = scope.as_gc::<AttrSet>().expect("scope must be attrset");
-            #[allow(clippy::unwrap_used)]
-            attrs.lookup(name).expect("scoped binding not found")
-        }
-    }
-}

fix-runtime/src/state.rs

@@ -1,89 +0,0 @@
-use std::ops::ControlFlow;
-use std::path::PathBuf;
-
-use fix_error::Error;
-use fix_lang::StringId;
-use gc_arena::{Collect, Gc};
-use hashbrown::HashSet;
-
-use crate::{GcEnv, Thunk};
-
-#[allow(dead_code)]
-pub enum VmError {
-    Catchable(String),
-    Uncatchable(Box<Error>),
-}
-
-impl From<Box<Error>> for VmError {
-    fn from(e: Box<Error>) -> Self {
-        VmError::Uncatchable(e)
-    }
-}
-
-impl VmError {
-    pub fn into_error(self) -> Box<Error> {
-        match self {
-            VmError::Catchable(_) => todo!("Check for tryEval catch frames"),
-            VmError::Uncatchable(e) => e,
-        }
-    }
-}
-
-pub fn vm_err(msg: impl Into<String>) -> VmError {
-    VmError::Uncatchable(Error::eval_error(msg.into()))
-}
-
-#[derive(Collect, Clone, Copy, Debug, PartialEq, Eq, Default)]
-#[collect(require_static)]
-pub enum ForceMode {
-    #[default]
-    AsIs,
-    Shallow,
-    Deep,
-}
-
-#[repr(u8)]
-pub enum Break {
-    Force,
-    Done,
-    LoadFile,
-}
-
-pub type Step = ControlFlow<Break>;
-
-#[allow(dead_code)]
-pub struct ErrorFrame {
-    pub span_id: u32,
-    pub message: Option<String>,
-}
-
-#[derive(Collect, Debug)]
-#[collect(no_drop)]
-pub struct CallFrame<'gc> {
-    pub pc: usize,
-    pub thunk: Option<Gc<'gc, Thunk<'gc>>>,
-    pub env: GcEnv<'gc>,
-}
-
-#[derive(Debug)]
-pub struct PendingLoad {
-    pub path: PathBuf,
-    pub scope: Option<PendingScope>,
-}
-
-#[derive(Debug)]
-pub struct PendingScope {
-    pub keys: HashSet<StringId>,
-    pub slot_id: u32,
-}
-
-/// Extra scope passed to a re-entrant compile from inside a running VM.
-///
-/// Currently only `ScopedImport` is produced (by the `scopedImport` builtin),
-/// but the variant is kept open so REPL bindings could later land here too.
-pub enum ExtraScope {
-    ScopedImport {
-        keys: HashSet<StringId>,
-        slot_id: u32,
-    },
-}

fix-runtime/src/string_context.rs

@@ -1,161 +0,0 @@
-use std::cmp::Ordering;
-
-use smallvec::SmallVec;
-
-/// A string context element
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum StringContextElem {
-    // Plain store path reference
-    Opaque {
-        path: Box<str>,
-    },
-    // All outputs of a derivation
-    // encoded `=<drvPath>`
-    DrvDeep {
-        drv_path: Box<str>,
-    },
-    // A specific output of a derivation
-    // encoded `!<output>!<drvPath>`
-    Built {
-        drv_path: Box<str>,
-        output: Box<str>,
-    },
-}
-
-impl StringContextElem {
-    /// Decode the CppNix wire form (`!out!/p`, `=/p`, `/p`). Falls back to
-    /// `Opaque` for malformed `!`-prefixed inputs (matching nix-js).
-    pub fn decode(encoded: &str) -> Self {
-        if let Some(drv_path) = encoded.strip_prefix('=') {
-            Self::DrvDeep {
-                drv_path: drv_path.into(),
-            }
-        } else if let Some(rest) = encoded.strip_prefix('!') {
-            if let Some(second_bang) = rest.find('!') {
-                Self::Built {
-                    output: rest[..second_bang].into(),
-                    drv_path: rest[second_bang + 1..].into(),
-                }
-            } else {
-                Self::Opaque {
-                    path: encoded.into(),
-                }
-            }
-        } else {
-            Self::Opaque {
-                path: encoded.into(),
-            }
-        }
-    }
-
-    pub fn encode(&self) -> String {
-        match self {
-            Self::Opaque { path } => path.to_string(),
-            Self::DrvDeep { drv_path } => format!("={drv_path}"),
-            Self::Built { drv_path, output } => format!("!{output}!{drv_path}"),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct StringContext {
-    data: SmallVec<[StringContextElem; 1]>,
-}
-
-impl IntoIterator for StringContext {
-    type Item = StringContextElem;
-    type IntoIter = <SmallVec<[StringContextElem; 1]> as IntoIterator>::IntoIter;
-    fn into_iter(self) -> Self::IntoIter {
-        self.data.into_iter()
-    }
-}
-
-impl<'a> IntoIterator for &'a StringContext {
-    type Item = &'a StringContextElem;
-    type IntoIter = <&'a SmallVec<[StringContextElem; 1]> as IntoIterator>::IntoIter;
-    fn into_iter(self) -> Self::IntoIter {
-        self.data.iter()
-    }
-}
-
-impl<'a> IntoIterator for &'a mut StringContext {
-    type Item = &'a mut StringContextElem;
-    type IntoIter = <&'a mut SmallVec<[StringContextElem; 1]> as IntoIterator>::IntoIter;
-    fn into_iter(self) -> Self::IntoIter {
-        self.data.iter_mut()
-    }
-}
-
-impl FromIterator<StringContextElem> for StringContext {
-    fn from_iter<T: IntoIterator<Item = StringContextElem>>(iter: T) -> Self {
-        Self {
-            data: iter.into_iter().collect(),
-        }
-    }
-}
-
-impl StringContext {
-    pub fn empty() -> &'static Self {
-        static EMPTY: StringContext = StringContext {
-            data: SmallVec::new_const(),
-        };
-        &EMPTY
-    }
-
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.data.is_empty()
-    }
-
-    pub fn insert(&mut self, elem: StringContextElem) {
-        match self.data.binary_search(&elem) {
-            Ok(_) => {}
-            Err(pos) => self.data.insert(pos, elem),
-        }
-    }
-
-    pub fn merge(&self, other: &Self) -> Self {
-        if self.data.is_empty() {
-            return other.clone();
-        }
-        if other.data.is_empty() {
-            return self.clone();
-        }
-
-        let a = &self.data;
-        let b = &other.data;
-        let mut out = SmallVec::with_capacity(a.len() + b.len());
-        let (mut i, mut j) = (0, 0);
-        while i < a.len() && j < b.len() {
-            match a[i].cmp(&b[j]) {
-                Ordering::Less => {
-                    out.push(a[i].clone());
-                    i += 1;
-                }
-                Ordering::Greater => {
-                    out.push(b[j].clone());
-                    j += 1;
-                }
-                Ordering::Equal => {
-                    out.push(a[i].clone());
-                    i += 1;
-                    j += 1;
-                }
-            }
-        }
-        out.extend(a[i..].iter().cloned());
-        out.extend(b[j..].iter().cloned());
-        Self { data: out }
-    }
-
-    pub fn iter(&self) -> <&Self as IntoIterator>::IntoIter {
-        self.into_iter()
-    }
-
-    pub fn iter_mut(&mut self) -> <&mut Self as IntoIterator>::IntoIter {
-        self.into_iter()
-    }
-}

fix-vm/Cargo.toml

@@ -3,16 +3,19 @@ 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 }
-sysinfo = { version = "0.38", default-features = false, features = ["system"] }
+string-interner = { workspace = true }
+likely_stable = { workspace = true }
+sptr = "0.3"
 
-fix-bytecode = { path = "../fix-bytecode" }
+fix-builtins = { path = "../fix-builtins" }
+fix-codegen = { path = "../fix-codegen" }
+fix-common = { path = "../fix-common" }
 fix-error = { path = "../fix-error" }
-fix-lang = { path = "../fix-lang" }
-fix-runtime = { path = "../fix-runtime" }
-
-[features]
-tailcall = []

fix-vm/src/boxing.rs

@@ -24,7 +24,7 @@ impl<T: Default + Copy, const N: usize> ArrayExt<N> for [T; N] {
     }
 }
 
-pub trait RawStore: Sized {
+pub(crate) trait RawStore: Sized {
     fn to_val(self, value: &mut Value);
     fn from_val(value: &Value) -> Self;
 }
@@ -157,24 +157,24 @@ enum TagVal {
 }
 
 #[derive(Copy, Clone, PartialEq, Eq)]
-pub struct RawTag(TagVal);
+pub(crate) struct RawTag(TagVal);
 
 impl RawTag {
-    pub const P1: RawTag = RawTag(TagVal::_P1);
+    pub(crate) const P1: RawTag = RawTag(TagVal::_P1);
-    pub const P2: RawTag = RawTag(TagVal::_P2);
+    pub(crate) const P2: RawTag = RawTag(TagVal::_P2);
-    pub const P3: RawTag = RawTag(TagVal::_P3);
+    pub(crate) const P3: RawTag = RawTag(TagVal::_P3);
-    pub const P4: RawTag = RawTag(TagVal::_P4);
+    pub(crate) const P4: RawTag = RawTag(TagVal::_P4);
-    pub const P5: RawTag = RawTag(TagVal::_P5);
+    pub(crate) const P5: RawTag = RawTag(TagVal::_P5);
-    pub const P6: RawTag = RawTag(TagVal::_P6);
+    pub(crate) const P6: RawTag = RawTag(TagVal::_P6);
-    pub const P7: RawTag = RawTag(TagVal::_P7);
+    pub(crate) const P7: RawTag = RawTag(TagVal::_P7);
 
-    pub const N1: RawTag = RawTag(TagVal::_N1);
+    pub(crate) const N1: RawTag = RawTag(TagVal::_N1);
-    pub const N2: RawTag = RawTag(TagVal::_N2);
+    pub(crate) const N2: RawTag = RawTag(TagVal::_N2);
-    pub const N3: RawTag = RawTag(TagVal::_N3);
+    pub(crate) const N3: RawTag = RawTag(TagVal::_N3);
-    pub const N4: RawTag = RawTag(TagVal::_N4);
+    pub(crate) const N4: RawTag = RawTag(TagVal::_N4);
-    pub const N5: RawTag = RawTag(TagVal::_N5);
+    pub(crate) const N5: RawTag = RawTag(TagVal::_N5);
-    pub const N6: RawTag = RawTag(TagVal::_N6);
+    pub(crate) const N6: RawTag = RawTag(TagVal::_N6);
-    pub const N7: RawTag = RawTag(TagVal::_N7);
+    pub(crate) const N7: RawTag = RawTag(TagVal::_N7);
 
     #[inline]
     #[must_use]
@@ -260,7 +260,7 @@ impl RawTag {
 
     #[inline]
     #[must_use]
-    pub const fn neg_val(self) -> (bool, u8) {
+    pub(crate) const fn neg_val(self) -> (bool, u8) {
         match self.0 {
             TagVal::_P1 => (false, 1),
             TagVal::_P2 => (false, 2),
@@ -323,7 +323,7 @@ impl Header {
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 #[repr(C, align(8))]
-pub struct Value {
+pub(crate) struct Value {
     #[cfg(target_endian = "big")]
     header: Header,
     data: [u8; 6],
@@ -373,7 +373,7 @@ impl Value {
 
     #[inline]
     #[must_use]
-    pub fn data(&self) -> &[u8; 6] {
+    pub(crate) fn data(&self) -> &[u8; 6] {
         &self.data
     }
 

fix-vm/src/bytecode_reader.rs

@@ -0,0 +1,143 @@
+use fix_codegen::OperandType;
+use fix_common::StringId;
+use num_enum::TryFromPrimitive;
+use string_interner::Symbol as _;
+
+use crate::{OperandData, VmRuntimeCtx};
+
+pub(crate) struct BytecodeReader<'a> {
+    bytecode: &'a [u8],
+    pc: usize,
+    inst_start_pc: usize,
+}
+
+impl<'a> BytecodeReader<'a> {
+    #[cfg_attr(feature = "tailcall", allow(dead_code))]
+    pub(crate) fn new(bytecode: &'a [u8], pc: usize) -> Self {
+        Self {
+            bytecode,
+            pc,
+            inst_start_pc: pc,
+        }
+    }
+
+    #[inline(always)]
+    #[cfg_attr(not(feature = "tailcall"), allow(dead_code))]
+    pub(crate) 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)]
+    #[cfg_attr(feature = "tailcall", allow(dead_code))]
+    pub(crate) 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(crate) fn read_u8(&mut self) -> u8 {
+        let val = self.bytecode[self.pc];
+        self.pc += 1;
+        val
+    }
+
+    #[inline(always)]
+    pub(crate) fn read_u16(&mut self) -> u16 {
+        u16::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub(crate) fn read_u32(&mut self) -> u32 {
+        u32::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub(crate) fn read_i32(&mut self) -> i32 {
+        i32::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub(crate) fn read_i64(&mut self) -> i64 {
+        i64::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub(crate) fn read_f64(&mut self) -> f64 {
+        f64::from_le_bytes(self.read_array())
+    }
+
+    #[inline(always)]
+    pub(crate) 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(crate) 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(crate) fn pc(&self) -> usize {
+        self.pc
+    }
+
+    pub(crate) fn set_pc(&mut self, pc: usize) {
+        self.pc = pc;
+    }
+
+    pub(crate) fn inst_start_pc(&self) -> usize {
+        self.inst_start_pc
+    }
+}

fix-vm/src/dispatch_tailcall.rs

@@ -61,7 +61,7 @@ macro_rules! tail_fn {
             pc: u32,
             fuel: u32,
         ) -> TailResult {
-            let result = crate::instructions::$name(vm);
+            let result = vm.$name();
             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 = crate::instructions::$name(vm, &mut reader);
+            let result = vm.$name(&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 = crate::instructions::$name(vm, &mut reader, mc);
+            let result = vm.$name(&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 = crate::instructions::$name(vm, ctx, &mut reader, mc);
+            let result = vm.$name(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 = crate::instructions::$name(vm, ctx);
+            let result = vm.$name(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_bytecode::Op::$variant as usize] = $fn; )*
+                $( arr[fix_codegen::Op::$variant as usize] = $fn; )*
                 DispatchTable(arr)
             };
         }
 
-        // Exhaustiveness check: fails to compile if `fix_bytecode::Op` gains,
+        // Exhaustiveness check: fails to compile if `fix_codegen::Op` gains,
         // loses, or renames a variant that isn't wired up above.
         #[allow(dead_code)]
-        const _: fn(fix_bytecode::Op) = |op| match op {
+        const _: fn(fix_codegen::Op) = |op| match op {
-            $( fix_bytecode::Op::$variant => (), )*
+            $( fix_codegen::Op::$variant => (), )*
         };
     };
 }

fix-vm/src/forced.rs

@@ -1,20 +1,18 @@
-use fix_lang::StringId;
+use fix_common::StringId;
 use gc_arena::{Gc, Mutation};
 
-use crate::{
+use crate::value::*;
-    AttrSet, Break, BytecodeReader, Closure, List, Machine, NixNum, NixString, NixType, Null,
+use crate::{Break, BytecodeReader, NixNum, Step, Vm};
-    PrimOp, PrimOpApp, Step, StrictValue,
-};
 
-pub trait Forced<'gc>: Sized {
+pub(crate) trait Forced<'gc>: Sized {
     const WIDTH: usize;
 
     /// Force and type-check the `WIDTH` slots starting at `base_depth` from
     /// TOS, deepest-first. If a slot holds a thunk, enter it and return
     /// `Break::Force`. If a slot holds a value of the wrong type, call
     /// `finish_type_err` and return `Break::Done`.
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base_depth: usize,
@@ -24,26 +22,26 @@ pub trait Forced<'gc>: Sized {
     /// After `force_and_check` returned `Continue`, pop `WIDTH` slots
     /// (TOS first) and convert. Type assertions are infallible because
     /// `force_and_check` already validated every slot.
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self;
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self;
 }
 
 impl<'gc> Forced<'gc> for StrictValue<'gc> {
     const WIDTH: usize = 1;
 
     #[inline(always)]
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base_depth: usize,
         resume_pc: usize,
     ) -> Step {
-        m.force_slot_to_pc(base_depth, reader, mc, resume_pc)
+        vm.force_slot_to_pc(base_depth, reader, mc, resume_pc)
     }
 
     #[inline(always)]
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-        m.pop_forced()
+        vm.pop_forced()
     }
 }
 
@@ -54,25 +52,25 @@ macro_rules! impl_forced_inline {
             const WIDTH: usize = 1;
 
             #[inline(always)]
-            fn force_and_check<M: Machine<'gc>>(
+            fn force_and_check(
-                m: &mut M,
+                vm: &mut Vm<'gc>,
                 reader: &mut BytecodeReader<'_>,
                 mc: &Mutation<'gc>,
                 base_depth: usize,
                 resume_pc: usize,
             ) -> Step {
-                m.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
+                vm.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
-                let v = m.peek_forced(base_depth);
+                let v = vm.peek_forced(base_depth);
                 if v.as_inline::<$ty>().is_none() {
-                    let _: Step = m.finish_type_err($nix_ty, v.ty());
+                    let _: Step = vm.finish_type_err($nix_ty, v.ty());
                     return Step::Break(Break::Done);
                 }
                 Step::Continue(())
             }
 
             #[inline(always)]
-            fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+            fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-                m.pop_forced()
+                vm.pop_forced()
                     .as_inline::<$ty>()
                     .expect("type checked in force_and_check")
             }
@@ -88,25 +86,25 @@ macro_rules! impl_forced_gc {
             const WIDTH: usize = 1;
 
             #[inline(always)]
-            fn force_and_check<M: Machine<'gc>>(
+            fn force_and_check(
-                m: &mut M,
+                vm: &mut Vm<'gc>,
                 reader: &mut BytecodeReader<'_>,
                 mc: &Mutation<'gc>,
                 base_depth: usize,
                 resume_pc: usize,
             ) -> Step {
-                m.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
+                vm.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
-                let v = m.peek_forced(base_depth);
+                let v = vm.peek_forced(base_depth);
                 if v.as_gc::<$ty>().is_none() {
-                    let _: Step = m.finish_type_err($nix_ty, v.ty());
+                    let _: Step = vm.finish_type_err($nix_ty, v.ty());
                     return Step::Break(Break::Done);
                 }
                 Step::Continue(())
             }
 
             #[inline(always)]
-            fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+            fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-                m.pop_forced()
+                vm.pop_forced()
                     .as_gc::<$ty>()
                     .expect("type checked in force_and_check")
             }
@@ -136,25 +134,25 @@ impl<'gc> Forced<'gc> for NixNum {
     const WIDTH: usize = 1;
 
     #[inline(always)]
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base_depth: usize,
         resume_pc: usize,
     ) -> Step {
-        m.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
+        vm.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
-        let v = m.peek_forced(base_depth);
+        let v = vm.peek_forced(base_depth);
         if v.as_num().is_none() {
-            let _: Step = m.finish_type_err(NixType::Int, v.ty());
+            let _: Step = vm.finish_type_err(NixType::Int, v.ty());
             return Step::Break(Break::Done);
         }
         Step::Continue(())
     }
 
     #[inline(always)]
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-        m.pop_forced()
+        vm.pop_forced()
             .as_num()
             .expect("type checked in force_and_check")
     }
@@ -164,25 +162,25 @@ impl<'gc> Forced<'gc> for f64 {
     const WIDTH: usize = 1;
 
     #[inline(always)]
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base_depth: usize,
         resume_pc: usize,
     ) -> Step {
-        m.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
+        vm.force_slot_to_pc(base_depth, reader, mc, resume_pc)?;
-        let v = m.peek_forced(base_depth);
+        let v = vm.peek_forced(base_depth);
         if v.as_float().is_none() {
-            let _: Step = m.finish_type_err(NixType::Float, v.ty());
+            let _: Step = vm.finish_type_err(NixType::Float, v.ty());
             return Step::Break(Break::Done);
         }
         Step::Continue(())
     }
 
     #[inline(always)]
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-        m.pop_forced()
+        vm.pop_forced()
             .as_float()
             .expect("type checked in force_and_check")
     }
@@ -192,21 +190,21 @@ impl<'gc, A: Forced<'gc>, B: Forced<'gc>> Forced<'gc> for (A, B) {
     const WIDTH: usize = A::WIDTH + B::WIDTH;
 
     #[inline(always)]
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base: usize,
         resume_pc: usize,
     ) -> Step {
-        A::force_and_check(m, reader, mc, base + B::WIDTH, resume_pc)?;
+        A::force_and_check(vm, reader, mc, base + B::WIDTH, resume_pc)?;
-        B::force_and_check(m, reader, mc, base, resume_pc)
+        B::force_and_check(vm, reader, mc, base, resume_pc)
     }
 
     #[inline(always)]
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-        let b = B::pop_converted(m);
+        let b = B::pop_converted(vm);
-        let a = A::pop_converted(m);
+        let a = A::pop_converted(vm);
         (a, b)
     }
 }
@@ -215,23 +213,23 @@ impl<'gc, A: Forced<'gc>, B: Forced<'gc>, C: Forced<'gc>> Forced<'gc> for (A, B,
     const WIDTH: usize = A::WIDTH + B::WIDTH + C::WIDTH;
 
     #[inline(always)]
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base: usize,
         resume_pc: usize,
     ) -> Step {
-        A::force_and_check(m, reader, mc, base + B::WIDTH + C::WIDTH, resume_pc)?;
+        A::force_and_check(vm, reader, mc, base + B::WIDTH + C::WIDTH, resume_pc)?;
-        B::force_and_check(m, reader, mc, base + C::WIDTH, resume_pc)?;
+        B::force_and_check(vm, reader, mc, base + C::WIDTH, resume_pc)?;
-        C::force_and_check(m, reader, mc, base, resume_pc)
+        C::force_and_check(vm, reader, mc, base, resume_pc)
     }
 
     #[inline(always)]
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-        let c = C::pop_converted(m);
+        let c = C::pop_converted(vm);
-        let b = B::pop_converted(m);
+        let b = B::pop_converted(vm);
-        let a = A::pop_converted(m);
+        let a = A::pop_converted(vm);
         (a, b, c)
     }
 }
@@ -242,31 +240,31 @@ impl<'gc, A: Forced<'gc>, B: Forced<'gc>, C: Forced<'gc>, D: Forced<'gc>> Forced
     const WIDTH: usize = A::WIDTH + B::WIDTH + C::WIDTH + D::WIDTH;
 
     #[inline(always)]
-    fn force_and_check<M: Machine<'gc>>(
+    fn force_and_check(
-        m: &mut M,
+        vm: &mut Vm<'gc>,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         base: usize,
         resume_pc: usize,
     ) -> Step {
         A::force_and_check(
-            m,
+            vm,
             reader,
             mc,
             base + B::WIDTH + C::WIDTH + D::WIDTH,
             resume_pc,
         )?;
-        B::force_and_check(m, reader, mc, base + C::WIDTH + D::WIDTH, resume_pc)?;
+        B::force_and_check(vm, reader, mc, base + C::WIDTH + D::WIDTH, resume_pc)?;
-        C::force_and_check(m, reader, mc, base + D::WIDTH, resume_pc)?;
+        C::force_and_check(vm, reader, mc, base + D::WIDTH, resume_pc)?;
-        D::force_and_check(m, reader, mc, base, resume_pc)
+        D::force_and_check(vm, reader, mc, base, resume_pc)
     }
 
     #[inline(always)]
-    fn pop_converted<M: Machine<'gc>>(m: &mut M) -> Self {
+    fn pop_converted(vm: &mut Vm<'gc>) -> Self {
-        let d = D::pop_converted(m);
+        let d = D::pop_converted(vm);
-        let c = C::pop_converted(m);
+        let c = C::pop_converted(vm);
-        let b = B::pop_converted(m);
+        let b = B::pop_converted(vm);
-        let a = A::pop_converted(m);
+        let a = A::pop_converted(vm);
         (a, b, c, d)
     }
 }

fix-vm/src/helpers.rs

@@ -0,0 +1,7 @@
+use fix_error::Error;
+
+use crate::VmError;
+
+pub(crate) fn vm_err(msg: impl Into<String>) -> VmError {
+    VmError::Uncatchable(Error::eval_error(msg.into()))
+}

fix-vm/src/instructions/arithmetic.rs

@@ -1,104 +1,69 @@
 use std::cmp::Ordering;
 
-use fix_runtime::*;
 use gc_arena::{Gc, Mutation, RefLock};
 
-use crate::{BytecodeReader, NixNum, Step, VmError, VmRuntimeCtx};
+use crate::value::*;
+use crate::{BytecodeReader, NixNum, Step, VmError, VmRuntimeCtx, VmRuntimeCtxExt as _};
 
-#[inline(always)]
+impl<'gc> crate::Vm<'gc> {
-pub(crate) fn op_add<'gc, M: Machine<'gc>>(
+    #[inline(always)]
-    m: &mut M,
+    pub(crate) fn op_add(
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-    // if the LHS is a path, the result is a path obtained by
+        if let (Some(ls), Some(rs)) = (ctx.get_string(lhs), ctx.get_string(rhs)) {
-    // canonicalizing the concatenated string. RHS may be a path or a
+            let ns = Gc::new(mc, crate::NixString::new(format!("{ls}{rs}")));
-    // string. (A `string + path` keeps the string-typed result, handled
+            self.push(Value::new_gc(ns));
-    // by the next branch.)
-    if lhs.is::<Path>() {
-        let (Some(ls), Some(rs)) = (ctx.get_string_or_path(lhs), ctx.get_string_or_path(rhs))
-        else {
-            return m.finish_err(fix_error::Error::eval_error(format!(
-                "cannot append {} to a path",
-                rhs.ty()
-            )));
-        };
-        let combined = format!("{ls}{rs}");
-        let canon = canon_path_str(&combined);
-        let sid = ctx.intern_string(canon);
-        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)) {
-        let merged = ctx
-            .get_string_context(lhs)
-            .merge(ctx.get_string_context(rhs));
-        let ns = Gc::new(
-            mc,
-            crate::NixString::with_context(format!("{ls}{rs}"), merged),
-        );
-        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) => {
-            m.push(val);
+                self.push(val);
                 Step::Continue(())
             }
-        Err(e) => m.finish_vm_err(e),
+            Err(e) => self.finish_vm_err(e),
+        }
     }
-}
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_sub<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_sub(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-    m: &mut M,
+        self.op_arith(reader, mc, i64::wrapping_sub, |a, b| a - b)
-    reader: &mut BytecodeReader<'_>,
+    }
-    mc: &Mutation<'gc>,
-) -> Step {
-    op_arith(m, reader, mc, i64::wrapping_sub, |a, b| a - b)
-}
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_mul<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_mul(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-    m: &mut M,
+        self.op_arith(reader, mc, i64::wrapping_mul, |a, b| a * b)
-    reader: &mut BytecodeReader<'_>,
+    }
-    mc: &Mutation<'gc>,
-) -> Step {
-    op_arith(m, reader, mc, i64::wrapping_mul, |a, b| a * b)
-}
 
-#[inline(always)]
+    #[inline(always)]
-fn op_arith<'gc, M: Machine<'gc>>(
+    fn op_arith(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         int_op: fn(i64, i64) -> i64,
         float_op: fn(f64, f64) -> f64,
-) -> Step {
+    ) -> Step {
-    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
         let res = numeric_binop(lhs, rhs, mc, int_op, float_op);
         match res {
             Ok(val) => {
-            m.push(val);
+                self.push(val);
                 Step::Continue(())
             }
-        Err(e) => m.finish_vm_err(e),
+            Err(e) => self.finish_vm_err(e),
+        }
     }
-}
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_div<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_div(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-    m: &mut M,
+        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-    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 m.finish_vm_err(VmError::Uncatchable(fix_error::Error::eval_error(
+                return self.finish_vm_err(VmError::Uncatchable(fix_error::Error::eval_error(
                     "division by zero",
                 )));
             }
@@ -107,151 +72,210 @@ pub(crate) fn op_div<'gc, M: Machine<'gc>>(
         let res = numeric_binop(lhs, rhs, mc, |a, b| a / b, |a, b| a / b);
         match res {
             Ok(val) => {
-            m.push(val);
+                self.push(val);
                 Step::Continue(())
             }
-        Err(e) => m.finish_vm_err(e),
+            Err(e) => self.finish_vm_err(e),
+        }
     }
-}
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_eq<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_eq(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-    crate::primops::start_eq(m, ctx, reader, mc, lhs, rhs, false)
+        let eq = match self.values_equal(ctx, lhs, rhs) {
-}
+            Ok(eq) => eq,
+            Err(e) => return self.finish_vm_err(e),
+        };
+        self.push(Value::new_inline(eq));
+        Step::Continue(())
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_neq<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_neq(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-    crate::primops::start_eq(m, ctx, reader, mc, lhs, rhs, true)
+        let eq = match self.values_equal(ctx, lhs, rhs) {
-}
+            Ok(eq) => eq,
+            Err(e) => return self.finish_vm_err(e),
+        };
+        self.push(Value::new_inline(!eq));
+        Step::Continue(())
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_lt<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_lt(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    compare_values(m, ctx, reader, mc, Ordering::is_lt)
+        self.compare_values(ctx, reader, mc, Ordering::is_lt)
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_gt<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_gt(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    compare_values(m, ctx, reader, mc, Ordering::is_gt)
+        self.compare_values(ctx, reader, mc, Ordering::is_gt)
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_leq<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_leq(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    compare_values(m, ctx, reader, mc, Ordering::is_le)
+        self.compare_values(ctx, reader, mc, Ordering::is_le)
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_geq<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_geq(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    compare_values(m, ctx, reader, mc, Ordering::is_ge)
+        self.compare_values(ctx, reader, mc, Ordering::is_ge)
-}
+    }
 
-fn compare_values<'gc, M: Machine<'gc>>(
+    fn compare_values(
-    m: &mut M,
+        &mut self,
         ctx: &impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         pred: fn(Ordering) -> bool,
-) -> Step {
+    ) -> Step {
-    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
+        let (lhs, rhs) = self.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-    match compare_values_inner(m, ctx, pred, lhs, rhs) {
+        match self.compare_values_inner(ctx, pred, lhs, rhs) {
             Ok(()) => Step::Continue(()),
-        Err(e) => m.finish_vm_err(e),
+            Err(e) => self.finish_vm_err(e),
+        }
     }
-}
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_concat<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_concat(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let (l, r) = m.force_and_retry::<(Gc<List>, Gc<List>)>(reader, mc)?;
+        let (l, r) = self.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());
-    m.push(Value::new_gc(Gc::new(
+        self.push(Value::new_gc(Gc::new(
             mc,
             crate::List {
                 inner: RefLock::new(items),
             },
         )));
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_update<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_update(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let (l, r) = m.force_and_retry::<(Gc<AttrSet>, Gc<AttrSet>)>(reader, mc)?;
+        let (l, r) = self.force_and_retry::<(Gc<AttrSet>, Gc<AttrSet>)>(reader, mc)?;
-    m.push(Value::new_gc(l.merge(&r, mc)));
+        self.push(Value::new_gc(l.merge(&r, mc)));
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_neg<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_neg(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-    m: &mut M,
+        let rhs = self.force_and_retry::<NixNum>(reader, mc)?;
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let rhs = m.force_and_retry::<NixNum>(reader, mc)?;
         match rhs {
-        NixNum::Int(int) => m.push(Value::make_int(-int, mc)),
+            NixNum::Int(int) => self.push(Value::make_int(-int, mc)),
-        NixNum::Float(float) => m.push(Value::new_float(-float)),
+            NixNum::Float(float) => self.push(Value::new_float(-float)),
         }
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_not<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_not(&mut self, reader: &mut BytecodeReader<'_>, mc: &Mutation<'gc>) -> Step {
-    m: &mut M,
+        let rhs = self.force_and_retry::<bool>(reader, mc)?;
-    reader: &mut BytecodeReader<'_>,
+        self.push(Value::new_inline(!rhs));
-    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<'gc, M: Machine<'gc>>(
+    pub(crate) fn values_equal(
-    m: &mut M,
+        &mut self,
+        ctx: &impl VmRuntimeCtx,
+        lhs: StrictValue<'gc>,
+        rhs: StrictValue<'gc>,
+    ) -> crate::VmResult<bool> {
+        if let (Some(a), Some(b)) = (get_num(lhs), get_num(rhs)) {
+            return Ok(match (a, b) {
+                (NixNum::Int(a), NixNum::Int(b)) => a == b,
+                (NixNum::Float(a), NixNum::Float(b)) => a == b,
+                (NixNum::Int(a), NixNum::Float(b)) => a as f64 == b,
+                (NixNum::Float(a), NixNum::Int(b)) => a == b as f64,
+            });
+        }
+        if let (Some(a), Some(b)) = (lhs.as_inline::<bool>(), rhs.as_inline::<bool>()) {
+            return Ok(a == b);
+        }
+        if lhs.is::<crate::Null>() && rhs.is::<crate::Null>() {
+            return Ok(true);
+        }
+        if let (Some(a), Some(b)) = (ctx.get_string(lhs), ctx.get_string(rhs)) {
+            return Ok(a == b);
+        }
+        if let (Some(a), Some(b)) = (lhs.as_gc::<crate::List>(), rhs.as_gc::<crate::List>()) {
+            if a.inner.borrow().len() != b.inner.borrow().len() {
+                return Ok(false);
+            }
+            for (x, y) in a.inner.borrow().iter().zip(b.inner.borrow().iter()) {
+                let lx = x.restrict().expect("forced");
+                let ly = y.restrict().expect("forced");
+                if !self.values_equal(ctx, lx, ly)? {
+                    return Ok(false);
+                }
+            }
+            return Ok(true);
+        }
+        if let (Some(a), Some(b)) = (lhs.as_gc::<crate::AttrSet>(), rhs.as_gc::<crate::AttrSet>()) {
+            let a = &a.entries;
+            let b = &b.entries;
+            if a.len() != b.len() {
+                return Ok(false);
+            }
+            for ((k1, v1), (k2, v2)) in a.iter().zip(b.iter()) {
+                if k1 != k2 {
+                    return Ok(false);
+                }
+                let lv1 = v1.restrict().expect("forced");
+                let lv2 = v2.restrict().expect("forced");
+                if !self.values_equal(ctx, lv1, lv2)? {
+                    return Ok(false);
+                }
+            }
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    fn compare_values_inner(
+        &mut self,
         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),
@@ -263,30 +287,21 @@ fn compare_values_inner<'gc, M: Machine<'gc>>(
                     a.partial_cmp(&(b as f64)).unwrap_or(Ordering::Less)
                 }
             };
-        m.push(Value::new_inline(pred(ord)));
+            self.push(Value::new_inline(pred(ord)));
             return Ok(());
         }
         if let (Some(a), Some(b)) = (ctx.get_string(lhs), ctx.get_string(rhs)) {
-        m.push(Value::new_inline(pred(a.cmp(b))));
+            self.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);
-        m.push(Value::new_inline(pred(a.cmp(b))));
             return Ok(());
         }
         // TODO: compare other types
-    Err(crate::vm_err(format!(
+        Err(crate::vm_err("cannot compare these types"))
-        "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(i64::from(i)))
+        Some(NixNum::Int(i as i64))
     } else if let Some(gc_i) = val.as_gc::<i64>() {
         Some(NixNum::Int(*gc_i))
     } else {

fix-vm/src/instructions/calls.rs

@@ -1,35 +1,36 @@
-use fix_bytecode::PrimOpPhase;
+use fix_builtins::PrimOpPhase;
 use fix_error::Error;
-use fix_runtime::{resolve_operand, *};
 use gc_arena::{Gc, Mutation, RefLock};
 
+use crate::value::*;
 use crate::{
     BytecodeReader, CallFrame, Closure, Env, ForceMode, Step, ThunkState, VmRuntimeCtx,
     VmRuntimeCtxExt,
 };
 
-#[inline(always)]
+impl<'gc> crate::Vm<'gc> {
-pub(crate) fn call<'gc, M: Machine<'gc>>(
+    #[inline(always)]
-    m: &mut M,
+    pub(crate) fn call(
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
         arg: Value<'gc>,
         resume_pc: usize,
-) -> Step {
+    ) -> Step {
-    let func = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let func = self.force_and_retry::<StrictValue>(reader, mc)?;
-    if m.call_depth() > 10000 {
+        if self.call_depth > 10000 {
-        return m.finish_err(Error::eval_error("stack overflow; max-call-depth exceeded"));
+            return self.finish_err(Error::eval_error("stack overflow; max-call-depth exceeded"));
         }
-    m.inc_call_depth();
+        self.call_depth += 1;
         if let Some(closure) = func.as_gc::<Closure>() {
             if closure.pattern.is_some() {
                 // FIXME: better DX...
-            m.push(func.relax());
+                self.push(func.relax());
-            m.push(arg);
+                self.push(arg);
-            m.push_call_frame(CallFrame {
+                self.call_stack.push(CallFrame {
                     pc: resume_pc,
                     thunk: None,
-                env: m.env(),
+                    env: self.env,
                 });
                 reader.set_pc(PrimOpPhase::CallPattern.ip() as usize);
                 return Step::Continue(());
@@ -39,20 +40,20 @@ pub(crate) fn call<'gc, M: Machine<'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)));
-        m.push_call_frame(CallFrame {
+            self.call_stack.push(CallFrame {
                 pc: resume_pc,
                 thunk: None,
-            env: m.env(),
+                env: self.env,
             });
             reader.set_pc(ip as usize);
-        m.set_env(new_env);
+            self.env = new_env;
         } else if let Some(primop) = func.as_inline::<PrimOp>() {
             if primop.arity == 1 {
-            m.push(arg);
+                self.push(arg);
-            m.push_call_frame(CallFrame {
+                self.call_stack.push(CallFrame {
                     pc: resume_pc,
                     thunk: None,
-                env: m.env(),
+                    env: self.env,
                 });
                 reader.set_pc(primop.dispatch_ip as usize)
             } else {
@@ -61,99 +62,97 @@ pub(crate) fn call<'gc, M: Machine<'gc>>(
                     arity: primop.arity - 1,
                     args: [arg, Value::default(), Value::default()],
                 };
-            m.push(Value::new_gc(Gc::new(mc, app)));
+                self.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 {
-                m.push(app.args[i as usize]);
+                    self.push(app.args[i as usize]);
                 }
-            m.push(arg);
+                self.push(arg);
-            m.push_call_frame(CallFrame {
+                self.call_stack.push(CallFrame {
                     pc: resume_pc,
                     thunk: None,
-                env: m.env(),
+                    env: self.env,
                 });
                 reader.set_pc(app.primop.dispatch_ip as usize)
             } else {
-            let position = (app.primop.arity - app.arity) as usize;
+                let new_app = PrimOpApp {
-            let mut new_app = PrimOpApp {
                     arity: app.arity - 1,
                     ..*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(m.functor_sym())
+            && let Some(functor) = attrs.lookup(self.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.
-        m.dec_call_depth();
+            self.call_depth -= 1;
-        m.push_call_frame(CallFrame {
+            self.call_stack.push(CallFrame {
                 pc: resume_pc,
                 thunk: None,
-            env: m.env(),
+                env: self.env,
             });
-        m.push(arg);
+            self.push(arg);
-        m.push(func.relax());
+            self.push(func.relax());
-        m.push(functor);
+            self.push(functor);
             reader.set_pc(PrimOpPhase::CallFunctor1.ip() as usize);
             return Step::Continue(());
         } else {
-        return m.finish_err(Error::eval_error(format!(
+            return self.finish_err(Error::eval_error(format!(
                 "attempt to call something which is not a function but {}",
                 func.ty()
             )));
         }
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_call<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_call(
-    m: &mut M,
+        &mut self,
         ctx: &impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let arg = resolve_operand(&reader.read_operand_data(), mc, ctx, m);
+        let arg = reader.read_operand_data(ctx).resolve(mc, self);
         let pc = reader.pc();
-    m.call(reader, mc, arg, pc)
+        self.call(reader, mc, arg, pc)
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_return<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_return(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
         let Some(CallFrame {
             pc: ret_pc,
             thunk,
             env,
-    }) = m.pop_call_frame()
+        }) = self.call_stack.pop()
         else {
-        match m.force_mode() {
+            match self.force_mode {
-            ForceMode::AsIs => return m.finish_ok(ctx.convert_value(val.relax())),
+                ForceMode::AsIs => return self.finish_ok(ctx.convert_value(val.relax())),
                 ForceMode::Shallow => {
-                m.push(val.relax());
+                    self.push(val.relax());
                     reader.set_pc(PrimOpPhase::ForceResultShallow.ip() as usize);
                     return Step::Continue(());
                 }
                 ForceMode::Deep => {
-                m.push(val.relax());
+                    self.push(val.relax());
-                m.push(val.relax());
+                    self.push(val.relax());
-                m.push_call_frame(CallFrame {
+                    self.call_stack.push(CallFrame {
                         pc: PrimOpPhase::ForceResultDeepFinish.ip() as usize,
                         thunk: None,
-                    env: m.env(),
+                        env: self.env,
                     });
-                m.inc_call_depth();
+                    self.call_depth += 1;
                     reader.set_pc(PrimOpPhase::DeepSeq.ip() as usize);
                     return Step::Continue(());
                 }
@@ -163,19 +162,10 @@ pub(crate) fn op_return<'gc, M: Machine<'gc>>(
         if let Some(outer_thunk) = thunk {
             *outer_thunk.borrow_mut(mc) = ThunkState::Evaluated(val);
         } else {
-        m.dec_call_depth();
+            self.call_depth -= 1;
-        m.push(val.relax())
+            self.push(val.relax())
         }
-    m.set_env(env);
+        self.env = env;
         Step::Continue(())
-}
+    }
-
-#[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 {
-    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};
 
-#[inline(always)]
+impl<'gc> crate::Vm<'gc> {
-pub(crate) fn op_make_thunk<'gc, M: Machine<'gc>>(
+    #[inline(always)]
-    m: &mut M,
+    pub(crate) fn op_make_thunk(
+        &mut self,
         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: m.env(),
+                env: self.env,
             }),
         );
-    m.push(Value::new_gc(thunk));
+        self.push(Value::new_gc(thunk));
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_make_closure<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_make_closure(
-    m: &mut M,
+        &mut self,
         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 @@ pub(crate) fn op_make_closure<'gc, M: Machine<'gc>>(
             crate::Closure {
                 ip: entry_point,
                 n_locals,
-            env: m.env(),
+                env: self.env,
                 pattern: None,
             },
         );
-    m.push(Value::new_gc(closure));
+        self.push(Value::new_gc(closure));
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_make_pattern_closure<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_make_pattern_closure(
-    m: &mut M,
+        &mut self,
         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,10 +84,11 @@ pub(crate) fn op_make_pattern_closure<'gc, M: Machine<'gc>>(
             crate::Closure {
                 ip: entry_point,
                 n_locals,
-            env: m.env(),
+                env: self.env,
                 pattern: Some(pattern),
             },
         );
-    m.push(Value::new_gc(closure));
+        self.push(Value::new_gc(closure));
         Step::Continue(())
+    }
 }

fix-vm/src/instructions/collections.rs

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

fix-vm/src/instructions/control.rs

@@ -1,58 +1,60 @@
 use fix_error::Error;
-use fix_runtime::*;
 use gc_arena::Mutation;
 
+use crate::value::*;
 use crate::{BytecodeReader, Step, VmRuntimeCtx};
 
-#[inline(always)]
+impl<'gc> crate::Vm<'gc> {
-pub(crate) fn op_jump_if_false<'gc, M: Machine<'gc>>(
+    #[inline(always)]
-    m: &mut M,
+    pub(crate) fn op_jump_if_false(
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &gc_arena::Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         let offset = reader.read_i32();
-    let cond = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let cond = self.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)]
+    #[inline(always)]
-pub(crate) fn op_jump_if_true<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_jump_if_true(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         let offset = reader.read_i32();
-    let cond = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let cond = self.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)]
+    #[inline(always)]
-pub(crate) fn op_jump<'gc, M: Machine<'gc>>(_m: &mut M, reader: &mut BytecodeReader<'_>) -> Step {
+    pub(crate) fn op_jump(&mut self, 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)]
+    #[inline(always)]
-pub(crate) fn op_assert<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_assert(
-    m: &mut M,
+        &mut self,
         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 = m.force_and_retry::<bool>(reader, mc)?;
+        let assertion = self.force_and_retry::<bool>(reader, mc)?;
         if !assertion {
             // FIXME: use catchable error
-        return m.finish_err(Error::eval_error(format!("assertion '{raw}' failed")));
+            return self.finish_err(Error::eval_error(format!("assertion '{raw}' failed")));
         }
         Step::Continue(())
+    }
 }

fix-vm/src/instructions/literals.rs

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

fix-vm/src/instructions/misc.rs

@@ -1,153 +1,131 @@
-use std::path::PathBuf;
+use std::path::{Component, PathBuf};
 
-use fix_bytecode::PrimOpPhase;
+use fix_builtins::BuiltinId;
+use fix_common::StringId;
 use fix_error::Error;
-use fix_lang::{BUILTINS, BuiltinId, StringId};
+use num_enum::TryFromPrimitive;
-use fix_runtime::{
-    AttrSet, Machine, MachineExt, NixString, Path, StrictValue, StringContext, canon_path_str,
-};
 
+use crate::value::{AttrSet, NixString, StrictValue};
 use crate::{BytecodeReader, PrimOp, Step, Value, VmRuntimeCtx, VmRuntimeCtxExt};
 
-#[inline(always)]
+impl<'gc> crate::Vm<'gc> {
-pub(crate) fn op_load_builtins<'gc, M: Machine<'gc>>(m: &mut M) -> Step {
+    #[inline(always)]
-    m.push(m.builtins());
+    pub(crate) fn op_load_builtins(&mut self) -> Step {
+        self.push(self.builtins);
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_load_builtin<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_load_builtin(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-    m: &mut M,
+        let Ok(id) = BuiltinId::try_from_primitive(reader.read_u8())
-    reader: &mut BytecodeReader<'_>,
-) -> Step {
-    let Ok(id) = BuiltinId::try_from(reader.read_u8())
             .map_err(|err| panic!("unknown builtin id: {}", err.number));
-    m.push(Value::new_inline(PrimOp {
+        self.push(Value::new_inline(PrimOp {
             id,
-        arity: BUILTINS[id as usize].1,
+            arity: fix_builtins::BUILTINS[id as usize].1,
-        dispatch_ip: PrimOpPhase::entry_for_builtin(id).ip(),
+            dispatch_ip: id.entry_phase().ip(),
         }));
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_load_repl_binding<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_load_repl_binding(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-    _m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-) -> Step {
         let _name = reader.read_string_id();
         todo!("LoadReplBinding");
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_load_scoped_binding<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_load_scoped_binding(
-    m: &mut M,
+        &mut self,
         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 = m.scope_slot(slot_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 Some(attrs) = scope.as_gc::<AttrSet>() else {
-        return m.finish_err(Error::eval_error("internal: scope slot is not an attrset"));
+            return self.finish_err(Error::eval_error(
+                "internal: scope slot is not an attrset",
+            ));
         };
         match attrs.lookup(name) {
             Some(val) => {
-            m.push(val);
+                self.push(val);
                 Step::Continue(())
             }
-        None => m.finish_err(Error::eval_error(format!(
+            None => self.finish_err(Error::eval_error(format!(
                 "scoped binding '{}' not found",
                 ctx.resolve_string(name)
             ))),
         }
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_coerce_to_string<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_coerce_to_string(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &gc_arena::Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
         if val.is::<StringId>() || val.is::<NixString>() {
-        m.push(val.relax());
+            self.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
-        m.push(Value::new_inline(p.0));
         } else {
             todo!("coerce other types to string: {:?}", val.ty());
         }
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_concat_strings<'gc, M: Machine<'gc>>(
+    pub(crate) fn op_concat_strings(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
-    mc: &gc_arena::Mutation<'gc>,
+        _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 = m.peek_forced(count - 1 - i);
+            let val = self.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() {
-            has_any_context = true;
-        }
         }
 
         let mut result = String::with_capacity(total_len);
-    let mut merged = StringContext::new();
         for i in 0..count {
-        let val = m.peek_forced(count - 1 - i);
+            let val = self.peek_forced(count - 1 - i);
             let s = ctx.get_string(val).expect("coerced");
             result.push_str(s);
-        if has_any_context {
-            let ctx = ctx.get_string_context(val);
-            if !ctx.is_empty() {
-                merged = merged.merge(ctx);
-            }
-        }
         }
 
-    m.drop_n(count);
+        self.stack.truncate(self.stack.len() - count);
 
-    if merged.is_empty() {
         let sid = ctx.intern_string(result);
-        m.push(Value::new_inline(sid));
+        self.push(Value::new_inline(sid));
-    } else {
-        let ns = gc_arena::Gc::new(mc, NixString::with_context(result, merged));
-        m.push(Value::new_gc(ns));
-    }
         Step::Continue(())
-}
+    }
 
-#[inline(always)]
+    #[inline(always)]
-pub(crate) fn op_resolve_path<'gc, M: MachineExt<'gc>>(
+    pub(crate) fn op_resolve_path(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &gc_arena::Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let path_val = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let path_val = self.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>() {
-        m.push(Value::new_inline(p));
-        return Step::Continue(());
-    }
         let path = match ctx.get_string(path_val) {
             Some(s) => s.to_owned(),
             None => {
-            return m.finish_err(Error::eval_error(format!(
+                return self.finish_err(Error::eval_error(format!(
                     "expected a string for path, got {}",
                     path_val.ty()
                 )));
@@ -155,19 +133,27 @@ pub(crate) fn op_resolve_path<'gc, M: MachineExt<'gc>>(
         };
         let resolved = match resolve_path_str(ctx.resolve_string(dir_id), &path) {
             Ok(s) => s,
-        Err(e) => return m.finish_err(e),
+            Err(e) => return self.finish_err(e),
         };
         let sid = ctx.intern_string(resolved);
-    m.push(Value::new_inline(Path(sid)));
+        self.push(Value::new_inline(sid));
         Step::Continue(())
+    }
 }
 
+/// Resolve a Nix path literal against `current_dir`.
+///
+/// Mirrors nix-js's `op_resolve_path`: absolute paths returned as-is, `~/X`
+/// expanded against `$HOME`, otherwise joined onto `current_dir`. The result
+/// is normalized by removing `.` components and resolving `..` lexically
+/// (no symlink resolution).
 fn resolve_path_str(current_dir: &str, path: &str) -> Result<String, Box<Error>> {
     let raw = if path.starts_with('/') {
-        return Ok(canon_path_str(path));
+        return Ok(path.to_owned());
     } else if let Some(rest) = path.strip_prefix("~/") {
-        let mut dir =
+        #[allow(deprecated)]
-            std::env::home_dir().ok_or_else(|| Error::eval_error("home dir not defined"))?;
+        let mut dir = std::env::home_dir()
+            .ok_or_else(|| Error::eval_error("home dir not defined"))?;
         dir.push(rest);
         dir
     } else {
@@ -175,5 +161,17 @@ fn resolve_path_str(current_dir: &str, path: &str) -> Result<String, Box<Error>>
         dir.push(path);
         dir
     };
-    Ok(canon_path_str(&raw))
+    let mut normalized = PathBuf::new();
+    for component in raw.components() {
+        match component {
+            Component::Prefix(p) => normalized.push(p.as_os_str()),
+            Component::RootDir => normalized.push("/"),
+            Component::CurDir => {}
+            Component::ParentDir => {
+                normalized.pop();
+            }
+            Component::Normal(c) => normalized.push(c),
+        }
+    }
+    Ok(normalized.to_string_lossy().into_owned())
 }

fix-vm/src/instructions/mod.rs

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

fix-vm/src/instructions/with_scope.rs

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

fix-vm/src/lib.rs

@@ -7,22 +7,213 @@
 
 use std::path::PathBuf;
 
-use fix_bytecode::{InstructionPtr, PrimOpPhase};
+use fix_builtins::{BUILTINS, BuiltinId};
+use fix_codegen::InstructionPtr;
+use fix_common::StringId;
 use fix_error::{Error, Result, Source};
-use fix_lang::{BUILTINS, BuiltinId, StringId};
+use gc_arena::arena::CollectionPhase;
-use gc_arena::metrics::Pacing;
 use gc_arena::{Arena, Collect, Gc, Mutation, RefLock, Rootable};
-use hashbrown::HashMap;
+use hashbrown::{HashMap, HashSet};
+use num_enum::TryFromPrimitive;
 use smallvec::SmallVec;
 
+mod boxing;
+mod bytecode_reader;
 #[cfg(feature = "tailcall")]
 mod dispatch_tailcall;
-pub use fix_runtime::*;
+mod forced;
+mod value;
+pub use value::StaticValue;
+use value::*;
+mod helpers;
 mod instructions;
+use bytecode_reader::BytecodeReader;
+use forced::Forced;
+use helpers::*;
 mod primops;
 
 type VmResult<T> = std::result::Result<T, VmError>;
 
+#[allow(dead_code)]
+enum VmError {
+    Catchable(String),
+    Uncatchable(Box<Error>),
+}
+
+impl From<Box<Error>> for VmError {
+    fn from(e: Box<Error>) -> Self {
+        VmError::Uncatchable(e)
+    }
+}
+
+impl VmError {
+    fn into_error(self) -> Box<Error> {
+        match self {
+            VmError::Catchable(_) => todo!("Check for tryEval catch frames"),
+            VmError::Uncatchable(e) => e,
+        }
+    }
+}
+
+#[derive(Collect, Clone, Copy, Debug, PartialEq, Eq, Default)]
+#[collect(require_static)]
+pub enum ForceMode {
+    #[default]
+    AsIs,
+    Shallow,
+    Deep,
+}
+
+pub trait VmContext {
+    fn split(&mut self) -> (&mut impl VmCode, &mut impl VmRuntimeCtx);
+}
+
+pub trait VmRuntimeCtx {
+    fn intern_string(&mut self, s: impl AsRef<str>) -> StringId;
+    fn resolve_string(&self, id: StringId) -> &str;
+    fn get_const(&self, id: u32) -> StaticValue;
+    fn add_const(&mut self, val: StaticValue) -> u32;
+}
+
+pub trait VmCode {
+    fn bytecode(&self) -> &[u8];
+    fn compile_with_scope(
+        &mut self,
+        source: Source,
+        extra_scope: Option<ExtraScope>,
+        ctx: &mut impl VmRuntimeCtx,
+    ) -> fix_error::Result<InstructionPtr>;
+}
+
+/// Extra scope passed to a re-entrant compile from inside a running VM.
+///
+/// Currently only `ScopedImport` is produced (by the `scopedImport` builtin),
+/// but the variant is kept open so REPL bindings could later land here too.
+pub enum ExtraScope {
+    ScopedImport {
+        keys: HashSet<StringId>,
+        slot_id: u32,
+    },
+}
+
+trait VmRuntimeCtxExt: VmRuntimeCtx {
+    fn get_string<'a, 'gc: 'a>(&'a self, val: StrictValue<'gc>) -> Option<&'a str>;
+    fn get_string_id<'a, 'gc: 'a>(
+        &'a mut self,
+        val: StrictValue<'gc>,
+    ) -> std::result::Result<StringId, NixType>;
+    fn convert_value(&self, val: Value) -> fix_common::Value;
+}
+
+impl<T: VmRuntimeCtx> VmRuntimeCtxExt for T {
+    fn get_string<'a, 'gc: 'a>(&'a self, val: StrictValue<'gc>) -> Option<&'a str> {
+        if let Some(sid) = val.as_inline::<StringId>() {
+            Some(self.resolve_string(sid))
+        } else {
+            val.as_gc::<NixString>().map(|ns| ns.as_ref().as_str())
+        }
+    }
+
+    fn get_string_id<'a, 'gc: 'a>(
+        &'a mut self,
+        val: StrictValue<'gc>,
+    ) -> std::result::Result<StringId, NixType> {
+        if let Some(sid) = val.as_inline::<StringId>() {
+            Ok(sid)
+        } else if let Some(s) = val.as_gc::<NixString>().map(|ns| ns.as_ref().as_str()) {
+            Ok(self.intern_string(s))
+        } else {
+            Err(val.ty())
+        }
+    }
+
+    fn convert_value(&self, val: Value) -> fix_common::Value {
+        self.convert_value_with_seen(val, &mut HashSet::new())
+    }
+}
+
+trait ConvertValueWithSeen: VmRuntimeCtx {
+    fn convert_value_with_seen(&self, val: Value, seen: &mut HashSet<u64>) -> fix_common::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;
+        if let Some(i) = val.as_inline::<i32>() {
+            Value::Int(i as i64)
+        } else if let Some(gc_i) = val.as_gc::<i64>() {
+            Value::Int(*gc_i)
+        } else if let Some(f) = val.as_float() {
+            Value::Float(f)
+        } else if let Some(b) = val.as_inline::<bool>() {
+            Value::Bool(b)
+        } else if val.is::<Null>() {
+            Value::Null
+        } else if let Some(sid) = val.as_inline::<StringId>() {
+            let s = self.resolve_string(sid).to_owned();
+            Value::String(s)
+        } else if let Some(ns) = val.as_gc::<NixString>() {
+            Value::String(ns.as_str().to_owned())
+        } else if let Some(attrs) = val.as_gc::<AttrSet>() {
+            let bits = val.to_bits();
+            if attrs.entries.is_empty() {
+                return Value::AttrSet(Default::default());
+            }
+            if !seen.insert(bits) {
+                return Value::Repeated;
+            }
+            let mut map = std::collections::BTreeMap::new();
+            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);
+            }
+            Value::AttrSet(fix_common::AttrSet::new(map))
+        } else if let Some(list) = val.as_gc::<List>() {
+            let bits = val.to_bits();
+            if list.inner.borrow().is_empty() {
+                return Value::List(Default::default());
+            }
+            if !seen.insert(bits) {
+                return Value::Repeated;
+            }
+            let items: Vec<_> = list
+                .inner
+                .borrow()
+                .iter()
+                .copied()
+                .map(|v| self.convert_value_with_seen(v, seen))
+                .collect();
+            Value::List(fix_common::List::new(items))
+        } else if val.is::<Closure>() {
+            Value::Func
+        } else if let Some(thunk) = val.as_gc::<Thunk>() {
+            if let ThunkState::Evaluated(v) = *thunk.borrow() {
+                self.convert_value_with_seen(v.relax(), seen)
+            } else {
+                Value::Thunk
+            }
+        } else if let Some(primop) = val.as_inline::<PrimOp>() {
+            let name = fix_builtins::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;
+            Value::PrimOpApp(name.strip_prefix("__").unwrap_or(name))
+        } else {
+            Value::Null
+        }
+    }
+}
+
+#[repr(u8)]
+enum Break {
+    Force,
+    Done,
+    LoadFile,
+}
+
+type Step = std::ops::ControlFlow<Break>;
+
 #[derive(Collect)]
 #[collect(no_drop)]
 pub struct Vm<'gc> {
@@ -45,7 +236,7 @@ pub struct Vm<'gc> {
     force_mode: ForceMode,
 
     #[collect(require_static)]
-    result: Option<Result<fix_lang::Value>>,
+    result: Option<Result<fix_common::Value>>,
 
     #[collect(require_static)]
     pending_load: Option<PendingLoad>,
@@ -53,14 +244,74 @@ pub struct Vm<'gc> {
     functor_sym: StringId,
 }
 
+#[derive(Debug)]
+pub(crate) struct PendingLoad {
+    pub path: PathBuf,
+    pub scope: Option<PendingScope>,
+}
+
+#[derive(Debug)]
+pub(crate) struct PendingScope {
+    pub keys: HashSet<StringId>,
+    pub slot_id: u32,
+}
+
+enum OperandData {
+    Const(StaticValue),
+    BigInt(i64),
+    Local { layer: u8, idx: u32 },
+    BuiltinConst(StringId),
+    Builtins,
+    ReplBinding(StringId),
+    ScopedImportBinding { slot_id: u32, name: StringId },
+}
+
+impl OperandData {
+    fn resolve<'gc>(&self, mc: &Mutation<'gc>, root: &Vm<'gc>) -> Value<'gc> {
+        use OperandData::*;
+        match *self {
+            Const(sv) => sv.into(),
+            BigInt(val) => Value::new_gc(Gc::new(mc, val)),
+            Local { layer, idx } => {
+                let mut cur = root.env;
+                for _ in 0..layer {
+                    let prev = cur.borrow().prev.expect("env chain too short");
+                    cur = prev;
+                }
+                cur.borrow().locals[idx as usize]
+            }
+            #[allow(clippy::unwrap_used)]
+            BuiltinConst(id) => root
+                .builtins
+                .as_gc::<AttrSet>()
+                .unwrap()
+                .lookup(id)
+                .unwrap(),
+            Builtins => root.builtins,
+            ReplBinding(_id) => todo!(),
+            ScopedImportBinding { slot_id, name } => {
+                #[allow(clippy::unwrap_used)]
+                let scope = root
+                    .scope_slots
+                    .get(slot_id as usize)
+                    .expect("invalid scope slot");
+                #[allow(clippy::unwrap_used)]
+                let attrs = scope.as_gc::<AttrSet>().expect("scope must be attrset");
+                #[allow(clippy::unwrap_used)]
+                attrs.lookup(name).expect("scoped binding not found")
+            }
+        }
+    }
+}
+
 fn init_builtins<'gc>(mc: &Mutation<'gc>, ctx: &mut impl VmRuntimeCtx) -> Value<'gc> {
     let mut entries = SmallVec::with_capacity(BUILTINS.len());
 
     for (idx, &(name, arity)) in BUILTINS.iter().enumerate() {
-        let id = BuiltinId::try_from(idx as u8).expect("infallible");
+        let id = BuiltinId::try_from_primitive(idx as u8).expect("infallible");
         let name = name.strip_prefix("__").unwrap_or(name);
         let name = ctx.intern_string(name);
-        let dispatch_ip = PrimOpPhase::entry_for_builtin(id).ip();
+        let dispatch_ip = id.entry_phase().ip();
         entries.push((
             name,
             Value::new_inline(PrimOp {
@@ -136,21 +387,46 @@ impl<'gc> Vm<'gc> {
             functor_sym: ctx.intern_string("__functor"),
         }
     }
-}
 
-impl<'gc> Machine<'gc> for Vm<'gc> {
+    #[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())
+    }
+
     #[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)]
-    fn peek(&self, depth: usize) -> Value<'gc> {
+    #[must_use]
+    fn peek(&mut self, depth: usize) -> Value<'gc> {
         *self
             .stack
             .get(self.stack.len() - depth - 1)
@@ -158,7 +434,8 @@ impl<'gc> Machine<'gc> for Vm<'gc> {
     }
 
     #[inline(always)]
-    fn peek_forced(&self, depth: usize) -> StrictValue<'gc> {
+    #[must_use]
+    fn peek_forced(&mut self, depth: usize) -> StrictValue<'gc> {
         self.stack
             .get(self.stack.len() - depth - 1)
             .expect("stack underflow")
@@ -166,15 +443,6 @@ impl<'gc> Machine<'gc> for 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();
@@ -185,13 +453,72 @@ impl<'gc> Machine<'gc> for Vm<'gc> {
     }
 
     #[inline(always)]
-    fn drop_n(&mut self, depth: usize) {
+    #[cfg_attr(debug_assertions, track_caller)]
-        self.stack.truncate(self.stack.len() - depth);
+    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))
     }
 
     #[inline(always)]
-    fn stack_len(&self) -> usize {
+    #[allow(unused)]
-        self.stack.len()
+    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())
     }
 
     #[inline(always)]
@@ -236,147 +563,31 @@ impl<'gc> Machine<'gc> for Vm<'gc> {
             }
         }
     }
+}
 
-    #[inline(always)]
+#[allow(dead_code)]
-    fn call(
+struct ErrorFrame {
-        &mut self,
+    span_id: u32,
-        reader: &mut BytecodeReader<'_>,
+    message: Option<String>,
-        mc: &Mutation<'gc>,
+}
-        arg: Value<'gc>,
-        resume_pc: usize,
-    ) -> Step {
-        instructions::call(self, reader, mc, arg, resume_pc)
-    }
 
-    #[inline(always)]
+#[derive(Collect, Debug)]
-    fn push_call_frame(&mut self, frame: CallFrame<'gc>) {
+#[collect(no_drop)]
-        self.call_stack.push(frame);
+struct CallFrame<'gc> {
-    }
+    pc: usize,
-
+    thunk: Option<Gc<'gc, Thunk<'gc>>>,
-    #[inline(always)]
+    env: Gc<'gc, RefLock<Env<'gc>>>,
-    fn pop_call_frame(&mut self) -> Option<CallFrame<'gc>> {
-        self.call_stack.pop()
-    }
-
-    #[inline(always)]
-    fn call_depth(&self) -> usize {
-        self.call_depth
-    }
-
-    #[inline(always)]
-    fn inc_call_depth(&mut self) {
-        self.call_depth += 1;
-    }
-
-    #[inline(always)]
-    fn dec_call_depth(&mut self) {
-        self.call_depth -= 1;
-    }
-
-    #[inline(always)]
-    fn env(&self) -> GcEnv<'gc> {
-        self.env
-    }
-
-    #[inline(always)]
-    fn set_env(&mut self, env: GcEnv<'gc>) {
-        self.env = env;
-    }
-
-    #[inline(always)]
-    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.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 builtins(&self) -> Value<'gc> {
-        self.builtins
-    }
-
-    #[inline(always)]
-    fn functor_sym(&self) -> StringId {
-        self.functor_sym
-    }
-
-    #[inline(always)]
-    fn empty_list(&self) -> Value<'gc> {
-        self.empty_list
-    }
-
-    #[inline(always)]
-    fn empty_attrs(&self) -> Value<'gc> {
-        self.empty_attrs
-    }
-
-    #[inline(always)]
-    fn force_mode(&self) -> ForceMode {
-        self.force_mode
-    }
-
-    #[inline(always)]
-    fn import_cache_get(&self, path: &std::path::Path) -> Option<Value<'gc>> {
-        self.import_cache.get(path).copied()
-    }
-
-    #[inline(always)]
-    fn import_cache_insert(&mut self, path: PathBuf, val: Value<'gc>) {
-        self.import_cache.insert(path, val);
-    }
-
-    #[inline(always)]
-    fn scope_slot(&self, idx: u32) -> Value<'gc> {
-        *self
-            .scope_slots
-            .get(idx as usize)
-            .expect("invalid scope slot")
-    }
-
-    #[inline(always)]
-    fn scope_slots_push(&mut self, val: Value<'gc>) -> u32 {
-        let idx = self.scope_slots.len() as u32;
-        self.scope_slots.push(val);
-        idx
-    }
-
-    #[inline(always)]
-    fn set_pending_load(&mut self, load: PendingLoad) {
-        self.pending_load = Some(load);
-    }
 }
 
 enum Action {
     Continue { pc: usize },
-    Done(Result<fix_lang::Value>),
+    Done(Result<fix_common::Value>),
     LoadFile(PendingLoad),
 }
 
-/// Compute initial heap size mirroring CppNix's strategy: 25% of physical RAM,
+enum NixNum {
-/// clamped to [32 MiB, 384 MiB]. Used as `Pacing::min_sleep` so the collector
+    Int(i64),
-/// defers the first cycle until the heap reaches this size.
+    Float(f64),
-fn initial_heap_size() -> usize {
-    const MIN_SIZE: usize = 32 * 1024 * 1024;
-    const MAX_SIZE: usize = 384 * 1024 * 1024;
-
-    let mut sys = sysinfo::System::new();
-    sys.refresh_memory();
-    let total = sys.total_memory() as usize;
-    let quarter = total / 4;
-    quarter.clamp(MIN_SIZE, MAX_SIZE)
 }
 
 impl Vm<'_> {
@@ -384,13 +595,11 @@ impl Vm<'_> {
         ctx: &mut C,
         ip: InstructionPtr,
         force_mode: ForceMode,
-    ) -> Result<fix_lang::Value> {
+    ) -> Result<fix_common::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 {
+
-            min_sleep: initial_heap_size(),
+        const COLLECTOR_GRANULARITY: f64 = 1024.0;
-            ..Pacing::STOP_THE_WORLD
-        });
 
         let mut pc = ip.0;
         loop {
@@ -398,8 +607,12 @@ impl Vm<'_> {
             match arena.mutate_root(|mc, root| root.dispatch_batch(bytecode, runtime, pc, mc)) {
                 Action::Continue { pc: new_pc } => {
                     pc = new_pc;
-                    if arena.metrics().allocation_debt() > 0.0 {
+                    if arena.metrics().allocation_debt() > COLLECTOR_GRANULARITY {
-                        arena.finish_cycle();
+                        if arena.collection_phase() == CollectionPhase::Sweeping {
+                            arena.collect_debt();
+                        } else if let Some(marked) = arena.mark_debt() {
+                            marked.start_sweeping();
+                        }
                     }
                 }
                 Action::LoadFile(load) => {
@@ -416,9 +629,6 @@ impl Vm<'_> {
                         Err(err) => break Err(err),
                     };
                     pc = new_ip.0;
-                    arena.mutate_root(|mc, root| {
-                        root.env = Gc::new(mc, RefLock::new(Env::empty()));
-                    });
                 }
                 Action::Done(done) => break done,
             }
@@ -469,8 +679,7 @@ impl<'gc> Vm<'gc> {
         pc: usize,
         mc: &Mutation<'gc>,
     ) -> Action {
-        use fix_bytecode::Op::*;
+        use fix_codegen::Op::*;
-        use instructions::*;
 
         let mut reader = BytecodeReader::new(bytecode, pc);
         let mut fuel = Self::DEFAULT_FUEL_AMOUNT;
@@ -484,75 +693,75 @@ impl<'gc> Vm<'gc> {
             let op = reader.read_op();
 
             let result = match op {
-                PushSmi => op_push_smi(self, &mut reader),
+                PushSmi => self.op_push_smi(&mut reader),
-                PushBigInt => op_push_bigint(self, &mut reader, mc),
+                PushBigInt => self.op_push_bigint(&mut reader, mc),
-                PushFloat => op_push_float(self, &mut reader),
+                PushFloat => self.op_push_float(&mut reader),
-                PushString => op_push_string(self, &mut reader),
+                PushString => self.op_push_string(&mut reader),
-                PushNull => op_push_null(self),
+                PushNull => self.op_push_null(),
-                PushTrue => op_push_true(self),
+                PushTrue => self.op_push_true(),
-                PushFalse => op_push_false(self),
+                PushFalse => self.op_push_false(),
 
-                LoadLocal => op_load_local(self, &mut reader),
+                LoadLocal => self.op_load_local(&mut reader),
-                LoadOuter => op_load_outer(self, &mut reader),
+                LoadOuter => self.op_load_outer(&mut reader),
-                StoreLocal => op_store_local(self, &mut reader, mc),
+                StoreLocal => self.op_store_local(&mut reader, mc),
-                AllocLocals => op_alloc_locals(self, &mut reader, mc),
+                AllocLocals => self.op_alloc_locals(&mut reader, mc),
 
-                MakeThunk => op_make_thunk(self, &mut reader, mc),
+                MakeThunk => self.op_make_thunk(&mut reader, mc),
-                MakeClosure => op_make_closure(self, &mut reader, mc),
+                MakeClosure => self.op_make_closure(&mut reader, mc),
-                MakePatternClosure => op_make_pattern_closure(self, &mut reader, mc),
+                MakePatternClosure => self.op_make_pattern_closure(&mut reader, mc),
 
-                Call => op_call(self, ctx, &mut reader, mc),
+                Call => self.op_call(ctx, &mut reader, mc),
-                DispatchPrimOp => op_dispatch_primop(self, ctx, &mut reader, mc),
+                DispatchPrimOp => self.op_dispatch_primop(ctx, &mut reader, mc),
-                Return => op_return(self, ctx, &mut reader, mc),
+                Return => self.op_return(ctx, &mut reader, mc),
 
-                MakeAttrs => op_make_attrs(self, ctx, &mut reader, mc),
+                MakeAttrs => self.op_make_attrs(ctx, &mut reader, mc),
-                MakeEmptyAttrs => op_make_empty_attrs(self),
+                MakeEmptyAttrs => self.op_make_empty_attrs(),
-                SelectStatic => op_select_static(self, ctx, &mut reader, mc),
+                SelectStatic => self.op_select_static(ctx, &mut reader, mc),
-                SelectDynamic => op_select_dynamic(self, ctx, &mut reader, mc),
+                SelectDynamic => self.op_select_dynamic(ctx, &mut reader, mc),
-                HasAttrPathStatic => op_has_attr_path_static(self, ctx, &mut reader, mc),
+                HasAttrPathStatic => self.op_has_attr_path_static(ctx, &mut reader, mc),
-                HasAttrPathDynamic => op_has_attr_path_dynamic(self, ctx, &mut reader, mc),
+                HasAttrPathDynamic => self.op_has_attr_path_dynamic(ctx, &mut reader, mc),
-                HasAttrStatic => op_has_attr_static(self, &mut reader, mc),
+                HasAttrStatic => self.op_has_attr_static(&mut reader, mc),
-                HasAttrDynamic => op_has_attr_dynamic(self, ctx, &mut reader, mc),
+                HasAttrDynamic => self.op_has_attr_dynamic(ctx, &mut reader, mc),
-                HasAttrResolve => op_has_attr_resolve(self),
+                HasAttrResolve => self.op_has_attr_resolve(),
-                JumpIfSelectFailed => op_jump_if_select_failed(self, &mut reader),
+                JumpIfSelectFailed => self.op_jump_if_select_failed(&mut reader),
-                JumpIfSelectSucceeded => op_jump_if_select_succeeded(self, &mut reader),
+                JumpIfSelectSucceeded => self.op_jump_if_select_succeeded(&mut reader),
 
-                MakeList => op_make_list(self, ctx, &mut reader, mc),
+                MakeList => self.op_make_list(ctx, &mut reader, mc),
-                MakeEmptyList => op_make_empty_list(self),
+                MakeEmptyList => self.op_make_empty_list(),
 
-                OpAdd => op_add(self, ctx, &mut reader, mc),
+                OpAdd => self.op_add(ctx, &mut reader, mc),
-                OpSub => op_sub(self, &mut reader, mc),
+                OpSub => self.op_sub(&mut reader, mc),
-                OpMul => op_mul(self, &mut reader, mc),
+                OpMul => self.op_mul(&mut reader, mc),
-                OpDiv => op_div(self, &mut reader, mc),
+                OpDiv => self.op_div(&mut reader, mc),
-                OpEq => op_eq(self, ctx, &mut reader, mc),
+                OpEq => self.op_eq(ctx, &mut reader, mc),
-                OpNeq => op_neq(self, ctx, &mut reader, mc),
+                OpNeq => self.op_neq(ctx, &mut reader, mc),
-                OpLt => op_lt(self, ctx, &mut reader, mc),
+                OpLt => self.op_lt(ctx, &mut reader, mc),
-                OpGt => op_gt(self, ctx, &mut reader, mc),
+                OpGt => self.op_gt(ctx, &mut reader, mc),
-                OpLeq => op_leq(self, ctx, &mut reader, mc),
+                OpLeq => self.op_leq(ctx, &mut reader, mc),
-                OpGeq => op_geq(self, ctx, &mut reader, mc),
+                OpGeq => self.op_geq(ctx, &mut reader, mc),
-                OpConcat => op_concat(self, &mut reader, mc),
+                OpConcat => self.op_concat(&mut reader, mc),
-                OpUpdate => op_update(self, &mut reader, mc),
+                OpUpdate => self.op_update(&mut reader, mc),
 
-                OpNeg => op_neg(self, &mut reader, mc),
+                OpNeg => self.op_neg(&mut reader, mc),
-                OpNot => op_not(self, &mut reader, mc),
+                OpNot => self.op_not(&mut reader, mc),
 
-                JumpIfFalse => op_jump_if_false(self, &mut reader, mc),
+                JumpIfFalse => self.op_jump_if_false(&mut reader, mc),
-                JumpIfTrue => op_jump_if_true(self, &mut reader, mc),
+                JumpIfTrue => self.op_jump_if_true(&mut reader, mc),
-                Jump => op_jump(self, &mut reader),
+                Jump => self.op_jump(&mut reader),
 
-                ConcatStrings => op_concat_strings(self, ctx, &mut reader, mc),
+                ConcatStrings => self.op_concat_strings(ctx, &mut reader, mc),
-                CoerceToString => op_coerce_to_string(self, &mut reader, mc),
+                CoerceToString => self.op_coerce_to_string(&mut reader, mc),
-                ResolvePath => op_resolve_path(self, ctx, &mut reader, mc),
+                ResolvePath => self.op_resolve_path(ctx, &mut reader, mc),
 
-                Assert => op_assert(self, ctx, &mut reader, mc),
+                Assert => self.op_assert(ctx, &mut reader, mc),
 
-                LookupWith => op_lookup_with(self, ctx, &mut reader, mc),
+                LookupWith => self.op_lookup_with(ctx, &mut reader, mc),
 
-                LoadBuiltins => op_load_builtins(self),
+                LoadBuiltins => self.op_load_builtins(),
-                LoadBuiltin => op_load_builtin(self, &mut reader),
+                LoadBuiltin => self.op_load_builtin(&mut reader),
 
-                LoadReplBinding => op_load_repl_binding(self, &mut reader),
+                LoadReplBinding => self.op_load_repl_binding(&mut reader),
-                LoadScopedBinding => op_load_scoped_binding(self, ctx, &mut reader, mc),
+                LoadScopedBinding => self.op_load_scoped_binding(ctx, &mut reader, mc),
 
                 Illegal => unreachable!(),
             };

fix-vm/src/primops/attrs.rs

@@ -0,0 +1 @@
+

fix-vm/src/primops/context.rs

@@ -1,447 +0,0 @@
-//! `builtins.hasContext`, `builtins.getContext`, `builtins.appendContext`,
-//! `builtins.unsafeDiscardStringContext`,
-//! `builtins.unsafeDiscardOutputDependency`.
-//!
-//! See `fix-runtime/src/string_context.rs` for the
-//! `StringContextElem` type.
-
-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 gc_arena::{Gc, Mutation};
-use smallvec::SmallVec;
-
-pub fn has_context<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    if !val.is::<StringId>() && val.as_gc::<NixString>().is_none() {
-        return m.finish_type_err(NixType::String, val.ty());
-    }
-    let has_ctx = !ctx.get_string_context(val).is_empty();
-    m.return_from_primop(Value::new_inline(has_ctx), reader)
-}
-
-pub fn unsafe_discard_string_context<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    if let Some(sid) = val.as_inline::<StringId>() {
-        return m.return_from_primop(Value::new_inline(sid), reader);
-    }
-    let Some(ns) = val.as_gc::<NixString>() else {
-        return m.finish_type_err(NixType::String, val.ty());
-    };
-    let sid = ctx.intern_string(ns.as_str());
-    m.return_from_primop(Value::new_inline(sid), reader)
-}
-
-pub fn unsafe_discard_output_dependency<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    if let Some(sid) = val.as_inline::<StringId>() {
-        return m.return_from_primop(Value::new_inline(sid), reader);
-    }
-    let Some(ns) = val.as_gc::<NixString>() else {
-        return m.finish_type_err(NixType::String, val.ty());
-    };
-    if ns.context().is_empty() {
-        let sid = ctx.intern_string(ns.as_str());
-        return m.return_from_primop(Value::new_inline(sid), reader);
-    }
-
-    let mut new_ctx = StringContext::new();
-    for elem in ns.context() {
-        let replacement = match elem {
-            StringContextElem::DrvDeep { drv_path } => StringContextElem::Opaque {
-                path: drv_path.clone(),
-            },
-            other => other.clone(),
-        };
-        new_ctx.insert(replacement);
-    }
-
-    let s: Box<str> = ns.as_str().into();
-    let new_ns = Gc::new(mc, NixString::with_context(s, new_ctx));
-    m.return_from_primop(Value::new_gc(new_ns), reader)
-}
-
-pub fn get_context<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    if !val.is::<StringId>() && val.as_gc::<NixString>().is_none() {
-        return m.finish_type_err(NixType::String, val.ty());
-    }
-    let elems = ctx.get_string_context(val);
-
-    struct Info {
-        path: bool,
-        all_outputs: bool,
-        outputs: SmallVec<[Box<str>; 2]>,
-    }
-    impl Info {
-        fn new() -> Self {
-            Self {
-                path: false,
-                all_outputs: false,
-                outputs: SmallVec::new(),
-            }
-        }
-    }
-    let mut by_path: std::collections::BTreeMap<Box<str>, Info> = std::collections::BTreeMap::new();
-    for elem in elems {
-        match elem {
-            StringContextElem::Opaque { path } => {
-                by_path.entry(path.clone()).or_insert_with(Info::new).path = true;
-            }
-            StringContextElem::DrvDeep { drv_path } => {
-                by_path
-                    .entry(drv_path.clone())
-                    .or_insert_with(Info::new)
-                    .all_outputs = true;
-            }
-            StringContextElem::Built { drv_path, output } => {
-                by_path
-                    .entry(drv_path.clone())
-                    .or_insert_with(Info::new)
-                    .outputs
-                    .push(output.clone());
-            }
-        }
-    }
-
-    let mut outer_entries: SmallVec<[(StringId, Value<'gc>); 4]> = SmallVec::new();
-    for (path, mut info) in by_path {
-        info.outputs.sort();
-        info.outputs.dedup();
-
-        let mut sub: SmallVec<[(StringId, Value<'gc>); 4]> = SmallVec::new();
-        if info.all_outputs {
-            sub.push((ctx.intern_string("allOutputs"), Value::new_inline(true)));
-        }
-        if !info.outputs.is_empty() {
-            let items: smallvec::SmallVec<[Value<'gc>; 4]> = info
-                .outputs
-                .iter()
-                .map(|o| Value::new_inline(ctx.intern_string(o)))
-                .collect();
-            let list = VmList::new(mc, items);
-            sub.push((ctx.intern_string("outputs"), Value::new_gc(list)));
-        }
-        if info.path {
-            sub.push((ctx.intern_string("path"), Value::new_inline(true)));
-        }
-        sub.sort_by_key(|(k, _)| *k);
-        let sub_attrs = Gc::new(mc, AttrSet::from_sorted_unchecked(sub));
-
-        outer_entries.push((ctx.intern_string(&path), Value::new_gc(sub_attrs)));
-    }
-    outer_entries.sort_by_key(|(k, _)| *k);
-
-    let outer = Gc::new(mc, AttrSet::from_sorted_unchecked(outer_entries));
-    m.return_from_primop(Value::new_gc(outer), reader)
-}
-
-/// appendContext :: String -> AttrSet -> String
-/// The context AttrSet maps store-path strings to `{ path?: Bool, allOutputs?:
-/// Bool, outputs?: [String] }`. Each present field contributes one
-/// StringContextElem to the result.
-///
-/// Requires forcing nested attrset values and list elements lazily, so it's
-/// structured as a state machine with the following stack layout:
-///
-///   [strVal, attrs, idx, acc]                       - outer loop
-///   [strVal, attrs, idx, acc, entryAttrs]           - after entry forced
-///   [strVal, attrs, idx, acc, list]                 - after `outputs` forced
-///   [strVal, attrs, idx, acc, list, oidx]           - output-element loop
-///   [strVal, attrs, idx, acc, list, oidx, outElem]  - after element forced
-///
-/// `acc` is a sentinel `NixString` whose `data` is empty and whose `context`
-/// is the accumulator. The string value itself is preserved in `strVal` and
-/// retrieved at finalization.
-///
-// TODO: handle thunk-valued `path` and `allOutputs` sub-attrs; currently they
-// must be already-evaluated booleans.
-pub fn append_context<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let (str_val, attrs) = m.force_and_retry::<(StrictValue, Gc<AttrSet>)>(reader, mc)?;
-
-    let initial_ctx: StringContext = ctx.get_string_context(str_val).clone();
-    let acc = Gc::new(mc, NixString::with_context("", initial_ctx));
-
-    m.push(str_val.relax());
-    m.push(Value::new_gc(attrs));
-    m.push(Value::new_inline(0i32));
-    m.push(Value::new_gc(acc));
-
-    reader.set_pc(PrimOpPhase::AppendContextLoop.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn append_context_loop<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    #[allow(clippy::unwrap_used)]
-    let idx = m.peek(1).as_inline::<i32>().unwrap();
-    #[allow(clippy::unwrap_used)]
-    let attrs = m.peek_forced(2).as_gc::<AttrSet>().unwrap();
-
-    if idx as usize >= attrs.entries.len() {
-        return append_context_finalize(m, ctx, reader, mc);
-    }
-
-    let entry_val = attrs.entries[idx as usize].1;
-    m.push(entry_val);
-    m.force_slot_to_pc(
-        0,
-        reader,
-        mc,
-        PrimOpPhase::AppendContextEntryForced.ip() as usize,
-    )?;
-    reader.set_pc(PrimOpPhase::AppendContextEntryForced.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn append_context_entry_forced<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    // Stack: [strVal, attrs, idx, acc, entryAttrs(thunk)]
-    // The slot still holds the Thunk pointer; re-force to extract the now-
-    // Evaluated value into the slot.
-    m.force_slot(0, reader, mc)?;
-    let entry_val = m.peek_forced(0);
-    let Some(entry_attrs) = entry_val.as_gc::<AttrSet>() else {
-        return m.finish_type_err(NixType::AttrSet, entry_val.ty());
-    };
-
-    #[allow(clippy::unwrap_used)]
-    let idx = m.peek(2).as_inline::<i32>().unwrap();
-    #[allow(clippy::unwrap_used)]
-    let outer = m.peek_forced(3).as_gc::<AttrSet>().unwrap();
-    let path_key = outer.entries[idx as usize].0;
-    let path_str_owned: Box<str> = ctx.resolve_string(path_key).into();
-    if !path_str_owned.starts_with("/nix/store/") {
-        return m.finish_err(Error::eval_error(format!(
-            "context key '{path_str_owned}' is not a store path"
-        )));
-    }
-
-    // Eagerly handle `path` and `allOutputs` (assumed already-forced
-    // booleans - most callers either set them to literal `true` or omit
-    // them entirely).
-    // TODO: force these two attributes correctly
-    let path_id = ctx.intern_string("path");
-    let all_outputs_id = ctx.intern_string("allOutputs");
-    let outputs_id = ctx.intern_string("outputs");
-
-    #[allow(clippy::unwrap_used)]
-    let acc_gc = m.peek(1).as_gc::<NixString>().unwrap();
-    let mut new_acc: StringContext = acc_gc.context().iter().cloned().collect();
-
-    if let Some(v) = entry_attrs.lookup(path_id)
-        && v.as_inline::<bool>() == Some(true)
-    {
-        new_acc.insert(StringContextElem::Opaque {
-            path: path_str_owned.clone(),
-        });
-    }
-
-    if let Some(v) = entry_attrs.lookup(all_outputs_id)
-        && v.as_inline::<bool>() == Some(true)
-    {
-        if !path_str_owned.ends_with(".drv") {
-            return m.finish_err(Error::eval_error(format!(
-                "tried to add all-outputs context of {path_str_owned}, which is not a derivation, to a string"
-            )));
-        }
-        new_acc.insert(StringContextElem::DrvDeep {
-            drv_path: path_str_owned.clone(),
-        });
-    }
-
-    let new_acc_gc = Gc::new(mc, NixString::with_context("", new_acc));
-    m.replace(1, Value::new_gc(new_acc_gc));
-
-    if let Some(outputs_val) = entry_attrs.lookup(outputs_id) {
-        m.replace(0, outputs_val);
-        m.force_slot_to_pc(
-            0,
-            reader,
-            mc,
-            PrimOpPhase::AppendContextOutputsForced.ip() as usize,
-        )?;
-        reader.set_pc(PrimOpPhase::AppendContextOutputsForced.ip() as usize);
-        return Step::Continue(());
-    }
-
-    let _ = m.pop();
-    #[allow(clippy::unwrap_used)]
-    let idx_back = m.peek(1).as_inline::<i32>().unwrap();
-    m.replace(1, Value::new_inline(idx_back + 1));
-    reader.set_pc(PrimOpPhase::AppendContextLoop.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn append_context_outputs_forced<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    _ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    m.force_slot(0, reader, mc)?;
-    let list_val = m.peek_forced(0);
-    let Some(list) = list_val.as_gc::<VmList>() else {
-        return m.finish_type_err(NixType::List, list_val.ty());
-    };
-    if list.inner.borrow().is_empty() {
-        // Stack: [strVal, attrs, idx, acc, list] -> drop list, bump idx.
-        let _ = m.pop();
-        #[allow(clippy::unwrap_used)]
-        let idx_back = m.peek(1).as_inline::<i32>().unwrap();
-        m.replace(1, Value::new_inline(idx_back + 1));
-        reader.set_pc(PrimOpPhase::AppendContextLoop.ip() as usize);
-        return Step::Continue(());
-    }
-
-    m.push(Value::new_inline(0i32));
-    reader.set_pc(PrimOpPhase::AppendContextOutputElementLoop.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn append_context_output_element_loop<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    _ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    #[allow(clippy::unwrap_used)]
-    let oidx = m.peek(0).as_inline::<i32>().unwrap();
-    #[allow(clippy::unwrap_used)]
-    let list = m.peek_forced(1).as_gc::<VmList>().unwrap();
-    let len = list.inner.borrow().len();
-    if oidx as usize >= len {
-        // Stack: [strVal, attrs, idx, acc, list, oidx] -> drop oidx & list,
-        // bump idx in place.
-        let _ = m.pop();
-        let _ = m.pop();
-        #[allow(clippy::unwrap_used)]
-        let idx_back = m.peek(1).as_inline::<i32>().unwrap();
-        m.replace(1, Value::new_inline(idx_back + 1));
-        reader.set_pc(PrimOpPhase::AppendContextLoop.ip() as usize);
-        return Step::Continue(());
-    }
-
-    let elem = list.inner.borrow()[oidx as usize];
-    m.push(elem);
-    m.force_slot_to_pc(
-        0,
-        reader,
-        mc,
-        PrimOpPhase::AppendContextOutputElementForced.ip() as usize,
-    )?;
-    reader.set_pc(PrimOpPhase::AppendContextOutputElementForced.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn append_context_output_element_forced<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    m.force_slot(0, reader, mc)?;
-    let elem = m.peek_forced(0);
-    let Some(output_name) = ctx.get_string(elem) else {
-        return m.finish_type_err(NixType::String, elem.ty());
-    };
-    let output_name: Box<str> = output_name.into();
-
-    #[allow(clippy::unwrap_used)]
-    let idx = m.peek(4).as_inline::<i32>().unwrap();
-    #[allow(clippy::unwrap_used)]
-    let outer = m.peek_forced(5).as_gc::<AttrSet>().unwrap();
-    let path_key = outer.entries[idx as usize].0;
-    let path_str: Box<str> = ctx.resolve_string(path_key).into();
-    if !path_str.ends_with(".drv") {
-        return m.finish_err(Error::eval_error(format!(
-            "tried to add derivation output context of {path_str}, which is not a derivation, to a string"
-        )));
-    }
-
-    #[allow(clippy::unwrap_used)]
-    let acc_gc = m.peek(3).as_gc::<NixString>().unwrap();
-    let mut new_acc: StringContext = acc_gc.context().iter().cloned().collect();
-    new_acc.insert(StringContextElem::Built {
-        drv_path: path_str,
-        output: output_name,
-    });
-    let new_acc_gc = Gc::new(mc, NixString::with_context("", new_acc));
-    m.replace(3, Value::new_gc(new_acc_gc));
-
-    // Stack: [strVal, attrs, idx, acc, list, oidx, outElem] -> drop outElem,
-    // bump oidx in place.
-    let _ = m.pop();
-    #[allow(clippy::unwrap_used)]
-    let oidx = m.peek(0).as_inline::<i32>().unwrap();
-    m.replace(0, Value::new_inline(oidx + 1));
-    reader.set_pc(PrimOpPhase::AppendContextOutputElementLoop.ip() as usize);
-    Step::Continue(())
-}
-
-fn append_context_finalize<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    // Stack: [strVal, attrs, idx, acc]
-    #[allow(clippy::unwrap_used)]
-    let acc_gc = m.pop().as_gc::<NixString>().unwrap();
-    let _ = m.pop(); // idx
-    let _ = m.pop(); // attrs
-    let str_val_raw = m.pop();
-
-    // The strVal was already forced at entry; restrict() is infallible here.
-    let str_val = str_val_raw
-        .restrict()
-        .unwrap_or_else(|_| panic!("appendContext: strVal unexpectedly a thunk"));
-
-    let s_str = ctx.get_string(str_val).unwrap_or("").to_owned();
-    let context: StringContext = acc_gc.context().iter().cloned().collect();
-    let result = if context.is_empty() {
-        let sid = ctx.intern_string(s_str);
-        Value::new_inline(sid)
-    } else {
-        let ns = Gc::new(mc, NixString::with_context(s_str, context));
-        Value::new_gc(ns)
-    };
-    m.return_from_primop(result, reader)
-}

fix-vm/src/primops/control.rs

@@ -1,48 +1,48 @@
-use fix_bytecode::PrimOpPhase;
+use fix_builtins::PrimOpPhase;
 use fix_error::Error;
-use fix_runtime::{
-    AttrSet, BytecodeReader, Closure, Env, List, Machine, MachineExt, Step, StrictValue, Value,
-    VmRuntimeCtx, VmRuntimeCtxExt,
-};
 use gc_arena::{Gc, Mutation, RefLock};
 use smallvec::SmallVec;
 
-pub fn seq<'gc, M: Machine<'gc>>(
+use crate::value::*;
-    m: &mut M,
+use crate::{BytecodeReader, Step, Vm, VmRuntimeCtx, VmRuntimeCtxExt};
+
+impl<'gc> Vm<'gc> {
+    pub(crate) fn primop_seq(
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [e1, e2] - force e1, return e2
-    m.force_slot(1, reader, mc)?;
+        self.force_slot(1, reader, mc)?;
-    let e2 = m.pop();
+        let e2 = self.pop();
-    let _ = m.pop();
+        let _ = self.pop();
-    m.return_from_primop(e2, reader)
+        self.return_from_primop(e2, reader)
-}
+    }
 
-pub fn abort<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_abort(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [msg] - force msg, then abort with it
-    m.force_slot(0, reader, mc)?;
+        self.force_slot(0, reader, mc)?;
-    let msg_val = m.peek_forced(0);
+        let msg_val = self.peek_forced(0);
         let msg = ctx.get_string(msg_val).unwrap_or("<non-string-value>");
-    m.finish_err(Error::eval_error(format!(
+        self.finish_err(Error::eval_error(format!(
             "evaluation aborted with the following error message: '{msg}'"
         )))
-}
+    }
 
-pub fn deep_seq_force_top<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_deep_seq_force_top(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [e1, e2] - force e1, return e2
-    m.force_slot(1, reader, mc)?;
+        self.force_slot(1, reader, mc)?;
 
-    let e1 = m.peek_forced(1);
+        let e1 = self.peek_forced(1);
 
         let children: SmallVec<_> = if let Some(attrs) = e1.as_gc::<AttrSet>() {
             let attrs = &attrs.entries;
@@ -63,73 +63,73 @@ pub fn deep_seq_force_top<'gc, M: Machine<'gc>>(
         };
 
         if children.is_empty() {
-        let e2 = m.pop();
+            let e2 = self.pop();
-        let _ = m.pop();
+            let _ = self.pop();
-        return m.return_from_primop(e2, reader);
+            return self.return_from_primop(e2, reader);
         }
 
         let count = children.len() as i32;
         let seen: Gc<'gc, List<'gc>> = Gc::new(mc, List::default());
         let worklist: Gc<'gc, List<'gc>> = List::new(mc, children);
 
-    let e2 = m.pop();
+        let e2 = self.pop();
-    let _ = m.pop();
+        let _ = self.pop();
-    m.push(e2);
+        self.push(e2);
-    m.push(Value::new_gc(seen));
+        self.push(Value::new_gc(seen));
-    m.push(Value::new_gc(worklist));
+        self.push(Value::new_gc(worklist));
-    m.push(Value::new_inline(count));
+        self.push(Value::new_inline(count));
         reader.set_pc(PrimOpPhase::DeepSeqPush.ip() as usize);
         Step::Continue(())
-}
+    }
 
-pub fn deep_seq_push<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_deep_seq_push(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [e2, seen, worklist, counter]
         #[allow(clippy::unwrap_used)]
-    let counter = m.peek(0).as_inline::<i32>().unwrap();
+        let counter = self.peek(0).as_inline::<i32>().unwrap();
         if counter == 0 {
-        let _ = m.pop(); // counter
+            let _ = self.pop(); // counter
-        let _ = m.pop(); // worklist
+            let _ = self.pop(); // worklist
-        let _ = m.pop(); // seen
+            let _ = self.pop(); // seen
-        let val = m.pop();
+            let val = self.pop();
-        return m.return_from_primop(val, reader);
+            return self.return_from_primop(val, reader);
         }
 
         #[allow(clippy::unwrap_used)]
-    let worklist = m.peek_forced(1).as_gc::<List<'gc>>().unwrap();
+        let worklist = self.peek_forced(1).as_gc::<List<'gc>>().unwrap();
         #[allow(clippy::unwrap_used)]
         let item = worklist.unlock(mc).borrow_mut().pop().unwrap();
-    m.replace(0, Value::new_inline(counter - 1));
+        self.replace(0, Value::new_inline(counter - 1));
-    m.push(item);
+        self.push(item);
 
         // force item at TOS, resume at DeepSeqLoop after force
-    m.force_slot_to_pc(0, reader, mc, PrimOpPhase::DeepSeqLoop.ip() as usize)?;
+        self.force_slot_to_pc(0, reader, mc, PrimOpPhase::DeepSeqLoop.ip() as usize)?;
         reader.set_pc(PrimOpPhase::DeepSeqLoop.ip() as usize);
         Step::Continue(())
-}
+    }
 
-pub fn deep_seq_loop<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_deep_seq_loop(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack after pop: [e2, seen, worklist, counter]
-    let item = m.pop();
+        let item = self.pop();
         #[allow(clippy::unwrap_used)]
-    let counter = m.peek(0).as_inline::<i32>().unwrap();
+        let counter = self.peek(0).as_inline::<i32>().unwrap();
 
         let mut added: usize = 0;
         if let Some(attrs) = item.as_gc::<AttrSet>() {
             let attrs = &attrs.entries;
             #[allow(clippy::unwrap_used)]
-        let seen = m.peek_forced(2).as_gc::<List<'gc>>().unwrap();
+            let seen = self.peek_forced(2).as_gc::<List<'gc>>().unwrap();
-        if !is_value_in_seen(seen, item) {
+            if !self.is_value_in_seen(seen, item) {
-            add_value_to_seen(seen, mc, item);
+                self.add_value_to_seen(seen, mc, item);
                 #[allow(clippy::unwrap_used)]
-            let worklist = m.peek_forced(1).as_gc::<List<'gc>>().unwrap();
+                let worklist = self.peek_forced(1).as_gc::<List<'gc>>().unwrap();
                 {
                     let mut wl = worklist.unlock(mc).borrow_mut();
                     for &(_, v) in attrs.iter() {
@@ -140,11 +140,11 @@ pub fn deep_seq_loop<'gc, M: Machine<'gc>>(
             }
         } else if let Some(list) = item.as_gc::<List<'gc>>() {
             #[allow(clippy::unwrap_used)]
-        let seen = m.peek_forced(2).as_gc::<List<'gc>>().unwrap();
+            let seen = self.peek_forced(2).as_gc::<List<'gc>>().unwrap();
-        if !is_value_in_seen(seen, item) {
+            if !self.is_value_in_seen(seen, item) {
-            add_value_to_seen(seen, mc, item);
+                self.add_value_to_seen(seen, mc, item);
                 #[allow(clippy::unwrap_used)]
-            let worklist = m.peek_forced(1).as_gc::<List<'gc>>().unwrap();
+                let worklist = self.peek_forced(1).as_gc::<List<'gc>>().unwrap();
                 {
                     let inner = list.inner.borrow();
                     let mut wl = worklist.unlock(mc).borrow_mut();
@@ -156,19 +156,19 @@ pub fn deep_seq_loop<'gc, M: Machine<'gc>>(
             }
         }
 
-    m.replace(0, Value::new_inline(counter + added as i32));
+        self.replace(0, Value::new_inline(counter + added as i32));
         reader.set_pc(PrimOpPhase::DeepSeqPush.ip() as usize);
         Step::Continue(())
-}
+    }
 
-pub fn force_result_shallow<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_force_result_shallow(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    m.force_slot(0, reader, mc)?;
+        self.force_slot(0, reader, mc)?;
-    let val = m.peek_forced(0);
+        let val = self.peek_forced(0);
 
         let (count, has_children) = if let Some(attrs) = val.as_gc::<AttrSet>() {
             let len = attrs.entries.len();
@@ -181,35 +181,35 @@ pub fn force_result_shallow<'gc, M: Machine<'gc>>(
         };
 
         if !has_children {
-        let val = m.pop();
+            let val = self.pop();
-        return m.finish_ok(ctx.convert_value(val));
+            return self.finish_ok(ctx.convert_value(val));
         }
 
-    m.push(Value::new_inline(0i32));
+        self.push(Value::new_inline(0i32));
-    m.push(Value::new_inline(count as i32));
+        self.push(Value::new_inline(count as i32));
         reader.set_pc(PrimOpPhase::ForceResultShallowPush.ip() as usize);
         Step::Continue(())
-}
+    }
 
-pub fn force_result_shallow_push<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_force_result_shallow_push(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         #[allow(clippy::unwrap_used)]
-    let idx = m.peek(1).as_inline::<i32>().unwrap();
+        let idx = self.peek(1).as_inline::<i32>().unwrap();
         #[allow(clippy::unwrap_used)]
-    let len = m.peek(0).as_inline::<i32>().unwrap();
+        let len = self.peek(0).as_inline::<i32>().unwrap();
 
         if idx == len {
-        let _ = m.pop(); // len
+            let _ = self.pop(); // len
-        let _ = m.pop(); // idx
+            let _ = self.pop(); // idx
-        let val = m.pop();
+            let val = self.pop();
-        return m.finish_ok(ctx.convert_value(val));
+            return self.finish_ok(ctx.convert_value(val));
         }
 
-    let val = m.peek_forced(2);
+        let val = self.peek_forced(2);
         let child = if let Some(attrs) = val.as_gc::<AttrSet>() {
             attrs.entries.get(idx as usize).map(|&(_, v)| v)
         } else if let Some(list) = val.as_gc::<List<'gc>>() {
@@ -219,9 +219,9 @@ pub fn force_result_shallow_push<'gc, M: Machine<'gc>>(
         };
 
         if let Some(child) = child {
-        m.replace(1, Value::new_inline(idx + 1));
+            self.replace(1, Value::new_inline(idx + 1));
-        m.push(child);
+            self.push(child);
-        m.force_slot_to_pc(
+            self.force_slot_to_pc(
                 0,
                 reader,
                 mc,
@@ -230,29 +230,29 @@ pub fn force_result_shallow_push<'gc, M: Machine<'gc>>(
             reader.set_pc(PrimOpPhase::ForceResultShallowLoop.ip() as usize);
         }
         Step::Continue(())
-}
+    }
 
-pub fn force_result_shallow_loop<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_force_result_shallow_loop(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         _mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let _ = m.pop(); // forced child
+        let _ = self.pop(); // forced child
         reader.set_pc(PrimOpPhase::ForceResultShallowPush.ip() as usize);
         Step::Continue(())
-}
+    }
 
-pub fn force_result_deep_finish<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_force_result_deep_finish(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
-    m.finish_ok(ctx.convert_value(val.relax()))
+        self.finish_ok(ctx.convert_value(val.relax()))
-}
+    }
 
-fn is_value_in_seen<'gc>(seen: Gc<'gc, List<'gc>>, val: Value<'gc>) -> bool {
+    fn is_value_in_seen(&self, seen: Gc<'gc, List<'gc>>, val: Value<'gc>) -> bool {
         if !is_container(val) {
             return false;
         }
@@ -263,58 +263,58 @@ fn is_value_in_seen<'gc>(seen: Gc<'gc, List<'gc>>, val: Value<'gc>) -> bool {
             }
         }
         false
-}
+    }
 
-fn add_value_to_seen<'gc>(seen: Gc<'gc, List<'gc>>, mc: &Mutation<'gc>, val: Value<'gc>) {
+    fn add_value_to_seen(&self, seen: Gc<'gc, List<'gc>>, mc: &Mutation<'gc>, val: Value<'gc>) {
         if is_container(val) {
             seen.unlock(mc).borrow_mut().push(val);
         }
-}
+    }
 
-pub fn call_functor_1<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_call_functor_1(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // Stack invariant on every (re-)entry: [..., orig_arg, self, functor]
         // where `functor` is TOS. Retries during force land back here safely.
-    let functor = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let functor = self.force_and_retry::<StrictValue>(reader, mc)?;
         // Stack now: [..., orig_arg, self]
-    let self_val = m.pop();
+        let self_val = self.pop();
-    m.push(functor.relax());
+        self.push(functor.relax());
         // Stack: [..., orig_arg, functor]
         // Call 1: functor(self). Resume into CallFunctor2 once it returns.
-    m.call(
+        self.call(
             reader,
             mc,
             self_val,
             PrimOpPhase::CallFunctor2.ip() as usize,
         )
-}
+    }
 
-pub fn call_functor_2<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_call_functor_2(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // Stack on entry: [..., orig_arg, intermediate]
         // call_stack top: synthetic frame with caller's resume_pc.
-    let intermediate = m.pop();
+        let intermediate = self.pop();
-    let orig_arg = m.pop();
+        let orig_arg = self.pop();
-    let saved = m.pop_call_frame().expect("functor outer frame missing");
+        let saved = self.call_stack.pop().expect("functor outer frame missing");
-    m.set_env(saved.env);
+        self.env = saved.env;
-    m.push(intermediate);
+        self.push(intermediate);
         // Call 2: intermediate(orig_arg). Resume to caller.
-    m.call(reader, mc, orig_arg, saved.pc)
+        self.call(reader, mc, orig_arg, saved.pc)
-}
+    }
 
-pub fn call_pattern<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_call_pattern(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let (func, attrset) = m.force_and_retry::<(Gc<Closure>, Gc<AttrSet>)>(reader, mc)?;
+        let (func, attrset) = self.force_and_retry::<(Gc<Closure>, Gc<AttrSet>)>(reader, mc)?;
 
         let Closure {
             ip,
@@ -331,16 +331,17 @@ pub fn call_pattern<'gc, M: Machine<'gc>>(
             for key in pattern.required.iter().copied() {
                 if attrset.lookup(key).is_none() {
                     let name = ctx.resolve_string(key);
-                return m.finish_err(Error::eval_error(format!(
+                    return self.finish_err(Error::eval_error(format!(
                         "function 'anonymous lambda' called without required argument '{name}'"
                     )));
                 }
             }
             for &(key, _) in attrset.entries.iter() {
-            let is_expected = pattern.required.contains(&key) || pattern.optional.contains(&key);
+                let is_expected =
+                    pattern.required.contains(&key) || pattern.optional.contains(&key);
                 if !is_expected {
                     let name = ctx.resolve_string(key);
-                return m.finish_err(Error::eval_error(format!(
+                    return self.finish_err(Error::eval_error(format!(
                         "function 'anonymous lambda' called with unexpected argument '{name}'"
                     )));
                 }
@@ -352,9 +353,10 @@ pub fn call_pattern<'gc, M: Machine<'gc>>(
             RefLock::new(Env::with_arg(Value::new_gc(attrset), n_locals, env)),
         );
         reader.set_pc(ip as usize);
-    m.set_env(new_env);
+        self.env = new_env;
 
         Step::Continue(())
+    }
 }
 
 fn is_container(val: Value<'_>) -> bool {

fix-vm/src/primops/conv.rs

@@ -1,51 +1 @@
-use fix_error::Error;
-use fix_lang::StringId;
-use fix_runtime::{
-    BytecodeReader, Machine, MachineExt, NixString, NixType, Path, Step, StrictValue, Value,
-    VmRuntimeCtx,
-};
-use gc_arena::Mutation;
 
-pub fn to_string<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    _ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    if val.is::<StringId>() || val.is::<NixString>() {
-        return m.return_from_primop(val.relax(), reader);
-    }
-    if let Some(p) = val.as_inline::<Path>() {
-        return m.return_from_primop(Value::new_inline(p.0), reader);
-    }
-    //  TODO: derivations / `__toString` / `outPath`,
-    //        numbers, lists.
-    m.finish_err(Error::eval_error(format!(
-        "cannot coerce {} to a string",
-        val.ty()
-    )))
-}
-
-pub fn type_of<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    let name: &str = match val.ty() {
-        NixType::Int => "int",
-        NixType::Float => "float",
-        NixType::Bool => "bool",
-        NixType::Null => "null",
-        NixType::String => "string",
-        NixType::Path => "path",
-        NixType::AttrSet => "set",
-        NixType::List => "list",
-        NixType::Closure | NixType::PrimOp | NixType::PrimOpApp => "lambda",
-        NixType::Thunk => unreachable!("forced"),
-    };
-    let sid = ctx.intern_string(name);
-    m.return_from_primop(Value::new_inline(sid), reader)
-}

fix-vm/src/primops/eq.rs

@@ -1,237 +0,0 @@
-use fix_bytecode::PrimOpPhase;
-use fix_runtime::{
-    AttrSet, BytecodeReader, CallFrame, List, Machine, MachineExt, NixNum, Null, Path, Step,
-    StrictValue, Value, VmRuntimeCtx, VmRuntimeCtxExt,
-};
-use gc_arena::{Gc, Mutation};
-use smallvec::SmallVec;
-
-pub fn start_eq<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-    lhs: StrictValue<'gc>,
-    rhs: StrictValue<'gc>,
-    negate: bool,
-) -> Step {
-    match shallow_eq(ctx, lhs, rhs) {
-        ShallowEq::True => {
-            m.push(Value::new_inline(!negate));
-            Step::Continue(())
-        }
-        ShallowEq::False => {
-            m.push(Value::new_inline(negate));
-            Step::Continue(())
-        }
-        ShallowEq::RecurseList(la, lb) => {
-            let lhs_init: SmallVec<[Value<'gc>; 4]> = la.inner.borrow().iter().copied().collect();
-            let rhs_init: SmallVec<[Value<'gc>; 4]> = lb.inner.borrow().iter().copied().collect();
-            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();
-            enter_eq_machine(m, reader, mc, negate, lhs_init, rhs_init)
-        }
-    }
-}
-
-pub fn eq_step<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let rhs_q = m
-        .peek(0)
-        .as_gc::<List<'gc>>()
-        .expect("eq state corrupted: rhs_queue");
-    let lhs_q = m
-        .peek(1)
-        .as_gc::<List<'gc>>()
-        .expect("eq state corrupted: lhs_queue");
-    let result = m
-        .peek(2)
-        .as_inline::<bool>()
-        .expect("eq state corrupted: result");
-
-    if !result || lhs_q.inner.borrow().is_empty() {
-        return finalize(m, reader);
-    }
-
-    let lhs = lhs_q
-        .unlock(mc)
-        .borrow_mut()
-        .pop()
-        .expect("non-empty lhs queue");
-    let rhs = rhs_q
-        .unlock(mc)
-        .borrow_mut()
-        .pop()
-        .expect("non-empty rhs queue");
-    m.push(lhs);
-    m.push(rhs);
-    reader.set_pc(PrimOpPhase::EqForce.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn eq_force<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let (lhs, rhs) = m.force_and_retry::<(StrictValue, StrictValue)>(reader, mc)?;
-    apply_pair(m, ctx, mc, lhs, rhs);
-    reader.set_pc(PrimOpPhase::EqStep.ip() as usize);
-    Step::Continue(())
-}
-
-fn finalize<'gc, M: Machine<'gc>>(m: &mut M, reader: &mut BytecodeReader<'_>) -> Step {
-    let _ = m.pop();
-    let _ = m.pop();
-    let result = m
-        .pop()
-        .as_inline::<bool>()
-        .expect("eq state corrupted: result");
-    let negate = m
-        .pop()
-        .as_inline::<bool>()
-        .expect("eq state corrupted: negate");
-    m.return_from_primop(Value::new_inline(result ^ negate), reader)
-}
-
-fn apply_pair<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &impl VmRuntimeCtx,
-    mc: &Mutation<'gc>,
-    lhs: StrictValue<'gc>,
-    rhs: StrictValue<'gc>,
-) {
-    match shallow_eq(ctx, lhs, rhs) {
-        ShallowEq::True => {}
-        ShallowEq::False => {
-            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(),
-            );
-        }
-        ShallowEq::RecurseAttrs(a, b) => {
-            extend_queues(
-                m,
-                mc,
-                a.entries.iter().map(|&(_, v)| v),
-                b.entries.iter().map(|&(_, v)| v),
-            );
-        }
-    }
-}
-
-fn extend_queues<'gc, M, L, R>(m: &mut M, mc: &Mutation<'gc>, lhs_iter: L, rhs_iter: R)
-where
-    M: Machine<'gc>,
-    L: IntoIterator<Item = Value<'gc>>,
-    R: IntoIterator<Item = Value<'gc>>,
-{
-    let rhs_q = m
-        .peek(0)
-        .as_gc::<List<'gc>>()
-        .expect("eq state corrupted: rhs_queue");
-    let lhs_q = m
-        .peek(1)
-        .as_gc::<List<'gc>>()
-        .expect("eq state corrupted: lhs_queue");
-    let mut lq = lhs_q.unlock(mc).borrow_mut();
-    let mut rq = rhs_q.unlock(mc).borrow_mut();
-    for (x, y) in lhs_iter.into_iter().zip(rhs_iter) {
-        lq.push(x);
-        rq.push(y);
-    }
-}
-
-fn enter_eq_machine<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-    negate: bool,
-    lhs_init: SmallVec<[Value<'gc>; 4]>,
-    rhs_init: SmallVec<[Value<'gc>; 4]>,
-) -> Step {
-    let resume_pc = reader.pc();
-    m.push_call_frame(CallFrame {
-        pc: resume_pc,
-        thunk: None,
-        env: m.env(),
-    });
-    m.inc_call_depth();
-    m.push(Value::new_inline(negate));
-    m.push(Value::new_inline(true));
-    m.push(Value::new_gc(List::new(mc, lhs_init)));
-    m.push(Value::new_gc(List::new(mc, rhs_init)));
-    reader.set_pc(PrimOpPhase::EqStep.ip() as usize);
-    Step::Continue(())
-}
-
-enum ShallowEq<'gc> {
-    True,
-    False,
-    RecurseList(Gc<'gc, List<'gc>>, Gc<'gc, List<'gc>>),
-    RecurseAttrs(Gc<'gc, AttrSet<'gc>>, Gc<'gc, AttrSet<'gc>>),
-}
-
-fn shallow_eq<'gc>(
-    ctx: &impl VmRuntimeCtx,
-    lhs: StrictValue<'gc>,
-    rhs: StrictValue<'gc>,
-) -> ShallowEq<'gc> {
-    if let (Some(a), Some(b)) = (lhs.as_num(), rhs.as_num()) {
-        let eq = match (a, b) {
-            (NixNum::Int(a), NixNum::Int(b)) => a == b,
-            (NixNum::Float(a), NixNum::Float(b)) => a == b,
-            (NixNum::Int(a), NixNum::Float(b)) => a as f64 == b,
-            (NixNum::Float(a), NixNum::Int(b)) => a == b as f64,
-        };
-        return bool_outcome(eq);
-    }
-    if let (Some(a), Some(b)) = (lhs.as_inline::<bool>(), rhs.as_inline::<bool>()) {
-        return bool_outcome(a == b);
-    }
-    if lhs.is::<Null>() && rhs.is::<Null>() {
-        return ShallowEq::True;
-    }
-    if let (Some(a), Some(b)) = (lhs.as_inline::<Path>(), rhs.as_inline::<Path>()) {
-        return bool_outcome(a.0 == b.0);
-    }
-    if let (Some(a), Some(b)) = (ctx.get_string(lhs), ctx.get_string(rhs)) {
-        return bool_outcome(a == b);
-    }
-    if let (Some(a), Some(b)) = (lhs.as_gc::<List<'gc>>(), rhs.as_gc::<List<'gc>>()) {
-        if a.inner.borrow().len() != b.inner.borrow().len() {
-            return ShallowEq::False;
-        }
-        return ShallowEq::RecurseList(a, b);
-    }
-    if let (Some(a), Some(b)) = (lhs.as_gc::<AttrSet<'gc>>(), rhs.as_gc::<AttrSet<'gc>>()) {
-        let ae = &a.entries;
-        let be = &b.entries;
-        if ae.len() != be.len() {
-            return ShallowEq::False;
-        }
-        for (l, r) in ae.iter().zip(be.iter()) {
-            if l.0 != r.0 {
-                return ShallowEq::False;
-            }
-        }
-        return ShallowEq::RecurseAttrs(a, b);
-    }
-    ShallowEq::False
-}
-
-fn bool_outcome<'gc>(b: bool) -> ShallowEq<'gc> {
-    if b { ShallowEq::True } else { ShallowEq::False }
-}

fix-vm/src/primops/io.rs

@@ -1,177 +1,168 @@
 use std::path::PathBuf;
 
-use fix_bytecode::PrimOpPhase;
+use fix_builtins::PrimOpPhase;
+use fix_common::StringId;
 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 gc_arena::{Gc, Mutation};
 use hashbrown::HashSet;
 
-pub fn import<'gc, M: Machine<'gc>>(
+use crate::bytecode_reader::BytecodeReader;
-    m: &mut M,
+use crate::value::*;
+use crate::{Break, CallFrame, PendingLoad, PendingScope, Step, Vm, VmRuntimeCtx, VmRuntimeCtxExt};
+
+impl<'gc> Vm<'gc> {
+    pub(crate) fn primop_import(
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [path]
-    let path_val = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let path_val = self.force_and_retry::<StrictValue>(reader, mc)?;
-    let path_str = match ctx.get_string_or_path(path_val) {
+        let path_str = match ctx.get_string(path_val) {
             Some(s) => s.to_owned(),
             None => {
-            return m.finish_err(Error::eval_error(format!(
+                return self.finish_err(Error::eval_error(format!(
-                "expected a path or string, got {}",
+                    "expected a path string, got {}",
                     path_val.ty()
                 )));
             }
         };
         let abs = match resolve_import_target(&path_str) {
             Ok(p) => p,
-        Err(e) => return m.finish_err(e),
+            Err(e) => return self.finish_err(e),
         };
 
-    if let Some(cached) = m.import_cache_get(&abs) {
+        if let Some(&cached) = self.import_cache.get(&abs) {
-        return m.return_from_primop(cached, reader);
+            return self.return_from_primop(cached, reader);
         }
 
         // Stash the resolved path on the stack as a string-id so the
         // finalizer can use it as the cache key. The slot we pop here was
         // freed by `force_and_retry`, so we simply push.
         let path_sid = ctx.intern_string(abs.to_string_lossy());
-    m.push(Value::new_inline(path_sid));
+        self.push(Value::new_inline(path_sid));
-    let env = m.env();
+        self.call_stack.push(CallFrame {
-    m.push_call_frame(CallFrame {
             pc: PrimOpPhase::ImportFinalize.ip() as usize,
             thunk: None,
-        env,
+            env: self.env,
         });
 
-    m.set_pending_load(PendingLoad {
+        self.pending_load = Some(PendingLoad {
             path: abs,
             scope: None,
         });
         Step::Break(Break::LoadFile)
-}
+    }
 
-pub fn import_finalize<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_import_finalize(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
-) -> Step {
+    ) -> Step {
         // stack: [path_sid, return_value]
-    let val = m.pop();
+        let val = self.pop();
         #[allow(clippy::unwrap_used)]
-    let path_sid = m.pop().as_inline::<StringId>().unwrap();
+        let path_sid = self.pop().as_inline::<StringId>().unwrap();
         // The cache key is keyed by the absolute path string we interned in
-    // `import`. Resolve it back to the host PathBuf.
+        // `primop_import`. Resolve it back to the host PathBuf.
         let path_str = ctx.resolve_string(path_sid).to_owned();
-    m.import_cache_insert(PathBuf::from(path_str), val);
+        self.import_cache.insert(PathBuf::from(path_str), val);
-    m.push(val);
+        self.push(val);
         let Some(CallFrame {
             pc: ret_pc,
             thunk: _,
             env,
-    }) = m.pop_call_frame()
+        }) = self.call_stack.pop()
         else {
             unreachable!()
         };
         reader.set_pc(ret_pc);
         // FIXME:
-    // m.dec_call_depth();
+        // self.call_depth -= 1;
-    m.set_env(env);
+        self.env = env;
         Step::Continue(())
-}
+    }
 
-pub fn scoped_import<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_scoped_import(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [scope, path]
-    let (scope_attrs, path_val) = m.force_and_retry::<(Gc<AttrSet>, StrictValue)>(reader, mc)?;
+        let (scope_attrs, path_val) =
-    let path_str = match ctx.get_string_or_path(path_val) {
+            self.force_and_retry::<(Gc<AttrSet>, StrictValue)>(reader, mc)?;
+        let path_str = match ctx.get_string(path_val) {
             Some(s) => s.to_owned(),
             None => {
-            return m.finish_err(Error::eval_error(format!(
+                return self.finish_err(Error::eval_error(format!(
-                "expected a path or string, got {}",
+                    "expected a path string, got {}",
                     path_val.ty()
                 )));
             }
         };
         let abs = match resolve_import_target(&path_str) {
             Ok(p) => p,
-        Err(e) => return m.finish_err(e),
+            Err(e) => return self.finish_err(e),
         };
 
         let keys: HashSet<StringId> = scope_attrs.entries.iter().map(|&(k, _)| k).collect();
-    let slot_id = m.scope_slots_push(Value::new_gc(scope_attrs));
+        let slot_id = self.scope_slots.len() as u32;
+        self.scope_slots.push(Value::new_gc(scope_attrs));
 
-    let env = m.env();
+        self.call_stack.push(CallFrame {
-    m.push_call_frame(CallFrame {
             pc: PrimOpPhase::ScopedImportFinalize.ip() as usize,
             thunk: None,
-        env,
+            env: self.env,
         });
 
-    m.set_pending_load(PendingLoad {
+        self.pending_load = Some(PendingLoad {
             path: abs,
             scope: Some(PendingScope { keys, slot_id }),
         });
         Step::Break(Break::LoadFile)
-}
+    }
 
-pub fn scoped_import_finalize<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_scoped_import_finalize(
-    m: &mut M,
+        &mut self,
         _ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         _mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         // stack: [return_value]
         // We intentionally do NOT pop the slot from `scope_slots` so that
         // closures or thunks created inside the imported file can still
         // resolve their scope after `scopedImport` returns.
-    let val = m.pop();
+        let val = self.pop();
-    m.return_from_primop(val, reader)
+        self.return_from_primop(val, reader)
-}
+    }
 
-pub fn path_exists<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_path_exists(
-    m: &mut M,
+        &mut self,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let path_val = m.force_and_retry::<StrictValue>(reader, mc)?;
+        let path_val = self.force_and_retry::<StrictValue>(reader, mc)?;
-    // pathExists requires an absolute path. A `Path` value is
+        let path = match ctx.get_string(path_val) {
-    // always absolute; a string is accepted only if it starts with `/`.
+            Some(s) => s.to_owned(),
-    let (path, is_path_value) = if let Some(p) = path_val.as_inline::<Path>() {
+            None => {
-        (ctx.resolve_string(p.0).to_owned(), true)
+                return self.finish_err(Error::eval_error(format!(
-    } else if let Some(s) = ctx.get_string(path_val) {
+                    "expected a path string, got {}",
-        (s.to_owned(), false)
-    } else {
-        return m.finish_err(Error::eval_error(format!(
-            "expected a path or string, got {}",
                     path_val.ty()
                 )));
-    };
-    if !is_path_value && !path.starts_with('/') {
-        return m.finish_err(Error::eval_error(format!(
-            "string '{path}' doesn't represent an absolute path"
-        )));
             }
-    // CppNix collapses consecutive slashes and resolves `.` / `..` lexically
+        };
-    // before checking. Trailing-slash / trailing-dot mean "must be a directory".
         let must_be_dir = path.ends_with('/') || path.ends_with("/.");
-    let canon = canon_path_str(&path);
+        let p = std::path::Path::new(&path);
-    let p = std::path::Path::new(&canon);
         let exists = if must_be_dir {
             std::fs::metadata(p).map(|m| m.is_dir()).unwrap_or(false)
         } else {
             std::fs::symlink_metadata(p).is_ok()
         };
-    m.return_from_primop(Value::new_inline(exists), reader)
+        self.return_from_primop(Value::new_inline(exists), reader)
+    }
 }
 
 /// Convert the user-supplied path string into an absolute, dotted-segment

fix-vm/src/primops/list.rs

@@ -1,283 +1,73 @@
-use fix_bytecode::PrimOpPhase;
+use fix_builtins::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>>(
+use crate::bytecode_reader::BytecodeReader;
-    m: &mut M,
+use crate::value::*;
+use crate::{Step, Vm};
+
+impl<'gc> Vm<'gc> {
+    pub(crate) fn primop_filter_force_list(
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    m.force_slot(0, reader, mc)?;
+        self.force_slot(0, reader, mc)?;
-    let list = match m.peek_forced(0).expect_gc::<List>() {
+        let list = match self.peek_forced(0).expect_gc::<List>() {
             Ok(list) => list,
-        Err(got) => return m.finish_type_err(NixType::List, got),
+            Err(got) => return self.finish_type_err(NixType::List, got),
         };
         if list.inner.borrow().is_empty() {
-        let val = m.pop();
+            let val = self.pop();
-        let _pred = m.pop();
+            return self.return_from_primop(val, reader);
-        return m.return_from_primop(val, reader);
         }
         // prepare stack layout: [ pred list idx acc ]
-    m.push(Value::new_inline(0));
+        self.push(Value::new_inline(0));
-    m.push(Value::new_gc(List::new_gc(mc)));
+        self.push(Value::new_gc(List::new_gc(mc)));
         reader.set_pc(PrimOpPhase::FilterCallPred.ip() as usize);
         Step::Continue(())
-}
+    }
 
-pub fn filter_call_pred<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_filter_call_pred(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    m.force_slot(3, reader, mc)?;
+        self.force_slot(3, reader, mc)?;
-    let pred = m.peek_forced(3);
+        let pred = self.peek_forced(3);
         #[allow(clippy::unwrap_used)]
-    let idx = m.peek(1).as_inline::<i32>().unwrap();
+        let idx = self.peek(1).as_inline::<i32>().unwrap();
         #[allow(clippy::unwrap_used)]
-    let elem = m.peek_forced(2).as_gc::<List>().unwrap().inner.borrow()[idx as usize];
+        let elem = self.peek_forced(2).as_gc::<List>().unwrap().inner.borrow()[idx as usize];
-    m.push(pred.relax());
+        self.push(pred.relax());
-    m.call(reader, mc, elem, PrimOpPhase::FilterCheck.ip() as usize)
+        self.call(reader, mc, elem, PrimOpPhase::FilterCheck.ip() as usize)
-}
+    }
 
-pub fn filter_check<'gc, M: Machine<'gc>>(
+    pub(crate) fn primop_filter_check(
-    m: &mut M,
+        &mut self,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
-    let ret = m.force_and_retry::<bool>(reader, mc)?;
+        let ret = self.force_and_retry::<bool>(reader, mc)?;
         #[allow(clippy::unwrap_used)]
-    let idx = m.peek(1).as_inline::<i32>().unwrap();
+        let idx = self.peek(1).as_inline::<i32>().unwrap();
         #[allow(clippy::unwrap_used)]
-    let list = m.peek_forced(2).as_gc::<List>().unwrap();
+        let list = self.peek_forced(2).as_gc::<List>().unwrap();
         let list = list.inner.borrow();
         #[allow(clippy::unwrap_used)]
-    let acc = m.peek_forced(0).as_gc::<List>().unwrap();
+        let acc = self.peek_forced(0).as_gc::<List>().unwrap();
         if ret {
             let mut acc = acc.unlock(mc).borrow_mut();
             acc.push(list[idx as usize]);
         }
         if idx as usize == list.len() - 1 {
-        let acc = m.pop();
+            let acc = self.pop();
-        let _ = m.pop(); // idx
+            let _ = self.pop(); // idx
-        let _ = m.pop(); // list
+            let _ = self.pop(); // list
-        let _ = m.pop(); // pred
+            let _ = self.pop(); // pred
-        return m.return_from_primop(acc, reader);
+            return self.return_from_primop(acc, reader);
         }
-    m.replace(1, Value::new_inline(idx + 1));
+        self.replace(1, Value::new_inline(idx + 1));
         reader.set_pc(PrimOpPhase::FilterCallPred.ip() as usize);
         Step::Continue(())
-}
-
-// foldl' op nul list
-//
-// Stack layouts across phases:
-//   Entry:  [op, nul, list]
-//   Empty:  [op, nul]
-//   Call1:  [op, list, idx, acc]
-//   Call2:  [op, list, idx, acc, intermediate]
-//   Update: [op, list, idx, acc, result]
-pub fn foldl_strict_entry<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    m.force_slot(0, reader, mc)?;
-    let list_val = m.peek_forced(0);
-    let Some(list) = list_val.as_gc::<List>() else {
-        return m.finish_type_err(NixType::List, list_val.ty());
-    };
-    if list.inner.borrow().is_empty() {
-        let _ = m.pop(); // list
-        reader.set_pc(PrimOpPhase::FoldlStrictEmpty.ip() as usize);
-        return Step::Continue(());
     }
-    let list_val = m.pop();
-    let nul_val = m.pop();
-    m.push(list_val);
-    m.push(Value::new_inline(0i32));
-    m.push(nul_val);
-    reader.set_pc(PrimOpPhase::FoldlStrictCall1.ip() as usize);
-    Step::Continue(())
-}
-
-pub fn foldl_strict_empty<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let nul = m.force_and_retry::<StrictValue>(reader, mc)?;
-    let _ = m.pop(); // op
-    m.return_from_primop(nul.relax(), reader)
-}
-
-pub fn foldl_strict_call1<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    m.force_slot(3, reader, mc)?;
-    let op = m.peek_forced(3);
-    let acc = m.peek(0);
-    m.push(op.relax());
-    m.call(reader, mc, acc, PrimOpPhase::FoldlStrictCall2.ip() as usize)
-}
-
-pub fn foldl_strict_call2<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    #[allow(clippy::unwrap_used)]
-    let idx = m.peek(2).as_inline::<i32>().unwrap();
-    #[allow(clippy::unwrap_used)]
-    let list = m.peek_forced(3).as_gc::<List>().unwrap();
-    let elem = list.inner.borrow()[idx as usize];
-    m.call(
-        reader,
-        mc,
-        elem,
-        PrimOpPhase::FoldlStrictUpdate.ip() as usize,
-    )
-}
-
-pub fn foldl_strict_update<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    _mc: &Mutation<'gc>,
-) -> Step {
-    let result = m.pop();
-    m.replace(0, result);
-    #[allow(clippy::unwrap_used)]
-    let idx = m.peek(1).as_inline::<i32>().unwrap();
-    #[allow(clippy::unwrap_used)]
-    let list = m.peek_forced(2).as_gc::<List>().unwrap();
-    let len = list.inner.borrow().len();
-    if (idx as usize) + 1 == len {
-        let acc = m.pop();
-        let _ = m.pop(); // idx
-        let _ = m.pop(); // list
-        let _ = m.pop(); // op
-        return m.return_from_primop(acc, reader);
-    }
-    m.replace(1, Value::new_inline(idx + 1));
-    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

@@ -1,97 +1,80 @@
-mod context;
+use fix_builtins::PrimOpPhase;
+use fix_error::Error;
+use gc_arena::Mutation;
+use num_enum::TryFromPrimitive;
+
+use crate::bytecode_reader::BytecodeReader;
+use crate::value::Value;
+use crate::{CallFrame, Step, Vm, VmRuntimeCtx};
+
+mod attrs;
 mod control;
 mod conv;
-mod eq;
 mod io;
 mod list;
 mod path;
+mod regex;
+mod version;
 
-pub use context::*;
+impl<'gc> Vm<'gc> {
-pub use control::*;
+    #[allow(clippy::too_many_lines)]
-pub use conv::*;
+    pub(crate) fn op_dispatch_primop(
-pub use eq::*;
+        &mut self,
-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::*;
-pub use path::*;
-
-#[allow(clippy::too_many_lines)]
-pub fn dispatch_primop<'gc, M: Machine<'gc>>(
-    m: &mut M,
         ctx: &mut impl VmRuntimeCtx,
         reader: &mut BytecodeReader<'_>,
         mc: &Mutation<'gc>,
-) -> Step {
+    ) -> Step {
         use PrimOpPhase::*;
         let phase_disc = reader.read_u8();
-    let Ok(phase) = PrimOpPhase::try_from(phase_disc) else {
+        let Ok(phase) = PrimOpPhase::try_from_primitive(phase_disc) else {
-        return m.finish_err(Error::eval_error("invalid primop phase"));
+            return self.finish_err(Error::eval_error("invalid primop phase"));
         };
         match phase {
-        Abort => abort(m, ctx, reader, mc),
+            Abort => self.primop_abort(ctx, reader, mc),
 
-        All => all_entry(m, reader, mc),
+            DeepSeq => self.primop_deep_seq_force_top(reader, mc),
-        AllCallPred => all_call_pred(m, reader, mc),
+            DeepSeqPush => self.primop_deep_seq_push(reader, mc),
-        AllCheck => all_check(m, reader, mc),
+            DeepSeqLoop => self.primop_deep_seq_loop(reader, mc),
+            Seq => self.primop_seq(reader, mc),
 
-        Any => any_entry(m, reader, mc),
+            FilterForceList => self.primop_filter_force_list(reader, mc),
-        AnyCallPred => any_call_pred(m, reader, mc),
+            FilterCallPred => self.primop_filter_call_pred(reader, mc),
-        AnyCheck => any_check(m, reader, mc),
+            FilterCheck => self.primop_filter_check(reader, mc),
 
-        DeepSeq => deep_seq_force_top(m, reader, mc),
+            ForceResultShallow => self.primop_force_result_shallow(ctx, reader, mc),
-        DeepSeqPush => deep_seq_push(m, reader, mc),
+            ForceResultShallowPush => self.primop_force_result_shallow_push(ctx, reader, mc),
-        DeepSeqLoop => deep_seq_loop(m, reader, mc),
+            ForceResultShallowLoop => self.primop_force_result_shallow_loop(reader, mc),
-        Seq => seq(m, reader, mc),
+            ForceResultDeepFinish => self.primop_force_result_deep_finish(ctx, reader, mc),
 
-        FilterForceList => filter_force_list(m, reader, mc),
+            CallPattern => self.primop_call_pattern(ctx, reader, mc),
-        FilterCallPred => filter_call_pred(m, reader, mc),
+            CallFunctor1 => self.primop_call_functor_1(reader, mc),
-        FilterCheck => filter_check(m, reader, mc),
+            CallFunctor2 => self.primop_call_functor_2(reader, mc),
 
-        FoldlStrict => foldl_strict_entry(m, reader, mc),
+            Import => self.primop_import(ctx, reader, mc),
-        FoldlStrictEmpty => foldl_strict_empty(m, reader, mc),
+            ImportFinalize => self.primop_import_finalize(ctx, reader),
-        FoldlStrictCall1 => foldl_strict_call1(m, reader, mc),
+            ScopedImport => self.primop_scoped_import(ctx, reader, mc),
-        FoldlStrictCall2 => foldl_strict_call2(m, reader, mc),
+            ScopedImportFinalize => self.primop_scoped_import_finalize(ctx, reader, mc),
-        FoldlStrictUpdate => foldl_strict_update(m, reader, mc),
 
-        ForceResultShallow => force_result_shallow(m, ctx, reader, mc),
+            PathExists => self.primop_path_exists(ctx, reader, mc),
-        ForceResultShallowPush => force_result_shallow_push(m, ctx, reader, mc),
-        ForceResultShallowLoop => force_result_shallow_loop(m, reader, mc),
-        ForceResultDeepFinish => force_result_deep_finish(m, ctx, reader, mc),
-
-        EqStep => eq_step(m, reader, mc),
-        EqForce => eq_force(m, ctx, reader, mc),
-
-        CallPattern => call_pattern(m, ctx, reader, mc),
-        CallFunctor1 => call_functor_1(m, reader, mc),
-        CallFunctor2 => call_functor_2(m, reader, mc),
-
-        Import => import(m, ctx, reader, mc),
-        ImportFinalize => import_finalize(m, ctx, reader),
-        ScopedImport => scoped_import(m, ctx, reader, mc),
-        ScopedImportFinalize => scoped_import_finalize(m, ctx, reader, mc),
-
-        PathExists => path_exists(m, ctx, reader, mc),
-        ToPath => to_path(m, ctx, reader, mc),
-        IsPath => is_path(m, reader, mc),
-        ToString => to_string(m, ctx, reader, mc),
-        TypeOf => type_of(m, ctx, reader, mc),
-
-        HasContext => has_context(m, ctx, reader, mc),
-        GetContext => get_context(m, ctx, reader, mc),
-        AppendContext => append_context(m, ctx, reader, mc),
-        AppendContextLoop => append_context_loop(m, ctx, reader, mc),
-        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)
-        }
-        UnsafeDiscardStringContext => unsafe_discard_string_context(m, ctx, reader, mc),
-        UnsafeDiscardOutputDependency => unsafe_discard_output_dependency(m, ctx, reader, mc),
 
             phase => todo!("primop phase {phase:?}"),
         }
+    }
+
+    #[inline(always)]
+    fn return_from_primop(&mut self, val: Value<'gc>, reader: &mut BytecodeReader<'_>) -> Step {
+        self.push(val);
+        let Some(CallFrame {
+            pc: ret_pc,
+            thunk: _,
+            env,
+        }) = self.call_stack.pop()
+        else {
+            unreachable!()
+        };
+        reader.set_pc(ret_pc);
+        self.call_depth -= 1;
+        self.env = env;
+        Step::Continue(())
+    }
 }

fix-vm/src/primops/path.rs

@@ -1,43 +1 @@
-use fix_error::Error;
-use fix_runtime::{
-    BytecodeReader, Machine, MachineExt, Path, Step, StrictValue, Value, VmRuntimeCtx,
-    VmRuntimeCtxExt, canon_path_str,
-};
-use gc_arena::Mutation;
 
-pub fn to_path<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    ctx: &mut impl VmRuntimeCtx,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    // coerce to path THEN TO STRING
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    if let Some(Path(s)) = val.as_inline::<Path>() {
-        return m.return_from_primop(Value::new_inline(s), reader);
-    }
-    let Some(s) = ctx.get_string(val) else {
-        return m.finish_err(Error::eval_error(format!(
-            "cannot coerce {} to a path",
-            val.ty()
-        )));
-    };
-    if !s.starts_with('/') {
-        return m.finish_err(Error::eval_error(format!(
-            "string '{s}' doesn't represent an absolute path"
-        )));
-    }
-    let canon = canon_path_str(s);
-    let sid = ctx.intern_string(canon);
-    m.return_from_primop(Value::new_inline(sid), reader)
-}
-
-pub fn is_path<'gc, M: Machine<'gc>>(
-    m: &mut M,
-    reader: &mut BytecodeReader<'_>,
-    mc: &Mutation<'gc>,
-) -> Step {
-    let val = m.force_and_retry::<StrictValue>(reader, mc)?;
-    let is_path = val.is::<Path>();
-    m.return_from_primop(Value::new_inline(is_path), reader)
-}

fix-vm/src/primops/regex.rs

@@ -0,0 +1 @@
+

fix-vm/src/primops/version.rs

@@ -0,0 +1 @@
+

fix-vm/src/value.rs

@@ -1,19 +1,23 @@
+#![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_lang::*;
+use fix_builtins::BuiltinId;
+use fix_common::*;
 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;
 
+use crate::NixNum;
 use crate::boxing::{RawBox, RawStore, RawTag, Value as RawValue};
-use crate::string_context::StringContext;
 
 mod private {
     pub trait Cealed {}
@@ -21,12 +25,14 @@ mod private {
 
 /// # Safety
 ///
-/// [`Self::TAG`] must be unique among all implementors.
+/// TAG must be unique among all implementors.
-unsafe trait Storable: private::Cealed {
+#[allow(private_interfaces)]
+pub unsafe trait Storable: private::Cealed {
     const TAG: RawTag;
 }
-trait InlineStorable: Storable + RawStore {}
+#[allow(private_bounds)]
-trait GcStorable: Storable {}
+pub trait InlineStorable: Storable + RawStore {}
+pub trait GcStorable: Storable {}
 
 macro_rules! define_value_types {
     (
@@ -34,6 +40,7 @@ macro_rules! define_value_types {
         gc { $($gtype:ty => $gtag:expr, $gname:literal;)* }
     ) => {
         $(
+        #[allow(private_interfaces)]
         unsafe impl Storable for $itype {
             const TAG: RawTag = $itag;
         }
@@ -41,6 +48,7 @@ macro_rules! define_value_types {
         impl private::Cealed for $itype {}
         )*
         $(
+        #[allow(private_interfaces)]
         unsafe impl Storable for $gtype {
             const TAG: RawTag = $gtag;
         }
@@ -109,16 +117,15 @@ define_value_types! {
         Null => RawTag::P3, "Null";
         StringId => RawTag::P4, "SmallString";
         PrimOp => RawTag::P5, "PrimOp";
-        Path => RawTag::P6, "Path";
     }
     gc {
-        i64 => RawTag::P7, "BigInt";
+        i64 => RawTag::P6, "BigInt";
-        NixString => RawTag::N1, "String";
+        NixString => RawTag::P7, "String";
-        AttrSet<'_> => RawTag::N2, "AttrSet";
+        AttrSet<'_> => RawTag::N1, "AttrSet";
-        List<'_> => RawTag::N3, "List";
+        List<'_> => RawTag::N2, "List";
-        Thunk<'_> => RawTag::N4, "Thunk";
+        Thunk<'_> => RawTag::N3, "Thunk";
-        Closure<'_> => RawTag::N5, "Closure";
+        Closure<'_> => RawTag::N4, "Closure";
-        PrimOpApp<'_> => RawTag::N6, "PrimOpApp";
+        PrimOpApp<'_> => RawTag::N5, "PrimOpApp";
     }
 }
 
@@ -178,13 +185,11 @@ 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))
@@ -207,7 +212,6 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
-    #[allow(private_bounds)]
     pub fn is<T: Storable>(self) -> bool {
         self.tag() == Some(T::TAG)
     }
@@ -220,7 +224,6 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
-    #[allow(private_bounds)]
     pub fn as_inline<T: InlineStorable>(self) -> Option<T> {
         if self.is::<T>() {
             Some(unsafe {
@@ -233,7 +236,6 @@ 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 {
@@ -247,7 +249,7 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
-    pub fn to_bits(self) -> u64 {
+    pub(crate) fn to_bits(self) -> u64 {
         self.raw.to_bits()
     }
 
@@ -287,8 +289,6 @@ impl<'gc> Value<'gc> {
             NixType::PrimOp
         } else if self.is::<NixString>() {
             NixType::String
-        } else if self.is::<Path>() {
-            NixType::Path
         } else if self.is::<AttrSet>() {
             NixType::AttrSet
         } else if self.is::<List>() {
@@ -305,29 +305,27 @@ impl<'gc> Value<'gc> {
     }
 
     #[inline]
-    #[allow(private_bounds)]
+    pub(crate) fn expect_inline<T: InlineStorable>(self) -> Result<T, NixType> {
-    pub fn expect_inline<T: InlineStorable>(self) -> Result<T, NixType> {
         self.as_inline::<T>().ok_or_else(|| self.ty())
     }
 
     #[inline]
-    #[allow(private_bounds)]
+    pub(crate) fn expect_gc<T: GcStorable>(self) -> Result<Gc<'gc, T>, NixType> {
-    pub fn expect_gc<T: GcStorable>(self) -> Result<Gc<'gc, T>, NixType> {
         self.as_gc::<T>().ok_or_else(|| self.ty())
     }
 
     #[inline]
-    pub fn expect_num(self) -> Result<NixNum, NixType> {
+    pub(crate) fn expect_num(self) -> Result<NixNum, NixType> {
         self.as_num().ok_or_else(|| self.ty())
     }
 
     #[inline]
-    pub fn expect_bool(self) -> Result<bool, NixType> {
+    pub(crate) fn expect_bool(self) -> Result<bool, NixType> {
         self.as_inline::<bool>().ok_or_else(|| self.ty())
     }
 
     #[inline]
-    pub fn expect_float(self) -> Result<f64, NixType> {
+    pub(crate) fn expect_float(self) -> Result<f64, NixType> {
         self.as_float().ok_or_else(|| self.ty())
     }
 }
@@ -350,7 +348,6 @@ 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,7 +364,6 @@ impl StaticValue {
         self.0.is_float()
     }
     #[inline]
-    #[allow(private_bounds)]
     pub fn is<T: InlineStorable>(self) -> bool {
         self.0.is::<T>()
     }
@@ -376,7 +372,6 @@ impl StaticValue {
         self.0.as_float()
     }
     #[inline]
-    #[allow(private_bounds)]
     pub fn as_inline<T: InlineStorable>(self) -> Option<T> {
         self.0.as_inline::<T>()
     }
@@ -387,7 +382,7 @@ impl StaticValue {
 }
 
 #[derive(Clone, Copy, Debug)]
-pub struct Null;
+pub(crate) struct Null;
 impl RawStore for Null {
     fn to_val(self, value: &mut RawValue) {
         value.set_data([0; 6]);
@@ -409,55 +404,26 @@ impl RawStore for StringId {
     }
 }
 
-/// A canonicalized absolute path. Inline value carrying an interned
+/// Heap-allocated Nix string.
-/// `StringId` whose contents are the path's absolute, dot-resolved form.
+///
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+/// Stored on the GC heap via `Gc<'gc, NixString>`. The string data itself
-pub struct Path(pub StringId);
+/// lives in a standard `Box<str>` owned by this struct; the GC only manages
-
+/// the outer allocation.
-impl RawStore for Path {
-    fn to_val(self, value: &mut RawValue) {
-        self.0.to_val(value);
-    }
-    fn from_val(value: &RawValue) -> Self {
-        Self(StringId::from_val(value))
-    }
-}
-
 #[derive(Collect)]
 #[collect(require_static)]
-pub struct NixString {
+pub(crate) struct NixString {
     data: Box<str>,
-    context: StringContext,
+    // TODO: string context for derivation dependency tracking
 }
 
 impl NixString {
-    pub fn new(s: impl Into<Box<str>>) -> Self {
+    pub(crate) fn new(s: impl Into<Box<str>>) -> Self {
-        Self {
+        Self { data: s.into() }
-            data: s.into(),
-            context: StringContext::new(),
-        }
     }
 
-    /// Construct a `NixString` whose `context` is already sorted+deduped.
+    pub(crate) fn as_str(&self) -> &str {
-    /// The caller is responsible for invariant maintenance.
-    pub fn with_context(s: impl Into<Box<str>>, context: StringContext) -> Self {
-        Self {
-            data: s.into(),
-            context,
-        }
-    }
-
-    pub fn as_str(&self) -> &str {
         &self.data
     }
-
-    pub fn context(&self) -> &StringContext {
-        &self.context
-    }
-
-    pub fn has_context(&self) -> bool {
-        !self.context.is_empty()
-    }
 }
 
 impl fmt::Debug for NixString {
@@ -468,28 +434,28 @@ impl fmt::Debug for NixString {
 
 #[derive(Collect, Debug, Default)]
 #[collect(no_drop)]
-pub struct AttrSet<'gc> {
+pub(crate) struct AttrSet<'gc> {
-    pub entries: SmallVec<[(StringId, Value<'gc>); 4]>,
+    pub(crate) entries: SmallVec<[(StringId, Value<'gc>); 4]>,
 }
 
 impl<'gc> AttrSet<'gc> {
-    pub fn from_sorted_unchecked(entries: SmallVec<[(StringId, Value<'gc>); 4]>) -> Self {
+    pub(crate) fn from_sorted_unchecked(entries: SmallVec<[(StringId, Value<'gc>); 4]>) -> Self {
         debug_assert!(entries.is_sorted_by_key(|(key, _)| *key));
         Self { entries }
     }
 
-    pub fn lookup(&self, key: StringId) -> Option<Value<'gc>> {
+    pub(crate) fn lookup(&self, key: StringId) -> Option<Value<'gc>> {
         self.entries
             .binary_search_by_key(&key, |(k, _)| *k)
             .ok()
             .map(|i| self.entries[i].1)
     }
 
-    pub fn has(&self, key: StringId) -> bool {
+    pub(crate) fn has(&self, key: StringId) -> bool {
         self.entries.binary_search_by_key(&key, |(k, _)| *k).is_ok()
     }
 
-    pub fn merge(&self, other: &Self, mc: &Mutation<'gc>) -> Gc<'gc, Self> {
+    pub(crate) fn merge(&self, other: &Self, mc: &Mutation<'gc>) -> Gc<'gc, Self> {
         use std::cmp::Ordering::*;
 
         debug_assert!(self.entries.is_sorted_by_key(|(key, _)| *key));
@@ -527,12 +493,12 @@ impl<'gc> AttrSet<'gc> {
 #[derive(Collect, Debug, Default)]
 #[repr(transparent)]
 #[collect(no_drop)]
-pub struct List<'gc> {
+pub(crate) struct List<'gc> {
-    pub inner: RefLock<SmallVec<[Value<'gc>; 4]>>,
+    pub(crate) inner: RefLock<SmallVec<[Value<'gc>; 4]>>,
 }
 
 impl<'gc> List<'gc> {
-    pub fn new(mc: &Mutation<'gc>, data: SmallVec<[Value<'gc>; 4]>) -> Gc<'gc, Self> {
+    pub(crate) fn new(mc: &Mutation<'gc>, data: SmallVec<[Value<'gc>; 4]>) -> Gc<'gc, Self> {
         Gc::new(
             mc,
             Self {
@@ -541,7 +507,7 @@ impl<'gc> List<'gc> {
         )
     }
 
-    pub fn new_gc(mc: &Mutation<'gc>) -> Gc<'gc, Self> {
+    pub(crate) fn new_gc(mc: &Mutation<'gc>) -> Gc<'gc, Self> {
         Gc::new(mc, Self::default())
     }
 }
@@ -553,11 +519,11 @@ impl<'gc> Unlock for List<'gc> {
     }
 }
 
-pub type Thunk<'gc> = RefLock<ThunkState<'gc>>;
+pub(crate) type Thunk<'gc> = RefLock<ThunkState<'gc>>;
 
 #[derive(Collect, Debug)]
 #[collect(no_drop)]
-pub enum ThunkState<'gc> {
+pub(crate) enum ThunkState<'gc> {
     Pending { ip: usize, env: GcEnv<'gc> },
     Apply { func: Value<'gc>, arg: Value<'gc> },
     Blackhole,
@@ -566,29 +532,33 @@ pub enum ThunkState<'gc> {
 
 #[derive(Collect, Debug)]
 #[collect(no_drop)]
-pub struct Env<'gc> {
+pub(crate) struct Env<'gc> {
-    pub locals: SmallVec<[Value<'gc>; 4]>,
+    pub(crate) locals: SmallVec<[Value<'gc>; 4]>,
-    pub prev: Option<GcEnv<'gc>>,
+    pub(crate) prev: Option<GcEnv<'gc>>,
 }
-pub type GcEnv<'gc> = GcRefLock<'gc, Env<'gc>>;
+pub(crate) type GcEnv<'gc> = GcRefLock<'gc, Env<'gc>>;
 
 #[derive(Collect, Debug)]
 #[collect(no_drop)]
-pub struct WithEnv<'gc> {
+pub(crate) struct WithEnv<'gc> {
-    pub env: Value<'gc>,
+    pub(crate) env: Value<'gc>,
-    pub prev: Option<GcWithEnv<'gc>>,
+    pub(crate) prev: Option<GcWithEnv<'gc>>,
 }
-pub type GcWithEnv<'gc> = Gc<'gc, WithEnv<'gc>>;
+pub(crate) type GcWithEnv<'gc> = Gc<'gc, WithEnv<'gc>>;
 
 impl<'gc> Env<'gc> {
-    pub fn empty() -> Self {
+    pub(crate) fn empty() -> Self {
         Env {
             locals: SmallVec::new(),
             prev: None,
         }
     }
 
-    pub fn with_arg(arg: Value<'gc>, n_locals: u32, prev: Gc<'gc, RefLock<Env<'gc>>>) -> Self {
+    pub(crate) fn with_arg(
+        arg: Value<'gc>,
+        n_locals: u32,
+        prev: Gc<'gc, RefLock<Env<'gc>>>,
+    ) -> Self {
         let mut locals = smallvec::smallvec![Value::default(); 1 + n_locals as usize];
         locals[0] = arg;
         Env {
@@ -600,29 +570,29 @@ impl<'gc> Env<'gc> {
 
 #[derive(Collect, Debug)]
 #[collect(no_drop)]
-pub struct Closure<'gc> {
+pub(crate) struct Closure<'gc> {
-    pub ip: u32,
+    pub(crate) ip: u32,
-    pub n_locals: u32,
+    pub(crate) n_locals: u32,
-    pub env: Gc<'gc, RefLock<Env<'gc>>>,
+    pub(crate) env: Gc<'gc, RefLock<Env<'gc>>>,
-    pub pattern: Option<Gc<'gc, PatternInfo>>,
+    pub(crate) pattern: Option<Gc<'gc, PatternInfo>>,
 }
 
 #[derive(Collect, Debug)]
 #[collect(require_static)]
-pub struct PatternInfo {
+pub(crate) struct PatternInfo {
-    pub required: SmallVec<[StringId; 4]>,
+    pub(crate) required: SmallVec<[StringId; 4]>,
-    pub optional: SmallVec<[StringId; 4]>,
+    pub(crate) optional: SmallVec<[StringId; 4]>,
-    pub ellipsis: bool,
+    pub(crate) ellipsis: bool,
-    pub param_spans: Box<[(StringId, u32)]>,
+    pub(crate) param_spans: Box<[(StringId, u32)]>,
 }
 
 #[repr(packed, Rust)]
 #[derive(Clone, Copy, Debug, Collect)]
 #[collect(require_static)]
-pub struct PrimOp {
+pub(crate) struct PrimOp {
-    pub id: BuiltinId,
+    pub(crate) id: BuiltinId,
-    pub arity: u8,
+    pub(crate) arity: u8,
-    pub dispatch_ip: u32,
+    pub(crate) dispatch_ip: u32,
 }
 
 impl RawStore for PrimOp {
@@ -640,7 +610,7 @@ impl RawStore for PrimOp {
     fn from_val(value: &RawValue) -> Self {
         let [id, arity, bytes @ ..] = *value.data();
         Self {
-            id: BuiltinId::try_from(id).expect("invalid BuiltinId"),
+            id: BuiltinId::try_from_primitive(id).expect("invalid BuiltinId"),
             arity,
             dispatch_ip: u32::from_le_bytes(bytes),
         }
@@ -649,20 +619,20 @@ impl RawStore for PrimOp {
 
 #[derive(Collect, Debug)]
 #[collect(no_drop)]
-pub struct PrimOpApp<'gc> {
+pub(crate) struct PrimOpApp<'gc> {
-    pub primop: PrimOp,
+    pub(crate) primop: PrimOp,
-    pub arity: u8,
+    pub(crate) arity: u8,
-    pub args: [Value<'gc>; 3],
+    pub(crate) args: [Value<'gc>; 3],
 }
 
 #[derive(Copy, Clone, Default, Collect)]
 #[repr(transparent)]
 #[collect(no_drop)]
-pub struct StrictValue<'gc>(Value<'gc>);
+pub(crate) struct StrictValue<'gc>(Value<'gc>);
 
 impl<'gc> StrictValue<'gc> {
     #[inline]
-    pub fn relax(self) -> Value<'gc> {
+    pub(crate) fn relax(self) -> Value<'gc> {
         self.0
     }
 }
@@ -683,13 +653,12 @@ impl fmt::Debug for StrictValue<'_> {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Collect)]
 #[collect(require_static)]
-pub enum NixType {
+pub(crate) enum NixType {
     Int,
     Float,
     Bool,
     Null,
     String,
-    Path,
     AttrSet,
     List,
     Thunk,
@@ -707,7 +676,6 @@ impl NixType {
             Bool => "a boolean",
             Null => "null",
             String => "a string",
-            Path => "a path",
             AttrSet => "a set",
             List => "a list",
             Thunk => "a thunk",
@@ -723,8 +691,3 @@ impl std::fmt::Display for NixType {
         write!(f, "{}", self.display())
     }
 }
-
-pub enum NixNum {
-    Int(i64),
-    Float(f64),
-}

fix/Cargo.toml

@@ -3,18 +3,6 @@ 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"
 
@@ -29,24 +17,42 @@ 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 }
 
-ere = { workspace = true }
+# Memory Management
+bumpalo = { workspace = true }
 
-fix-bytecode = { path = "../fix-bytecode" }
+rnix = { workspace = true }
-fix-compiler = { path = "../fix-compiler" }
+
+ere = { workspace = true }
+ghost-cell = { workspace = true }
+
+fix-builtins = { path = "../fix-builtins" }
+fix-common = { path = "../fix-common" }
+fix-codegen = { path = "../fix-codegen" }
 fix-error = { path = "../fix-error" }
-fix-lang = { path = "../fix-lang" }
+fix-ir = { path = "../fix-ir" }
-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,13 +1,19 @@
 #![warn(clippy::unwrap_used)]
 #![allow(dead_code)]
 
-use fix_bytecode::InstructionPtr;
+use bumpalo::Bump;
-use fix_bytecode::disassembler::{Disassembler, DisassemblerContext};
+use fix_builtins::PrimOpPhase;
-use fix_compiler::{CodeState, ExtraScope};
+use fix_codegen::disassembler::{Disassembler, DisassemblerContext};
-use fix_error::{Result, Source};
+use fix_codegen::{BytecodeContext, InstructionPtr, Op};
-use fix_lang::StringId;
+use fix_common::{StringId, Symbol};
-use fix_runtime::{ForceMode, StaticValue, VmCode, VmContext, VmRuntimeCtx};
+use fix_error::{Error, Result, Source};
-use fix_vm::Vm;
+use fix_ir::downgrade::{Downgrade as _, DowngradeContext};
+use fix_ir::{
+    GhostMaybeThunkRef, GhostRoIrRef, GhostRoMaybeThunkRef, GhostRoRef, Ir, MaybeThunk, RawIrRef,
+    ThunkId,
+};
+use fix_vm::{ForceMode, StaticValue, Vm, VmCode, VmContext, VmRuntimeCtx};
+use ghost_cell::{GhostCell, GhostToken};
 use hashbrown::{HashMap, HashSet};
 use string_interner::{DefaultStringInterner, Symbol as _};
 
@@ -22,6 +28,17 @@ 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>,
+    /// Set during a compilation pass when the code is being compiled under a
+    /// `scopedImport` scope. Read by [`CompilerCtx::current_scope_slot`].
+    pub current_scope_slot: Option<u32>,
+}
+
 pub struct Evaluator {
     pub runtime: RuntimeState,
     pub code: CodeState,
@@ -36,25 +53,37 @@ impl Default for Evaluator {
 impl Evaluator {
     pub fn new() -> Self {
         let mut strings = DefaultStringInterner::new();
-        let code = CodeState::new(&mut strings);
+        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);
+        }
         Self {
             runtime: RuntimeState {
                 strings,
                 constants: Constants::default(),
             },
-            code,
+            code: CodeState {
+                sources: Vec::new(),
+                spans: Vec::new(),
+                thunk_count: 0,
+                bytecode,
+                global_env,
+                current_scope_slot: None,
+            },
         }
     }
 
-    pub fn eval(&mut self, source: Source) -> Result<fix_lang::Value> {
+    pub fn eval(&mut self, source: Source) -> Result<fix_common::Value> {
         self.do_eval(source, None, ForceMode::AsIs)
     }
 
-    pub fn eval_shallow(&mut self, source: Source) -> Result<fix_lang::Value> {
+    pub fn eval_shallow(&mut self, source: Source) -> Result<fix_common::Value> {
         self.do_eval(source, None, ForceMode::Shallow)
     }
 
-    pub fn eval_deep(&mut self, source: Source) -> Result<fix_lang::Value> {
+    pub fn eval_deep(&mut self, source: Source) -> Result<fix_common::Value> {
         self.do_eval(source, None, ForceMode::Deep)
     }
 
@@ -62,7 +91,7 @@ impl Evaluator {
         &mut self,
         source: Source,
         scope: &HashSet<StringId>,
-    ) -> Result<fix_lang::Value> {
+    ) -> Result<fix_common::Value> {
         self.do_eval(source, Some(ExtraScope::Repl(scope)), ForceMode::Shallow)
     }
 
@@ -71,10 +100,14 @@ impl Evaluator {
         source: Source,
         extra_scope: Option<ExtraScope<'ctx>>,
         force_mode: ForceMode,
-    ) -> Result<fix_lang::Value> {
+    ) -> Result<fix_common::Value> {
-        let ip = self
+        let ip = {
-            .code
+            let mut compiler = CompilerCtx {
-            .compile_bytecode(source, extra_scope, &mut self.runtime)?;
+                code: &mut self.code,
+                runtime: &mut self.runtime,
+            };
+            compiler.compile_bytecode(source, extra_scope)?
+        };
         Vm::run(self, ip, force_mode)
     }
 
@@ -83,12 +116,16 @@ impl Evaluator {
         _ident: &str,
         _expr: &str,
         _scope: &mut HashSet<StringId>,
-    ) -> Result<fix_lang::Value> {
+    ) -> Result<fix_common::Value> {
         todo!("add_binding")
     }
 
     pub fn compile_bytecode(&mut self, source: Source) -> Result<InstructionPtr> {
-        self.code.compile_bytecode(source, None, &mut self.runtime)
+        let mut compiler = CompilerCtx {
+            code: &mut self.code,
+            runtime: &mut self.runtime,
+        };
+        compiler.compile_bytecode(source, None)
     }
 
     pub fn disassemble_colored(&self, ip: InstructionPtr) -> String {
@@ -113,12 +150,151 @@ 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_vm::ExtraScope>,
+        runtime: &mut impl VmRuntimeCtx,
+    ) -> Result<InstructionPtr> {
+        let mut compiler = CompilerCtx {
+            code: self,
+            runtime,
+        };
+        let extra = extra_scope.map(|s| match s {
+            fix_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>,
@@ -140,6 +316,399 @@ 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/src/string_context.rs

@@ -0,0 +1,209 @@
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
+pub enum StringContextElem {
+    Opaque { path: String },
+    DrvDeep { drv_path: String },
+    Built { drv_path: String, output: String },
+}
+
+impl StringContextElem {
+    pub fn decode(encoded: &str) -> Self {
+        if let Some(drv_path) = encoded.strip_prefix('=') {
+            StringContextElem::DrvDeep {
+                drv_path: drv_path.to_string(),
+            }
+        } else if let Some(rest) = encoded.strip_prefix('!') {
+            if let Some(second_bang) = rest.find('!') {
+                let output = rest[..second_bang].to_string();
+                let drv_path = rest[second_bang + 1..].to_string();
+                StringContextElem::Built { drv_path, output }
+            } else {
+                StringContextElem::Opaque {
+                    path: encoded.to_string(),
+                }
+            }
+        } else {
+            StringContextElem::Opaque {
+                path: encoded.to_string(),
+            }
+        }
+    }
+}
+
+pub type InputDrvs = BTreeMap<String, BTreeSet<String>>;
+pub type Srcs = BTreeSet<String>;
+pub fn extract_input_drvs_and_srcs(context: &[String]) -> Result<(InputDrvs, Srcs), String> {
+    let mut input_drvs: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
+    let mut input_srcs: BTreeSet<String> = BTreeSet::new();
+
+    for encoded in context {
+        match StringContextElem::decode(encoded) {
+            StringContextElem::Opaque { path } => {
+                input_srcs.insert(path);
+            }
+            StringContextElem::DrvDeep { drv_path } => {
+                compute_fs_closure(&drv_path, &mut input_drvs, &mut input_srcs)?;
+            }
+            StringContextElem::Built { drv_path, output } => {
+                input_drvs.entry(drv_path).or_default().insert(output);
+            }
+        }
+    }
+
+    Ok((input_drvs, input_srcs))
+}
+
+fn compute_fs_closure(
+    drv_path: &str,
+    input_drvs: &mut BTreeMap<String, BTreeSet<String>>,
+    input_srcs: &mut BTreeSet<String>,
+) -> Result<(), String> {
+    let mut queue: VecDeque<String> = VecDeque::new();
+    let mut visited: BTreeSet<String> = BTreeSet::new();
+
+    queue.push_back(drv_path.to_string());
+
+    while let Some(current_path) = queue.pop_front() {
+        if visited.contains(&current_path) {
+            continue;
+        }
+        visited.insert(current_path.clone());
+        input_srcs.insert(current_path.clone());
+
+        if !current_path.ends_with(".drv") {
+            continue;
+        }
+
+        let content = std::fs::read_to_string(&current_path)
+            .map_err(|e| format!("failed to read derivation {}: {}", current_path, e))?;
+
+        let inputs = parse_derivation_inputs(&content)
+            .ok_or_else(|| format!("failed to parse derivation {}", current_path))?;
+
+        for src in inputs.input_srcs {
+            input_srcs.insert(src.clone());
+            if !visited.contains(&src) {
+                queue.push_back(src);
+            }
+        }
+
+        for (dep_drv, outputs) in inputs.input_drvs {
+            input_srcs.insert(dep_drv.clone());
+            let entry = input_drvs.entry(dep_drv.clone()).or_default();
+            for output in outputs {
+                entry.insert(output);
+            }
+            if !visited.contains(&dep_drv) {
+                queue.push_back(dep_drv);
+            }
+        }
+    }
+
+    Ok(())
+}
+
+struct DerivationInputs {
+    input_drvs: Vec<(String, Vec<String>)>,
+    input_srcs: Vec<String>,
+}
+
+fn parse_derivation_inputs(aterm: &str) -> Option<DerivationInputs> {
+    let aterm = aterm.strip_prefix("Derive([")?;
+
+    let mut bracket_count: i32 = 1;
+    let mut pos = 0;
+    let bytes = aterm.as_bytes();
+    while pos < bytes.len() && bracket_count > 0 {
+        match bytes[pos] {
+            b'[' => bracket_count += 1,
+            b']' => bracket_count -= 1,
+            _ => {}
+        }
+        pos += 1;
+    }
+    if bracket_count != 0 {
+        return None;
+    }
+
+    let rest = &aterm[pos..];
+    let rest = rest.strip_prefix(",[")?;
+
+    let mut input_drvs = Vec::new();
+    let mut bracket_count: i32 = 1;
+    let mut start = 0;
+    pos = 0;
+    let bytes = rest.as_bytes();
+
+    while pos < bytes.len() && bracket_count > 0 {
+        match bytes[pos] {
+            b'[' => bracket_count += 1,
+            b']' => bracket_count -= 1,
+            b'(' if bracket_count == 1 => {
+                start = pos;
+            }
+            b')' if bracket_count == 1 => {
+                let entry = &rest[start + 1..pos];
+                if let Some((drv_path, outputs)) = parse_input_drv_entry(entry) {
+                    input_drvs.push((drv_path, outputs));
+                }
+            }
+            _ => {}
+        }
+        pos += 1;
+    }
+
+    let rest = &rest[pos..];
+    let rest = rest.strip_prefix(",[")?;
+
+    let mut input_srcs = Vec::new();
+    bracket_count = 1;
+    pos = 0;
+    let bytes = rest.as_bytes();
+
+    while pos < bytes.len() && bracket_count > 0 {
+        match bytes[pos] {
+            b'[' => bracket_count += 1,
+            b']' => bracket_count -= 1,
+            b'"' if bracket_count == 1 => {
+                pos += 1;
+                let src_start = pos;
+                while pos < bytes.len() && bytes[pos] != b'"' {
+                    if bytes[pos] == b'\\' && pos + 1 < bytes.len() {
+                        pos += 2;
+                    } else {
+                        pos += 1;
+                    }
+                }
+                let src = std::str::from_utf8(&bytes[src_start..pos]).ok()?;
+                input_srcs.push(src.to_string());
+            }
+            _ => {}
+        }
+        pos += 1;
+    }
+
+    Some(DerivationInputs {
+        input_drvs,
+        input_srcs,
+    })
+}
+
+fn parse_input_drv_entry(entry: &str) -> Option<(String, Vec<String>)> {
+    let entry = entry.strip_prefix('"')?;
+    let quote_end = entry.find('"')?;
+    let drv_path = entry[..quote_end].to_string();
+
+    let rest = &entry[quote_end + 1..];
+    let rest = rest.strip_prefix(",[")?;
+    let rest = rest.strip_suffix(']')?;
+
+    let mut outputs = Vec::new();
+    for part in rest.split(',') {
+        let part = part.trim();
+        if let Some(name) = part.strip_prefix('"').and_then(|s| s.strip_suffix('"')) {
+            outputs.push(name.to_string());
+        }
+    }
+
+    Some((drv_path, outputs))
+}

fix/tests/tests/derivation.rs

@@ -1,4 +1,4 @@
-use fix_lang::Value;
+use fix_common::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_lang::Value;
+use fix_common::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,15 +45,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1778446047,
+        "lastModified": 1777369708,
-        "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=",
+        "narHash": "sha256-1xW7cRZNsFNPQD+cE0fwnLVStnDth0HSoASEIFeT7uI=",
         "owner": "nix-community",
         "repo": "bun2nix",
-        "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6",
+        "rev": "e659e1cc4b8e1b21d0aa85f1c481f9db61ecfa98",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "staging-2.1.0",
         "repo": "bun2nix",
         "type": "github"
       }
@@ -66,11 +67,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1781343250,
+        "lastModified": 1777796307,
-        "narHash": "sha256-KBJktAwDG9+10j2wMfvOVkBEhZr3yS769xoqqdFI62s=",
+        "narHash": "sha256-L7xLjorTwVf2aLu5b0ZZY2D0RFXwD/a/a/fFFDikB2w=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "aad7d8bb6936d473c2b9d1a5846a1fe1bc92767a",
+        "rev": "0f9881f2344c0b1c100bd9e774555759b7da6fd5",
         "type": "github"
       },
       "original": {
@@ -101,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778716662,
+        "lastModified": 1777678872,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16",
         "type": "github"
       },
       "original": {
@@ -126,11 +127,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1781330261,
+        "lastModified": 1777786380,
-        "narHash": "sha256-2fFAGel2VVXr5mwrTXldqXva2ng3T3HHxyuBKRIxauI=",
+        "narHash": "sha256-GGKC1WrEoTafJwIXn+fim6cZ/w1ZWVc+DUYdk2lvPvA=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "24ec6b7b1ddf8896ac8df3b65dc564575e0a1928",
+        "rev": "961b1096bc0b2ecc7096e360646cd2f29671c55e",
         "type": "github"
       },
       "original": {
@@ -141,11 +142,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781074563,
+        "lastModified": 1777578337,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
         "type": "github"
       },
       "original": {
@@ -166,11 +167,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1781294997,
+        "lastModified": 1777768857,
-        "narHash": "sha256-XjCyIvJw4JtcwItTKRdQz5h1pLF9hr8ZSYeMP+/1d3A=",
+        "narHash": "sha256-zfekJcaVctfAps1KDHwZpwkvAQn7GObRHh3Gl3xocGI=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "3f92cd1612268995d5667bd04fa03ba2916413d9",
+        "rev": "1102c0b633599564919e36076d4362d7e68dbddc",
         "type": "github"
       },
       "original": {
@@ -203,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780220602,
+        "lastModified": 1775636079,
-        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
         "type": "github"
       },
       "original": {

flake.nix

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