2025-08-14 13:16:12 +00:00
|
|
|
/*!
|
|
|
|
|
* Execution Runner Module - Nyash File and Mode Execution Coordinator
|
|
|
|
|
*
|
|
|
|
|
* This module handles all execution logic, backend selection, and mode coordination,
|
|
|
|
|
* separated from CLI parsing and the main entry point.
|
|
|
|
|
*/
|
|
|
|
|
|
2025-08-19 05:36:01 +09:00
|
|
|
use nyash_rust::cli::CliConfig;
|
2025-09-16 06:13:44 +09:00
|
|
|
// prune heavy unused imports here; modules import what they need locally
|
|
|
|
|
// pruned unused runtime imports in this module
|
2025-08-18 09:14:39 +00:00
|
|
|
|
2025-08-19 16:48:45 +09:00
|
|
|
#[cfg(feature = "wasm-backend")]
|
|
|
|
|
use nyash_rust::backend::{wasm::WasmBackend, aot::AotBackend};
|
|
|
|
|
|
2025-09-14 00:44:28 +09:00
|
|
|
#[cfg(feature = "llvm-inkwell-legacy")]
|
2025-08-19 05:36:01 +09:00
|
|
|
use nyash_rust::backend::{llvm_compile_and_execute};
|
2025-08-14 13:16:12 +00:00
|
|
|
use std::{fs, process};
|
2025-08-26 04:34:14 +09:00
|
|
|
mod modes;
|
2025-09-03 01:37:38 +09:00
|
|
|
mod demos;
|
2025-09-05 13:29:17 +09:00
|
|
|
mod json_v0_bridge;
|
2025-09-14 04:51:33 +09:00
|
|
|
mod mir_json_emit;
|
2025-09-16 00:01:31 +09:00
|
|
|
mod pipe_io;
|
|
|
|
|
mod pipeline;
|
2025-09-16 01:54:00 +09:00
|
|
|
mod tasks;
|
|
|
|
|
mod build;
|
2025-09-16 00:01:31 +09:00
|
|
|
mod dispatch;
|
|
|
|
|
mod selfhost;
|
2025-08-14 13:16:12 +00:00
|
|
|
|
2025-08-19 05:16:40 +09:00
|
|
|
// v2 plugin system imports
|
2025-08-26 04:34:14 +09:00
|
|
|
use nyash_rust::runtime;
|
|
|
|
|
use nyash_rust::runner_plugin_init;
|
2025-09-16 03:54:44 +09:00
|
|
|
// use std::path::PathBuf; // not used in current runner
|
2025-08-18 11:07:03 +09:00
|
|
|
|
2025-09-08 04:35:50 +09:00
|
|
|
/// Resolve a using target according to priority: modules > relative > using-paths
|
|
|
|
|
/// Returns Ok(resolved_path_or_token). On strict mode, ambiguous matches cause error.
|
2025-09-16 01:54:00 +09:00
|
|
|
use pipeline::resolve_using_target;
|
2025-09-08 04:35:50 +09:00
|
|
|
|
2025-08-14 13:16:12 +00:00
|
|
|
/// Main execution coordinator
|
|
|
|
|
pub struct NyashRunner {
|
|
|
|
|
config: CliConfig,
|
|
|
|
|
}
|
|
|
|
|
|
2025-09-01 23:44:34 +09:00
|
|
|
/// Minimal task runner: read nyash.toml [env] and [tasks], run the named task via shell
|
2025-09-16 01:54:00 +09:00
|
|
|
use tasks::run_named_task;
|
2025-09-01 23:44:34 +09:00
|
|
|
|
2025-08-14 13:16:12 +00:00
|
|
|
impl NyashRunner {
|
|
|
|
|
/// Create a new runner with the given configuration
|
|
|
|
|
pub fn new(config: CliConfig) -> Self {
|
|
|
|
|
Self { config }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Run Nyash based on the configuration
|
|
|
|
|
pub fn run(&self) {
|
2025-09-06 16:53:12 +09:00
|
|
|
// Build system (MVP): nyash --build <nyash.toml>
|
|
|
|
|
if let Some(cfg_path) = self.config.build_path.clone() {
|
|
|
|
|
if let Err(e) = self.run_build_mvp(&cfg_path) {
|
|
|
|
|
eprintln!("❌ build error: {}", e);
|
|
|
|
|
std::process::exit(1);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
2025-09-16 00:01:31 +09:00
|
|
|
// Using/module overrides pre-processing
|
|
|
|
|
let mut using_ctx = self.init_using_context();
|
2025-09-16 03:54:44 +09:00
|
|
|
let pending_using: Vec<(String, Option<String>)> = Vec::new();
|
2025-09-16 00:01:31 +09:00
|
|
|
for (ns, path) in using_ctx.pending_modules.iter() {
|
2025-09-08 11:20:13 +09:00
|
|
|
let sb = crate::box_trait::StringBox::new(path.clone());
|
|
|
|
|
crate::runtime::modules_registry::set(ns.clone(), Box::new(sb));
|
|
|
|
|
}
|
2025-09-08 04:35:50 +09:00
|
|
|
// Stage-1: Optional dependency tree bridge (log-only)
|
|
|
|
|
if let Ok(dep_path) = std::env::var("NYASH_DEPS_JSON") {
|
|
|
|
|
match std::fs::read_to_string(&dep_path) {
|
|
|
|
|
Ok(s) => {
|
|
|
|
|
let bytes = s.as_bytes().len();
|
|
|
|
|
// Try to extract quick hints without failing
|
|
|
|
|
let mut root_info = String::new();
|
|
|
|
|
if let Ok(v) = serde_json::from_str::<serde_json::Value>(&s) {
|
|
|
|
|
if let Some(r) = v.get("root_path").and_then(|x| x.as_str()) { root_info = format!(" root='{}'", r); }
|
|
|
|
|
}
|
|
|
|
|
eprintln!("[deps] loaded {} bytes from{} {}", bytes, if root_info.is_empty(){""} else {":"}, root_info);
|
|
|
|
|
}
|
|
|
|
|
Err(e) => {
|
|
|
|
|
eprintln!("[deps] read error: {}", e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-09-05 13:29:17 +09:00
|
|
|
// Phase-15: JSON IR v0 bridge (stdin/file)
|
2025-09-16 00:01:31 +09:00
|
|
|
if self.try_run_json_v0_pipe() { return; }
|
2025-09-01 23:44:34 +09:00
|
|
|
// Run named task from nyash.toml (MVP)
|
|
|
|
|
if let Some(task) = self.config.run_task.clone() {
|
|
|
|
|
if let Err(e) = run_named_task(&task) {
|
|
|
|
|
eprintln!("❌ Task error: {}", e);
|
|
|
|
|
process::exit(1);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
2025-08-29 23:11:21 +09:00
|
|
|
// Verbose CLI flag maps to env for downstream helpers/scripts
|
|
|
|
|
if self.config.cli_verbose { std::env::set_var("NYASH_CLI_VERBOSE", "1"); }
|
2025-08-29 21:39:47 +09:00
|
|
|
// Script-level env directives (special comments) — parse early
|
|
|
|
|
// Supported:
|
|
|
|
|
// // @env KEY=VALUE
|
|
|
|
|
// // @jit-debug (preset: exec, threshold=1, events+trace)
|
|
|
|
|
// // @plugin-builtins (NYASH_USE_PLUGIN_BUILTINS=1)
|
|
|
|
|
if let Some(ref filename) = self.config.file {
|
|
|
|
|
if let Ok(code) = fs::read_to_string(filename) {
|
|
|
|
|
// Scan first 128 lines for directives
|
|
|
|
|
for (i, line) in code.lines().take(128).enumerate() {
|
|
|
|
|
let l = line.trim();
|
|
|
|
|
if !(l.starts_with("//") || l.starts_with("#!") || l.is_empty()) {
|
|
|
|
|
// Stop early at first non-comment line to avoid scanning full file
|
|
|
|
|
if i > 0 { break; }
|
|
|
|
|
}
|
|
|
|
|
// Shebang with envs: handled by shell normally; keep placeholder
|
|
|
|
|
if let Some(rest) = l.strip_prefix("//") { let rest = rest.trim();
|
|
|
|
|
if let Some(dir) = rest.strip_prefix("@env ") {
|
|
|
|
|
if let Some((k,v)) = dir.split_once('=') {
|
|
|
|
|
let key = k.trim(); let val = v.trim();
|
|
|
|
|
if !key.is_empty() { std::env::set_var(key, val); }
|
|
|
|
|
}
|
|
|
|
|
} else if rest == "@jit-debug" {
|
|
|
|
|
std::env::set_var("NYASH_JIT_EXEC", "1");
|
|
|
|
|
std::env::set_var("NYASH_JIT_THRESHOLD", "1");
|
|
|
|
|
std::env::set_var("NYASH_JIT_EVENTS", "1");
|
|
|
|
|
std::env::set_var("NYASH_JIT_EVENTS_COMPILE", "1");
|
|
|
|
|
std::env::set_var("NYASH_JIT_EVENTS_RUNTIME", "1");
|
|
|
|
|
std::env::set_var("NYASH_JIT_SHIM_TRACE", "1");
|
|
|
|
|
} else if rest == "@plugin-builtins" {
|
|
|
|
|
std::env::set_var("NYASH_USE_PLUGIN_BUILTINS", "1");
|
|
|
|
|
} else if rest == "@jit-strict" {
|
|
|
|
|
std::env::set_var("NYASH_JIT_STRICT", "1");
|
|
|
|
|
std::env::set_var("NYASH_JIT_ARGS_HANDLE_ONLY", "1");
|
2025-08-29 23:11:21 +09:00
|
|
|
// In strict mode, default to JIT-only (no VM fallback)
|
|
|
|
|
if std::env::var("NYASH_JIT_ONLY").ok().is_none() { std::env::set_var("NYASH_JIT_ONLY", "1"); }
|
2025-08-29 21:39:47 +09:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-09-08 04:35:50 +09:00
|
|
|
|
|
|
|
|
// Env overrides for using rules
|
2025-09-16 00:01:31 +09:00
|
|
|
// Merge late env overrides (if any)
|
2025-09-08 04:35:50 +09:00
|
|
|
if let Ok(paths) = std::env::var("NYASH_USING_PATH") {
|
2025-09-16 00:01:31 +09:00
|
|
|
for p in paths.split(':') { let p = p.trim(); if !p.is_empty() { using_ctx.using_paths.push(p.to_string()); } }
|
2025-09-08 04:35:50 +09:00
|
|
|
}
|
|
|
|
|
if let Ok(mods) = std::env::var("NYASH_MODULES") {
|
|
|
|
|
for ent in mods.split(',') {
|
|
|
|
|
if let Some((k,v)) = ent.split_once('=') {
|
|
|
|
|
let k = k.trim(); let v = v.trim();
|
2025-09-16 00:01:31 +09:00
|
|
|
if !k.is_empty() && !v.is_empty() { using_ctx.pending_modules.push((k.to_string(), v.to_string())); }
|
2025-09-08 04:35:50 +09:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Apply pending modules to registry as StringBox (path or ns token)
|
2025-09-16 00:01:31 +09:00
|
|
|
for (ns, path) in using_ctx.pending_modules.iter() {
|
2025-09-08 04:35:50 +09:00
|
|
|
let sb = nyash_rust::box_trait::StringBox::new(path.clone());
|
|
|
|
|
nyash_rust::runtime::modules_registry::set(ns.clone(), Box::new(sb));
|
|
|
|
|
}
|
|
|
|
|
// Resolve pending using with clear precedence and ambiguity handling
|
|
|
|
|
let strict = std::env::var("NYASH_USING_STRICT").ok().as_deref() == Some("1");
|
|
|
|
|
let verbose = std::env::var("NYASH_CLI_VERBOSE").ok().as_deref() == Some("1");
|
|
|
|
|
let ctx = std::path::Path::new(filename).parent();
|
|
|
|
|
for (ns, alias) in pending_using.iter() {
|
2025-09-16 00:01:31 +09:00
|
|
|
let value = match resolve_using_target(ns, false, &using_ctx.pending_modules, &using_ctx.using_paths, ctx, strict, verbose) {
|
2025-09-08 04:35:50 +09:00
|
|
|
Ok(v) => v,
|
|
|
|
|
Err(e) => { eprintln!("❌ using: {}", e); std::process::exit(1); }
|
|
|
|
|
};
|
|
|
|
|
let sb = nyash_rust::box_trait::StringBox::new(value.clone());
|
|
|
|
|
nyash_rust::runtime::modules_registry::set(ns.clone(), Box::new(sb));
|
|
|
|
|
if let Some(a) = alias {
|
|
|
|
|
let sb2 = nyash_rust::box_trait::StringBox::new(value);
|
|
|
|
|
nyash_rust::runtime::modules_registry::set(a.clone(), Box::new(sb2));
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-08-29 21:39:47 +09:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If strict mode requested via env, ensure handle-only shim behavior is enabled
|
|
|
|
|
if std::env::var("NYASH_JIT_STRICT").ok().as_deref() == Some("1") {
|
|
|
|
|
if std::env::var("NYASH_JIT_ARGS_HANDLE_ONLY").ok().is_none() {
|
|
|
|
|
std::env::set_var("NYASH_JIT_ARGS_HANDLE_ONLY", "1");
|
|
|
|
|
}
|
2025-08-29 23:11:21 +09:00
|
|
|
// Enforce JIT-only by default in strict mode unless explicitly overridden
|
|
|
|
|
if std::env::var("NYASH_JIT_ONLY").ok().is_none() {
|
|
|
|
|
std::env::set_var("NYASH_JIT_ONLY", "1");
|
|
|
|
|
}
|
2025-08-29 21:39:47 +09:00
|
|
|
}
|
|
|
|
|
|
2025-08-19 16:48:45 +09:00
|
|
|
// 🏭 Phase 9.78b: Initialize unified registry
|
2025-08-19 16:56:44 +09:00
|
|
|
runtime::init_global_unified_registry();
|
2025-08-19 16:48:45 +09:00
|
|
|
|
2025-08-18 11:07:03 +09:00
|
|
|
// Try to initialize BID plugins from nyash.toml (best-effort)
|
2025-08-26 05:49:23 +09:00
|
|
|
// Allow disabling during snapshot/CI via NYASH_DISABLE_PLUGINS=1
|
|
|
|
|
if std::env::var("NYASH_DISABLE_PLUGINS").ok().as_deref() != Some("1") {
|
|
|
|
|
runner_plugin_init::init_bid_plugins();
|
|
|
|
|
}
|
2025-09-05 13:29:17 +09:00
|
|
|
// Allow interpreter to create plugin-backed boxes via unified registry
|
|
|
|
|
// Opt-in by default for FileBox/TOMLBox which are required by ny-config and similar tools.
|
|
|
|
|
if std::env::var("NYASH_USE_PLUGIN_BUILTINS").ok().is_none() {
|
|
|
|
|
std::env::set_var("NYASH_USE_PLUGIN_BUILTINS", "1");
|
|
|
|
|
}
|
|
|
|
|
// Merge FileBox,TOMLBox with defaults if present
|
|
|
|
|
let mut override_types: Vec<String> = if let Ok(list) = std::env::var("NYASH_PLUGIN_OVERRIDE_TYPES") {
|
|
|
|
|
list.split(',').map(|s| s.trim().to_string()).filter(|s| !s.is_empty()).collect()
|
|
|
|
|
} else {
|
|
|
|
|
vec!["ArrayBox".into(), "MapBox".into()]
|
|
|
|
|
};
|
|
|
|
|
for t in ["FileBox", "TOMLBox"] { if !override_types.iter().any(|x| x==t) { override_types.push(t.into()); } }
|
|
|
|
|
std::env::set_var("NYASH_PLUGIN_OVERRIDE_TYPES", override_types.join(","));
|
|
|
|
|
|
|
|
|
|
// Opt-in: load Ny script plugins listed in nyash.toml [ny_plugins]
|
|
|
|
|
if self.config.load_ny_plugins || std::env::var("NYASH_LOAD_NY_PLUGINS").ok().as_deref() == Some("1") {
|
|
|
|
|
if let Ok(text) = std::fs::read_to_string("nyash.toml") {
|
|
|
|
|
if let Ok(doc) = toml::from_str::<toml::Value>(&text) {
|
|
|
|
|
if let Some(np) = doc.get("ny_plugins") {
|
|
|
|
|
let mut list: Vec<String> = Vec::new();
|
|
|
|
|
if let Some(arr) = np.as_array() {
|
|
|
|
|
for v in arr { if let Some(s) = v.as_str() { list.push(s.to_string()); } }
|
|
|
|
|
} else if let Some(tbl) = np.as_table() {
|
|
|
|
|
for (_k, v) in tbl { if let Some(s) = v.as_str() { list.push(s.to_string()); }
|
|
|
|
|
else if let Some(arr) = v.as_array() { for e in arr { if let Some(s) = e.as_str() { list.push(s.to_string()); } } }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if !list.is_empty() {
|
|
|
|
|
let list_only = std::env::var("NYASH_NY_PLUGINS_LIST_ONLY").ok().as_deref() == Some("1");
|
|
|
|
|
println!("🧩 Ny script plugins ({}):", list.len());
|
|
|
|
|
for p in list {
|
|
|
|
|
if list_only {
|
|
|
|
|
println!(" • {}", p);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// Execute each script best-effort via interpreter
|
|
|
|
|
match std::fs::read_to_string(&p) {
|
|
|
|
|
Ok(code) => {
|
|
|
|
|
match nyash_rust::parser::NyashParser::parse_from_string(&code) {
|
|
|
|
|
Ok(ast) => {
|
|
|
|
|
let mut interpreter = nyash_rust::interpreter::NyashInterpreter::new();
|
|
|
|
|
match interpreter.execute(ast) {
|
|
|
|
|
Ok(_) => println!("[ny_plugins] {}: OK", p),
|
|
|
|
|
Err(e) => {
|
|
|
|
|
println!("[ny_plugins] {}: FAIL ({})", p, e);
|
|
|
|
|
// continue to next
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Err(e) => {
|
|
|
|
|
println!("[ny_plugins] {}: FAIL (parse: {})", p, e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Err(e) => {
|
|
|
|
|
println!("[ny_plugins] {}: FAIL (read: {})", p, e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-08-23 03:40:17 +09:00
|
|
|
|
|
|
|
|
// Optional: enable VM stats via CLI flags
|
|
|
|
|
if self.config.vm_stats {
|
|
|
|
|
std::env::set_var("NYASH_VM_STATS", "1");
|
|
|
|
|
}
|
|
|
|
|
if self.config.vm_stats_json {
|
|
|
|
|
// Prefer explicit JSON flag over any default
|
|
|
|
|
std::env::set_var("NYASH_VM_STATS_JSON", "1");
|
|
|
|
|
}
|
2025-08-28 09:26:58 +09:00
|
|
|
// Optional: JIT controls via CLI flags (centralized)
|
|
|
|
|
{
|
2025-08-29 02:05:39 +09:00
|
|
|
// CLI opt-in for JSONL events
|
|
|
|
|
if self.config.jit_events { std::env::set_var("NYASH_JIT_EVENTS", "1"); }
|
|
|
|
|
if self.config.jit_events_compile { std::env::set_var("NYASH_JIT_EVENTS_COMPILE", "1"); }
|
|
|
|
|
if self.config.jit_events_runtime { std::env::set_var("NYASH_JIT_EVENTS_RUNTIME", "1"); }
|
|
|
|
|
if let Some(ref p) = self.config.jit_events_path { std::env::set_var("NYASH_JIT_EVENTS_PATH", p); }
|
2025-08-28 09:26:58 +09:00
|
|
|
let mut jc = nyash_rust::jit::config::JitConfig::from_env();
|
|
|
|
|
jc.exec |= self.config.jit_exec;
|
|
|
|
|
jc.stats |= self.config.jit_stats;
|
|
|
|
|
jc.stats_json |= self.config.jit_stats_json;
|
|
|
|
|
jc.dump |= self.config.jit_dump;
|
|
|
|
|
if self.config.jit_threshold.is_some() { jc.threshold = self.config.jit_threshold; }
|
|
|
|
|
jc.phi_min |= self.config.jit_phi_min;
|
|
|
|
|
jc.hostcall |= self.config.jit_hostcall;
|
|
|
|
|
jc.handle_debug |= self.config.jit_handle_debug;
|
|
|
|
|
jc.native_f64 |= self.config.jit_native_f64;
|
|
|
|
|
jc.native_bool |= self.config.jit_native_bool;
|
2025-08-29 02:05:39 +09:00
|
|
|
// If observability is enabled and no threshold is provided, force threshold=1 so lowering runs and emits events
|
|
|
|
|
let events_on = std::env::var("NYASH_JIT_EVENTS").ok().as_deref() == Some("1")
|
|
|
|
|
|| std::env::var("NYASH_JIT_EVENTS_COMPILE").ok().as_deref() == Some("1")
|
|
|
|
|
|| std::env::var("NYASH_JIT_EVENTS_RUNTIME").ok().as_deref() == Some("1");
|
|
|
|
|
if events_on && jc.threshold.is_none() { jc.threshold = Some(1); }
|
2025-08-28 09:26:58 +09:00
|
|
|
if self.config.jit_only { std::env::set_var("NYASH_JIT_ONLY", "1"); }
|
|
|
|
|
// Apply runtime capability probe (e.g., disable b1 ABI if unsupported)
|
|
|
|
|
let caps = nyash_rust::jit::config::probe_capabilities();
|
|
|
|
|
jc = nyash_rust::jit::config::apply_runtime_caps(jc, caps);
|
|
|
|
|
// Optional DOT emit via CLI (ensures dump is on when path specified)
|
|
|
|
|
if let Some(path) = &self.config.emit_cfg {
|
|
|
|
|
std::env::set_var("NYASH_JIT_DOT", path);
|
|
|
|
|
jc.dump = true;
|
|
|
|
|
}
|
|
|
|
|
// Persist to env (CLI parity) and set as current
|
|
|
|
|
jc.apply_env();
|
|
|
|
|
nyash_rust::jit::config::set_current(jc.clone());
|
|
|
|
|
}
|
2025-08-29 23:11:21 +09:00
|
|
|
// Architectural pivot: JIT is compiler-only (EXE/AOT). Ensure VM runtime does not dispatch to JIT
|
|
|
|
|
// unless explicitly requested via independent JIT mode, or when emitting AOT objects.
|
|
|
|
|
if !self.config.compile_native && !self.config.jit_direct {
|
|
|
|
|
// When AOT object emission is requested, allow JIT to run for object generation
|
|
|
|
|
let aot_obj = std::env::var("NYASH_AOT_OBJECT_OUT").ok();
|
|
|
|
|
if aot_obj.is_none() || aot_obj.as_deref() == Some("") {
|
|
|
|
|
// Force-disable runtime JIT execution path for VM/Interpreter flows
|
|
|
|
|
std::env::set_var("NYASH_JIT_EXEC", "0");
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-08-14 13:16:12 +00:00
|
|
|
// Benchmark mode - can run without a file
|
|
|
|
|
if self.config.benchmark {
|
|
|
|
|
println!("📊 Nyash Performance Benchmark Suite");
|
|
|
|
|
println!("====================================");
|
|
|
|
|
println!("Running {} iterations per test...", self.config.iterations);
|
|
|
|
|
println!();
|
|
|
|
|
|
|
|
|
|
self.execute_benchmark_mode();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(ref filename) = self.config.file {
|
2025-08-28 09:26:58 +09:00
|
|
|
// Independent JIT direct mode (no VM execute path)
|
|
|
|
|
if self.config.jit_direct {
|
|
|
|
|
self.run_file_jit_direct(filename);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2025-08-26 04:42:52 +09:00
|
|
|
// Delegate file-mode execution to modes::common dispatcher
|
|
|
|
|
self.run_file(filename);
|
2025-08-14 13:16:12 +00:00
|
|
|
} else {
|
2025-09-16 01:54:00 +09:00
|
|
|
demos::run_all_demos();
|
2025-08-14 13:16:12 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-08-26 04:34:14 +09:00
|
|
|
// init_bid_plugins moved to runner_plugin_init.rs
|
2025-08-18 11:07:03 +09:00
|
|
|
|
2025-08-14 13:16:12 +00:00
|
|
|
/// Execute file-based mode with backend selection
|
2025-09-16 03:54:44 +09:00
|
|
|
pub(crate) fn run_file(&self, filename: &str) {
|
|
|
|
|
dispatch::execute_file_with_backend(self, filename);
|
2025-08-14 13:16:12 +00:00
|
|
|
}
|
2025-09-05 13:29:17 +09:00
|
|
|
|
2025-09-16 01:54:00 +09:00
|
|
|
/// Minimal AOT build pipeline driven by nyash.toml (mvp)
|
2025-09-06 16:53:12 +09:00
|
|
|
fn run_build_mvp(&self, cfg_path: &str) -> Result<(), String> {
|
2025-09-16 01:54:00 +09:00
|
|
|
build::run_build_mvp_impl(self, cfg_path)
|
2025-09-06 16:53:12 +09:00
|
|
|
}
|
2025-08-14 13:16:12 +00:00
|
|
|
}
|
|
|
|
|
|
2025-08-28 09:26:58 +09:00
|
|
|
impl NyashRunner {
|
|
|
|
|
/// Run a file through independent JIT engine (no VM execute loop)
|
|
|
|
|
fn run_file_jit_direct(&self, filename: &str) {
|
|
|
|
|
use std::fs;
|
|
|
|
|
use nyash_rust::{parser::NyashParser, mir::MirCompiler};
|
|
|
|
|
// Small helper for unified error output (text or JSON)
|
|
|
|
|
let emit_err = |phase: &str, code: &str, msg: &str| {
|
|
|
|
|
if std::env::var("NYASH_JIT_STATS_JSON").ok().as_deref() == Some("1")
|
|
|
|
|
|| std::env::var("NYASH_JIT_ERROR_JSON").ok().as_deref() == Some("1") {
|
|
|
|
|
let payload = serde_json::json!({
|
|
|
|
|
"kind": "jit_direct_error",
|
|
|
|
|
"phase": phase,
|
|
|
|
|
"code": code,
|
|
|
|
|
"message": msg,
|
|
|
|
|
"file": filename,
|
|
|
|
|
});
|
|
|
|
|
println!("{}", payload.to_string());
|
|
|
|
|
} else {
|
|
|
|
|
eprintln!("[JIT-direct][{}][{}] {}", phase, code, msg);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
// Require cranelift feature at runtime by attempting compile; if unavailable compile_function returns None
|
|
|
|
|
let code = match fs::read_to_string(filename) {
|
|
|
|
|
Ok(s) => s,
|
|
|
|
|
Err(e) => { emit_err("read_file", "IO", &format!("{}", e)); std::process::exit(1); }
|
|
|
|
|
};
|
|
|
|
|
let ast = match NyashParser::parse_from_string(&code) {
|
|
|
|
|
Ok(a) => a, Err(e) => { emit_err("parse", "SYNTAX", &format!("{}", e)); std::process::exit(1); }
|
|
|
|
|
};
|
|
|
|
|
let mut mc = MirCompiler::new();
|
|
|
|
|
let cr = match mc.compile(ast) { Ok(m) => m, Err(e) => { emit_err("mir", "MIR_COMPILE", &format!("{}", e)); std::process::exit(1); } };
|
|
|
|
|
let func = match cr.module.functions.get("main") { Some(f) => f, None => { emit_err("mir", "NO_MAIN", "No main function found"); std::process::exit(1); } };
|
|
|
|
|
|
|
|
|
|
// Guard: refuse write-effects in jit-direct when policy.read_only
|
|
|
|
|
{
|
|
|
|
|
use nyash_rust::mir::effect::Effect;
|
|
|
|
|
let policy = nyash_rust::jit::policy::current();
|
|
|
|
|
let mut writes = 0usize;
|
|
|
|
|
for (_bbid, bb) in func.blocks.iter() {
|
|
|
|
|
for inst in bb.instructions.iter() {
|
|
|
|
|
let mask = inst.effects();
|
|
|
|
|
if mask.contains(Effect::WriteHeap) {
|
|
|
|
|
writes += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if let Some(term) = &bb.terminator {
|
|
|
|
|
if term.effects().contains(Effect::WriteHeap) { writes += 1; }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if policy.read_only && writes > 0 {
|
|
|
|
|
emit_err("policy", "WRITE_EFFECTS", &format!("write-effects detected ({} ops). jit-direct is read-only at this stage.", writes));
|
|
|
|
|
std::process::exit(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-09-01 23:44:34 +09:00
|
|
|
// jit-direct 安定化: 分岐合流(PHI)は明示ブロック引数で配線
|
|
|
|
|
{
|
|
|
|
|
let mut cfg = nyash_rust::jit::config::current();
|
|
|
|
|
cfg.phi_min = true; // enable multi-PHI arg passing/join
|
|
|
|
|
nyash_rust::jit::config::set_current(cfg);
|
|
|
|
|
}
|
|
|
|
|
// Prepare minimal runtime hooks so JIT externs (checkpoint/await) can reach GC/scheduler
|
|
|
|
|
{
|
|
|
|
|
let rt = nyash_rust::runtime::NyashRuntime::new();
|
|
|
|
|
nyash_rust::runtime::global_hooks::set_from_runtime(&rt);
|
|
|
|
|
}
|
2025-08-28 09:26:58 +09:00
|
|
|
let mut engine = nyash_rust::jit::engine::JitEngine::new();
|
|
|
|
|
match engine.compile_function("main", func) {
|
|
|
|
|
Some(h) => {
|
|
|
|
|
// Optional event: compile
|
|
|
|
|
nyash_rust::jit::events::emit("compile", &func.signature.name, Some(h), None, serde_json::json!({}));
|
|
|
|
|
// Parse JIT args from env: NYASH_JIT_ARGS (comma-separated), with optional type prefixes
|
|
|
|
|
// Formats per arg: i:123, f:3.14, b:true/false, h:42 (handle), or bare numbers (int), true/false (bool)
|
|
|
|
|
let mut jit_args: Vec<nyash_rust::jit::abi::JitValue> = Vec::new();
|
|
|
|
|
if let Ok(s) = std::env::var("NYASH_JIT_ARGS") {
|
|
|
|
|
for raw in s.split(',') {
|
|
|
|
|
let t = raw.trim();
|
|
|
|
|
if t.is_empty() { continue; }
|
|
|
|
|
let v = if let Some(rest) = t.strip_prefix("i:") {
|
|
|
|
|
rest.parse::<i64>().ok().map(nyash_rust::jit::abi::JitValue::I64)
|
|
|
|
|
} else if let Some(rest) = t.strip_prefix("f:") {
|
|
|
|
|
rest.parse::<f64>().ok().map(nyash_rust::jit::abi::JitValue::F64)
|
|
|
|
|
} else if let Some(rest) = t.strip_prefix("b:") {
|
|
|
|
|
let b = matches!(rest, "1"|"true"|"True"|"TRUE");
|
|
|
|
|
Some(nyash_rust::jit::abi::JitValue::Bool(b))
|
|
|
|
|
} else if let Some(rest) = t.strip_prefix("h:") {
|
|
|
|
|
rest.parse::<u64>().ok().map(nyash_rust::jit::abi::JitValue::Handle)
|
|
|
|
|
} else if t.eq_ignore_ascii_case("true") || t == "1" { Some(nyash_rust::jit::abi::JitValue::Bool(true)) }
|
|
|
|
|
else if t.eq_ignore_ascii_case("false") || t == "0" { Some(nyash_rust::jit::abi::JitValue::Bool(false)) }
|
|
|
|
|
else if let Ok(iv) = t.parse::<i64>() { Some(nyash_rust::jit::abi::JitValue::I64(iv)) }
|
|
|
|
|
else if let Ok(fv) = t.parse::<f64>() { Some(nyash_rust::jit::abi::JitValue::F64(fv)) }
|
|
|
|
|
else { None };
|
|
|
|
|
if let Some(jv) = v { jit_args.push(jv); }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Coerce args to expected MIR types
|
|
|
|
|
use nyash_rust::mir::MirType;
|
|
|
|
|
let expected = &func.signature.params;
|
|
|
|
|
if expected.len() != jit_args.len() {
|
|
|
|
|
emit_err("args", "COUNT_MISMATCH", &format!("expected={}, passed={}", expected.len(), jit_args.len()));
|
|
|
|
|
eprintln!("Hint: set NYASH_JIT_ARGS as comma-separated values, e.g., i:42,f:3.14,b:true");
|
|
|
|
|
std::process::exit(1);
|
|
|
|
|
}
|
|
|
|
|
let mut coerced: Vec<nyash_rust::jit::abi::JitValue> = Vec::with_capacity(jit_args.len());
|
|
|
|
|
for (i, (exp, got)) in expected.iter().zip(jit_args.iter()).enumerate() {
|
|
|
|
|
let cv = match exp {
|
|
|
|
|
MirType::Integer => match got {
|
|
|
|
|
nyash_rust::jit::abi::JitValue::I64(v) => nyash_rust::jit::abi::JitValue::I64(*v),
|
|
|
|
|
nyash_rust::jit::abi::JitValue::F64(f) => nyash_rust::jit::abi::JitValue::I64(*f as i64),
|
|
|
|
|
nyash_rust::jit::abi::JitValue::Bool(b) => nyash_rust::jit::abi::JitValue::I64(if *b {1} else {0}),
|
|
|
|
|
_ => { emit_err("args", "TYPE_MISMATCH", &format!("param#{} expects Integer", i)); std::process::exit(1); }
|
|
|
|
|
},
|
|
|
|
|
MirType::Float => match got {
|
|
|
|
|
nyash_rust::jit::abi::JitValue::F64(f) => nyash_rust::jit::abi::JitValue::F64(*f),
|
|
|
|
|
nyash_rust::jit::abi::JitValue::I64(v) => nyash_rust::jit::abi::JitValue::F64(*v as f64),
|
|
|
|
|
nyash_rust::jit::abi::JitValue::Bool(b) => nyash_rust::jit::abi::JitValue::F64(if *b {1.0} else {0.0}),
|
|
|
|
|
_ => { emit_err("args", "TYPE_MISMATCH", &format!("param#{} expects Float", i)); std::process::exit(1); }
|
|
|
|
|
},
|
|
|
|
|
MirType::Bool => match got {
|
|
|
|
|
nyash_rust::jit::abi::JitValue::Bool(b) => nyash_rust::jit::abi::JitValue::Bool(*b),
|
|
|
|
|
nyash_rust::jit::abi::JitValue::I64(v) => nyash_rust::jit::abi::JitValue::Bool(*v != 0),
|
|
|
|
|
nyash_rust::jit::abi::JitValue::F64(f) => nyash_rust::jit::abi::JitValue::Bool(*f != 0.0),
|
|
|
|
|
_ => { emit_err("args", "TYPE_MISMATCH", &format!("param#{} expects Bool", i)); std::process::exit(1); }
|
|
|
|
|
},
|
|
|
|
|
MirType::String | MirType::Box(_) | MirType::Array(_) | MirType::Future(_) => match got {
|
|
|
|
|
nyash_rust::jit::abi::JitValue::Handle(h) => nyash_rust::jit::abi::JitValue::Handle(*h),
|
|
|
|
|
_ => { emit_err("args", "TYPE_MISMATCH", &format!("param#{} expects handle (h:<id>)", i)); std::process::exit(1); }
|
|
|
|
|
},
|
|
|
|
|
MirType::Void | MirType::Unknown => {
|
|
|
|
|
// Keep as-is
|
|
|
|
|
*got
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
coerced.push(cv);
|
|
|
|
|
}
|
|
|
|
|
nyash_rust::jit::rt::set_current_jit_args(&coerced);
|
|
|
|
|
let t0 = std::time::Instant::now();
|
|
|
|
|
let out = engine.execute_handle(h, &coerced);
|
|
|
|
|
match out {
|
|
|
|
|
Some(v) => {
|
|
|
|
|
let ms = t0.elapsed().as_millis();
|
|
|
|
|
nyash_rust::jit::events::emit("execute", &func.signature.name, Some(h), Some(ms), serde_json::json!({}));
|
|
|
|
|
// Normalize result according to MIR return type for friendly output
|
|
|
|
|
use nyash_rust::mir::MirType;
|
|
|
|
|
let ret_ty = &func.signature.return_type;
|
|
|
|
|
let vmv = match (ret_ty, v) {
|
|
|
|
|
(MirType::Bool, nyash_rust::jit::abi::JitValue::I64(i)) => nyash_rust::backend::vm::VMValue::Bool(i != 0),
|
|
|
|
|
(MirType::Bool, nyash_rust::jit::abi::JitValue::Bool(b)) => nyash_rust::backend::vm::VMValue::Bool(b),
|
|
|
|
|
(MirType::Float, nyash_rust::jit::abi::JitValue::F64(f)) => nyash_rust::backend::vm::VMValue::Float(f),
|
|
|
|
|
(MirType::Float, nyash_rust::jit::abi::JitValue::I64(i)) => nyash_rust::backend::vm::VMValue::Float(i as f64),
|
|
|
|
|
// Default adapter for other combos
|
|
|
|
|
_ => nyash_rust::jit::abi::adapter::from_jit_value(v),
|
|
|
|
|
};
|
|
|
|
|
println!("✅ JIT-direct execution completed successfully!");
|
|
|
|
|
// Pretty print with expected type tag
|
|
|
|
|
let (ety, sval) = match (ret_ty, &vmv) {
|
|
|
|
|
(MirType::Bool, nyash_rust::backend::vm::VMValue::Bool(b)) => ("Bool", b.to_string()),
|
|
|
|
|
(MirType::Float, nyash_rust::backend::vm::VMValue::Float(f)) => ("Float", format!("{}", f)),
|
|
|
|
|
(MirType::Integer, nyash_rust::backend::vm::VMValue::Integer(i)) => ("Integer", i.to_string()),
|
|
|
|
|
// Fallbacks
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::Integer(i)) => ("Integer", i.to_string()),
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::Float(f)) => ("Float", format!("{}", f)),
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::Bool(b)) => ("Bool", b.to_string()),
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::String(s)) => ("String", s.clone()),
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::BoxRef(arc)) => ("BoxRef", arc.type_name().to_string()),
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::Future(_)) => ("Future", "<future>".to_string()),
|
|
|
|
|
(_, nyash_rust::backend::vm::VMValue::Void) => ("Void", "void".to_string()),
|
|
|
|
|
};
|
|
|
|
|
println!("ResultType(MIR): {}", ety);
|
|
|
|
|
println!("Result: {}", sval);
|
|
|
|
|
// Optional JSON stats
|
|
|
|
|
if std::env::var("NYASH_JIT_STATS_JSON").ok().as_deref() == Some("1") {
|
|
|
|
|
let cfg = nyash_rust::jit::config::current();
|
|
|
|
|
let caps = nyash_rust::jit::config::probe_capabilities();
|
|
|
|
|
let (phi_t, phi_b1, ret_b) = engine.last_lower_stats();
|
|
|
|
|
let abi_mode = if cfg.native_bool_abi && caps.supports_b1_sig { "b1_bool" } else { "i64_bool" };
|
|
|
|
|
let payload = serde_json::json!({
|
|
|
|
|
"version": 1,
|
|
|
|
|
"function": func.signature.name,
|
|
|
|
|
"abi_mode": abi_mode,
|
|
|
|
|
"abi_b1_enabled": cfg.native_bool_abi,
|
|
|
|
|
"abi_b1_supported": caps.supports_b1_sig,
|
|
|
|
|
"b1_norm_count": nyash_rust::jit::rt::b1_norm_get(),
|
|
|
|
|
"ret_bool_hint_count": nyash_rust::jit::rt::ret_bool_hint_get(),
|
|
|
|
|
"phi_total_slots": phi_t,
|
|
|
|
|
"phi_b1_slots": phi_b1,
|
|
|
|
|
"ret_bool_hint_used": ret_b,
|
|
|
|
|
});
|
|
|
|
|
println!("{}", payload.to_string());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
None => {
|
|
|
|
|
nyash_rust::jit::events::emit("fallback", &func.signature.name, Some(h), None, serde_json::json!({"reason":"trap_or_missing"}));
|
|
|
|
|
emit_err("execute", "TRAP_OR_MISSING", "execution failed (trap or missing handle)");
|
|
|
|
|
std::process::exit(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
None => {
|
|
|
|
|
emit_err("compile", "UNAVAILABLE", "Build with --features cranelift-jit");
|
|
|
|
|
std::process::exit(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-08-14 13:16:12 +00:00
|
|
|
// Demo functions (moved from main.rs)
|
2025-09-03 01:37:38 +09:00
|
|
|
// moved to demos.rs
|
2025-08-14 13:16:12 +00:00
|
|
|
|
2025-09-03 01:37:38 +09:00
|
|
|
// moved to demos.rs
|
2025-08-14 13:16:12 +00:00
|
|
|
|
2025-09-03 01:37:38 +09:00
|
|
|
// moved to demos.rs
|
2025-08-14 13:16:12 +00:00
|
|
|
|
2025-09-03 01:37:38 +09:00
|
|
|
// moved to demos.rs
|
2025-08-14 13:16:12 +00:00
|
|
|
|
2025-09-03 01:37:38 +09:00
|
|
|
// moved to demos.rs
|
2025-08-14 13:16:12 +00:00
|
|
|
|
2025-09-03 01:37:38 +09:00
|
|
|
// moved to demos.rs
|