run with mcode

internal/bootstrap.cm

@@ -24,15 +24,21 @@ function use_basic(path) {
   return result
 }
 
-// Load a module from .mach bytecode (bootstrap modules have no source fallback)
+// Load a module from .mach/.mcode bytecode (bootstrap modules have no source fallback)
 function boot_load(name, env) {
-  var mach_path = core_path + '/' + name + ".mach"
+  var mach_path = core_path + '/' + name + ".cm.mach"
+  var mcode_path = core_path + '/' + name + ".cm.mcode"
   var data = null
+  var mcode_json = null
   if (fd.is_file(mach_path)) {
     data = fd.slurp(mach_path)
     return mach_load(data, env)
   }
-  print("error: missing bootstrap bytecode: " + mach_path + "\n")
+  if (fd.is_file(mcode_path)) {
+    mcode_json = text(fd.slurp(mcode_path))
+    return mach_eval_mcode(name, mcode_json, env)
+  }
+  print("error: missing bootstrap bytecode: " + name + "\n")
   disrupt
 }
 
@@ -50,33 +56,45 @@ use_cache['mcode'] = mcode_mod
 var streamline_mod = null
 var qbe_emit_mod = null
 
-// Warn if any .cm source is newer than its .mach bytecode
+// Warn if any .cm source is newer than its compiled bytecode
 function check_mach_stale() {
-  var pairs = [
-    ["tokenize.cm", "tokenize.mach"],
-    ["parse.cm", "parse.mach"],
-    ["fold.cm", "fold.mach"],
-    ["mcode.cm", "mcode.mach"],
-    ["streamline.cm", "streamline.mach"],
-    ["qbe.cm", "qbe.mach"],
-    ["qbe_emit.cm", "qbe_emit.mach"],
-    ["internal/bootstrap.cm", "internal/bootstrap.mach"],
-    ["internal/engine.cm", "internal/engine.mach"]
+  var sources = [
+    "tokenize.cm",
+    "parse.cm",
+    "fold.cm",
+    "mcode.cm",
+    "streamline.cm",
+    "qbe.cm",
+    "qbe_emit.cm",
+    "internal/bootstrap.cm",
+    "internal/engine.cm"
   ]
   var stale = []
   var _i = 0
   var cm_path = null
   var mach_path = null
+  var mcode_path = null
   var cm_stat = null
-  var mach_stat = null
-  while (_i < length(pairs)) {
-    cm_path = core_path + '/' + pairs[_i][0]
-    mach_path = core_path + '/' + pairs[_i][1]
-    if (fd.is_file(cm_path) && fd.is_file(mach_path)) {
+  var compiled_stat = null
+  var best_mtime = null
+  while (_i < length(sources)) {
+    cm_path = core_path + '/' + sources[_i]
+    mach_path = cm_path + '.mach'
+    mcode_path = cm_path + '.mcode'
+    best_mtime = null
+    if (fd.is_file(mach_path)) {
+      best_mtime = fd.stat(mach_path).mtime
+    }
+    if (fd.is_file(mcode_path)) {
+      compiled_stat = fd.stat(mcode_path)
+      if (best_mtime == null || compiled_stat.mtime > best_mtime) {
+        best_mtime = compiled_stat.mtime
+      }
+    }
+    if (best_mtime != null && fd.is_file(cm_path)) {
       cm_stat = fd.stat(cm_path)
-      mach_stat = fd.stat(mach_path)
-      if (cm_stat.mtime > mach_stat.mtime) {
-        push(stale, pairs[_i][0])
+      if (cm_stat.mtime > best_mtime) {
+        push(stale, sources[_i])
       }
     }
     _i = _i + 1
@@ -123,10 +141,12 @@ function analyze(src, filename) {
   return ast
 }
 
-// Load a module from .mach bytecode, falling back to source compilation
+// Load a module from .mach/.mcode bytecode, falling back to source compilation
 function load_module(name, env) {
-  var mach_path = core_path + '/' + name + ".mach"
+  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
@@ -136,6 +156,10 @@ function load_module(name, env) {
     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)
@@ -176,6 +200,8 @@ function run_ast(name, ast, env) {
 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
@@ -183,10 +209,10 @@ function use_fn(path) {
   if (use_cache[path])
     return use_cache[path]
 
-  // Try .mach bytecode first (CWD then core_path)
-  mach_path = path + '.mach'
+  // 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 + '.mach'
+    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})
@@ -194,6 +220,17 @@ function use_fn(path) {
     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))
@@ -215,14 +252,20 @@ function use_fn(path) {
 
 // Helper to load engine.cm and run it with given env
 function load_engine(env) {
-  var engine_path = core_path + '/internal/engine.mach'
+  var engine_path = core_path + '/internal/engine.cm.mach'
+  var mcode_path = core_path + '/internal/engine.cm.mcode'
   var data = null
+  var mcode_json = null
   var engine_src = null
   var engine_ast = null
   if (fd.is_file(engine_path)) {
     data = fd.slurp(engine_path)
     return mach_load(data, env)
   }
+  if (fd.is_file(mcode_path)) {
+    mcode_json = text(fd.slurp(mcode_path))
+    return mach_eval_mcode('engine', mcode_json, env)
+  }
   engine_path = core_path + '/internal/engine.cm'
   engine_src = text(fd.slurp(engine_path))
   engine_ast = analyze(engine_src, engine_path)