mach loading

internal/bootstrap.cm

@@ -65,6 +65,7 @@ function check_mach_stale() {
     "streamline.cm",
     "qbe.cm",
     "qbe_emit.cm",
+    "verify_ir.cm",
     "internal/bootstrap.cm",
     "internal/engine.cm"
   ]
@@ -140,38 +141,11 @@ function analyze(src, filename) {
   return ast
 }
 
-// Load a module from .mach/.mcode bytecode, falling back to source compilation
-function load_module(name, env) {
-  var mach_path = core_path + '/' + name + ".cm.mach"
-  var mcode_path = core_path + '/' + name + ".cm.mcode"
-  var data = null
-  var mcode_json = null
-  var src_path = null
-  var src = null
-  var ast = null
-  var compiled = null
-  var optimized = null
-  if (fd.is_file(mach_path)) {
-    data = fd.slurp(mach_path)
-    return mach_load(data, env)
-  }
-  if (fd.is_file(mcode_path)) {
-    mcode_json = text(fd.slurp(mcode_path))
-    return mach_eval_mcode(name, mcode_json, env)
-  }
-  src_path = core_path + '/' + name + ".cm"
-  src = text(fd.slurp(src_path))
-  ast = analyze(src, src_path)
-  compiled = mcode_mod(ast)
-  optimized = streamline_mod(compiled)
-  return mach_eval_mcode(name, json.encode(optimized), env)
-}
-
 // Load optimization pipeline modules (needs analyze to be defined)
-streamline_mod = load_module("streamline", boot_env)
+streamline_mod = boot_load("streamline", boot_env)
 use_cache['streamline'] = streamline_mod
 
-// Lazy-loaded verify_ir module (loaded on first use via use_fn)
+// Lazy-loaded verify_ir module (loaded on first use)
 var _verify_ir_mod = null
 
 // Run AST through mcode pipeline → register VM
@@ -179,7 +153,7 @@ function run_ast(name, ast, env) {
   var compiled = mcode_mod(ast)
   if (os._verify_ir) {
     if (_verify_ir_mod == null) {
-      _verify_ir_mod = use_fn('verify_ir')
+      _verify_ir_mod = boot_load('verify_ir', boot_env)
     }
     compiled._verify = true
     compiled._verify_mod = _verify_ir_mod
@@ -199,60 +173,6 @@ function run_ast_noopt(name, ast, env) {
   return mach_eval_mcode(name, json.encode(compiled), env)
 }
 
-// use() with ƿit pipeline for .cm modules
-function use_fn(path) {
-  var file_path = null
-  var mach_path = null
-  var mcode_path = null
-  var mcode_json = null
-  var data = null
-  var script = null
-  var ast = null
-  var result = null
-  if (use_cache[path])
-    return use_cache[path]
-
-  // Try .cm.mach bytecode first (CWD then core_path)
-  mach_path = path + '.cm.mach'
-  if (!fd.is_file(mach_path))
-    mach_path = core_path + '/' + path + '.cm.mach'
-  if (fd.is_file(mach_path)) {
-    data = fd.slurp(mach_path)
-    result = mach_load(data, {use: use_fn})
-    use_cache[path] = result
-    return result
-  }
-
-  // Try .cm.mcode JSON IR (CWD then core_path)
-  mcode_path = path + '.cm.mcode'
-  if (!fd.is_file(mcode_path))
-    mcode_path = core_path + '/' + path + '.cm.mcode'
-  if (fd.is_file(mcode_path)) {
-    mcode_json = text(fd.slurp(mcode_path))
-    result = mach_eval_mcode(path, mcode_json, {use: use_fn})
-    use_cache[path] = result
-    return result
-  }
-
-  // Try .cm source (CWD then core_path)
-  file_path = path + '.cm'
-  if (!fd.is_file(file_path))
-    file_path = core_path + '/' + path + '.cm'
-
-  if (fd.is_file(file_path)) {
-    script = text(fd.slurp(file_path))
-    ast = analyze(script, file_path)
-    result = run_ast(path, ast, {use: use_fn})
-    use_cache[path] = result
-    return result
-  }
-
-  // Fallback to embedded C module
-  result = use_embed(replace(path, '/', '_'))
-  use_cache[path] = result
-  return result
-}
-
 // Helper to load engine.cm and run it with given env
 function load_engine(env) {
   var engine_path = core_path + '/internal/engine.cm.mach'
@@ -298,13 +218,15 @@ if (args != null) {
     os: os, actorsym: actorsym,
     init: {program: program, arg: user_args},
     core_path: core_path, shop_path: shop_path, json: json,
-    analyze: analyze, run_ast_fn: run_ast, run_ast_noopt_fn: run_ast_noopt
+    analyze: analyze, run_ast_fn: run_ast, run_ast_noopt_fn: run_ast_noopt,
+    use_cache: use_cache
   })
 } else {
   // Actor spawn mode — load engine.cm with full actor env
   load_engine({
     os: os, actorsym: actorsym, init: init,
     core_path: core_path, shop_path: shop_path, json: json, nota: nota, wota: wota,
-    analyze: analyze, run_ast_fn: run_ast, run_ast_noopt_fn: run_ast_noopt
+    analyze: analyze, run_ast_fn: run_ast, run_ast_noopt_fn: run_ast_noopt,
+    use_cache: use_cache
   })
 }