new path

internal/bootstrap.cm

@@ -1,5 +1,5 @@
 // Hidden vars come from env:
-//   CLI mode (cell_init):       os, args, core_path, shop_path, use_mcode
+//   CLI mode (cell_init):       os, args, core_path, shop_path, emit_qbe
 //   Actor spawn (script_startup): os, json, nota, wota, actorsym, init, core_path, shop_path
 // args[0] = script name, args[1..] = user args
 var load_internal = os.load_internal
@@ -45,14 +45,11 @@ use_cache['tokenize'] = tokenize_mod
 use_cache['parse'] = parse_mod
 use_cache['fold'] = fold_mod
 
-// Optionally load mcode compiler module
-var mcode_mod = null
+// Always load mcode compiler module
+var mcode_mod = boot_load("mcode", boot_env)
+use_cache['mcode'] = mcode_mod
 var streamline_mod = null
 var qbe_emit_mod = null
-if (use_mcode) {
-  mcode_mod = boot_load("mcode", boot_env)
-  use_cache['mcode'] = mcode_mod
-}
 
 // Warn if any .cm source is newer than its .mach bytecode
 function check_mach_stale() {
@@ -146,33 +143,26 @@ function load_module(name, env) {
 
 // Load optimization pipeline modules (needs analyze to be defined)
 var qbe_macros = null
-if (use_mcode) {
-  streamline_mod = load_module("streamline", boot_env)
-  use_cache['streamline'] = streamline_mod
-  if (emit_qbe) {
-    qbe_macros = load_module("qbe", boot_env)
-    qbe_emit_mod = load_module("qbe_emit", boot_env)
-    use_cache['qbe'] = qbe_macros
-    use_cache['qbe_emit'] = qbe_emit_mod
-  }
+streamline_mod = load_module("streamline", boot_env)
+use_cache['streamline'] = streamline_mod
+if (emit_qbe) {
+  qbe_macros = load_module("qbe", boot_env)
+  qbe_emit_mod = load_module("qbe_emit", boot_env)
+  use_cache['qbe'] = qbe_macros
+  use_cache['qbe_emit'] = qbe_emit_mod
 }
 
-// Run AST through either mcode or mach pipeline
+// Run AST through mcode pipeline → register VM
 function run_ast(name, ast, env) {
-  var compiled = null
-  var optimized = null
+  var compiled = mcode_mod(ast)
+  var optimized = streamline_mod(compiled)
   var qbe_il = null
-  if (use_mcode) {
-    compiled = mcode_mod(ast)
-    optimized = streamline_mod(compiled)
-    if (emit_qbe) {
-      qbe_il = qbe_emit_mod(optimized, qbe_macros)
-      print(qbe_il)
-      return null
-    }
-    return mcode_run(name, json.encode(optimized), env)
+  if (emit_qbe) {
+    qbe_il = qbe_emit_mod(optimized, qbe_macros)
+    print(qbe_il)
+    return null
   }
-  return mach_eval_ast(name, json.encode(ast), env)
+  return mach_eval_mcode(name, json.encode(optimized), env)
 }
 
 // use() with ƿit pipeline for .cm modules