Files
hakorune/crates/nyash_kernel/src/lib.rs
nyash-codex 65763c1ed6 feat(llvm): Phase 97 - Call/PHI/Plugin強化 + リファクタリング準備
## 概要
LLVM backend のCall処理、PHI wiring、Plugin loader を強化。
次のリファクタリング(箱化モジュール化)のための準備も含む。

## 変更内容

### LLVM Call処理強化
- `mir_call/__init__.py`: Call ルーティングロジック改善
- `mir_call/global_call.py`: print処理の marshal強化
- `mir_call/method_call.py`: メソッド呼び出し処理改善
- `boxcall.py`: BoxCall処理改善

### PHI処理強化
- `phi_manager.py`: PHI管理改善
- `phi_wiring/wiring.py`: PHI配線ロジック強化(+17行)
- `phi_wiring/tagging.py`: Type tagging改善
- `resolver.py`: Value解決ロジック強化(+34行)

### Copy伝播
- `copy.py`: Copy命令のType tag伝播追加(+10行)

### Plugin loader強化
- `library.rs`: エラー出力改善、[plugin/missing]ログ追加(+34行)
- fail-fast強化

### テスト
- `phase97_json_loader_escape_llvm_exe.sh`: Phase 97 E2Eテスト追加
- `phase97_next_non_ws_llvm_exe.sh`: Phase 97 E2Eテスト追加

### その他
- `nyash_kernel/lib.rs`: Kernel側の改善(+23行)

## 統計
- 14ファイル変更
- +256行 / -53行 = +203 net

## 次のリファクタリング準備
以下の箇所がリファクタリング対象として識別済み:
1. Call ルーティング箱の明文化
2. print の marshal 箱
3. TypeFacts/Tagging 箱の一本化
4. PHI Snapshot 契約のSSOT
5. Plugin loader のエラー出力統合

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2025-12-17 03:51:03 +09:00

973 lines
33 KiB
Rust
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

// Minimal NyRT static shim library (libnyrt.a)
// Exposes C ABI entry points used by AOT/JIT-emitted objects.
mod encode;
mod plugin;
pub use plugin::*;
// --- AOT ObjectModule dotted-name exports (String/Any helpers) ---
// String.len_h(handle) -> i64
#[export_name = "nyash.string.len_h"]
pub extern "C" fn nyash_string_len_h(handle: i64) -> i64 {
use nyash_rust::runtime::host_handles as handles;
if std::env::var("NYASH_JIT_TRACE_LEN").ok().as_deref() == Some("1") {
let present = if handle > 0 {
handles::get(handle as u64).is_some()
} else {
false
};
eprintln!(
"[AOT-LEN_H] string.len_h handle={} present={}",
handle, present
);
}
if handle <= 0 {
return 0;
}
if let Some(obj) = handles::get(handle as u64) {
if let Some(sb) = obj
.as_any()
.downcast_ref::<nyash_rust::box_trait::StringBox>()
{
return sb.value.len() as i64;
}
}
0
}
// FAST-path helper: compute string length from raw pointer (i8*) with mode (reserved)
// Exported as both legacy name (nyash.string.length_si) and neutral name (nyrt_string_length)
#[inline(always)]
#[export_name = "nyrt_string_length"]
pub extern "C" fn nyrt_string_length(ptr: *const i8, _mode: i64) -> i64 {
use std::ffi::CStr;
if ptr.is_null() {
return 0;
}
// Safety: pointer is expected to point to a null-terminated UTF-8 byte string
let c = unsafe { CStr::from_ptr(ptr) };
match c.to_bytes().len() {
n => n as i64,
}
}
// String.charCodeAt_h(handle, idx) -> i64 (byte-based; -1 if OOB)
#[export_name = "nyash.string.charCodeAt_h"]
pub extern "C" fn nyash_string_charcode_at_h_export(handle: i64, idx: i64) -> i64 {
use nyash_rust::runtime::host_handles as handles;
if idx < 0 {
return -1;
}
if handle <= 0 {
return -1;
}
if let Some(obj) = handles::get(handle as u64) {
if let Some(sb) = obj
.as_any()
.downcast_ref::<nyash_rust::box_trait::StringBox>()
{
let s = &sb.value;
let i = idx as usize;
if i < s.len() {
return s.as_bytes()[i] as i64;
}
return -1;
}
}
-1
}
// Build ArrayBox from process argv (excluding program name)
// Exported as: nyash.env.argv_get() -> i64 (ArrayBox handle)
#[export_name = "nyash.env.argv_get"]
pub extern "C" fn nyash_env_argv_get() -> i64 {
use nyash_rust::{
box_trait::{NyashBox, StringBox},
boxes::array::ArrayBox,
runtime::host_handles as handles,
};
let mut arr = ArrayBox::new();
// Skip argv[0] (program name), collect the rest
for (i, a) in std::env::args().enumerate() {
if i == 0 {
continue;
}
let sb: Box<dyn NyashBox> = Box::new(StringBox::new(a));
let _ = arr.push(sb);
}
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(arr);
handles::to_handle_arc(arc) as i64
}
// String.concat_hh(lhs_h, rhs_h) -> handle
#[export_name = "nyash.string.concat_hh"]
pub extern "C" fn nyash_string_concat_hh_export(a_h: i64, b_h: i64) -> i64 {
use nyash_rust::{
box_trait::{NyashBox, StringBox},
runtime::host_handles as handles,
};
let to_s = |h: i64| -> String {
if h > 0 {
if let Some(o) = handles::get(h as u64) {
return o.to_string_box().value;
}
}
String::new()
};
let s = format!("{}{}", to_s(a_h), to_s(b_h));
nyash_rust::runtime::global_hooks::gc_alloc(s.len() as u64);
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(StringBox::new(s));
let h = handles::to_handle_arc(arc) as i64;
h
}
// String.eq_hh(lhs_h, rhs_h) -> i64 (0/1)
#[export_name = "nyash.string.eq_hh"]
pub extern "C" fn nyash_string_eq_hh_export(a_h: i64, b_h: i64) -> i64 {
use nyash_rust::runtime::host_handles as handles;
let to_s = |h: i64| -> String {
if h > 0 {
if let Some(o) = handles::get(h as u64) {
return o.to_string_box().value;
}
}
String::new()
};
if to_s(a_h) == to_s(b_h) {
1
} else {
0
}
}
// String.substring_hii(handle, start, end) -> handle
#[export_name = "nyash.string.substring_hii"]
pub extern "C" fn nyash_string_substring_hii_export(h: i64, start: i64, end: i64) -> i64 {
use nyash_rust::{box_trait::NyashBox, box_trait::StringBox, runtime::host_handles as handles};
if h <= 0 {
return 0;
}
let s = if let Some(obj) = handles::get(h as u64) {
if let Some(sb) = obj.as_any().downcast_ref::<StringBox>() {
sb.value.clone()
} else {
String::new()
}
} else {
String::new()
};
let n = s.len() as i64;
let mut st = if start < 0 { 0 } else { start };
let mut en = if end < 0 { 0 } else { end };
if st > n {
st = n;
}
if en > n {
en = n;
}
if en < st {
std::mem::swap(&mut st, &mut en);
}
let (st_u, en_u) = (st as usize, en as usize);
let sub = s.get(st_u.min(s.len())..en_u.min(s.len())).unwrap_or("");
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(StringBox::new(sub.to_string()));
nyash_rust::runtime::global_hooks::gc_alloc(sub.len() as u64);
let nh = handles::to_handle_arc(arc) as i64;
eprintln!("[TRACE] substring_hii -> {}", nh);
nh
}
// String.lastIndexOf_hh(haystack_h, needle_h) -> i64
#[export_name = "nyash.string.lastIndexOf_hh"]
pub extern "C" fn nyash_string_lastindexof_hh_export(h: i64, n: i64) -> i64 {
use nyash_rust::{box_trait::StringBox, runtime::host_handles as handles};
let hay = if h > 0 {
if let Some(o) = handles::get(h as u64) {
if let Some(sb) = o.as_any().downcast_ref::<StringBox>() {
sb.value.clone()
} else {
String::new()
}
} else {
String::new()
}
} else {
String::new()
};
let nee = if n > 0 {
if let Some(o) = handles::get(n as u64) {
if let Some(sb) = o.as_any().downcast_ref::<StringBox>() {
sb.value.clone()
} else {
String::new()
}
} else {
String::new()
}
} else {
String::new()
};
if nee.is_empty() {
return hay.len() as i64;
}
if let Some(pos) = hay.rfind(&nee) {
pos as i64
} else {
-1
}
}
// box.from_i8_string(ptr) -> handle
// Helper: build a StringBox from i8* and return a handle for AOT marshalling
#[export_name = "nyash.box.from_i8_string"]
pub extern "C" fn nyash_box_from_i8_string(ptr: *const i8) -> i64 {
use nyash_rust::{
box_trait::{NyashBox, StringBox},
runtime::host_handles as handles,
};
use std::ffi::CStr;
if ptr.is_null() {
return 0;
}
let c = unsafe { CStr::from_ptr(ptr) };
let s = match c.to_str() {
Ok(v) => v.to_string(),
Err(_) => return 0,
};
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(StringBox::new(s.clone()));
nyash_rust::runtime::global_hooks::gc_alloc(s.len() as u64);
let h = handles::to_handle_arc(arc) as i64;
h
}
// box.from_f64(val) -> handle
// Helper: build a FloatBox and return a handle
#[export_name = "nyash.box.from_f64"]
pub extern "C" fn nyash_box_from_f64(val: f64) -> i64 {
use nyash_rust::{box_trait::NyashBox, boxes::FloatBox, runtime::host_handles as handles};
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(FloatBox::new(val));
nyash_rust::runtime::global_hooks::gc_alloc(8);
handles::to_handle_arc(arc) as i64
}
// box.from_i64(val) -> handle
// Helper: build an IntegerBox and return a handle
#[export_name = "nyash.box.from_i64"]
pub extern "C" fn nyash_box_from_i64(val: i64) -> i64 {
use nyash_rust::{
box_trait::{IntegerBox, NyashBox},
runtime::host_handles as handles,
};
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(IntegerBox::new(val));
nyash_rust::runtime::global_hooks::gc_alloc(8);
let h = handles::to_handle_arc(arc) as i64;
h
}
// integer.get_h(handle) -> i64
// Extract IntegerBox value from a handle. Returns 0 if handle is invalid or not an IntegerBox.
#[export_name = "nyash.integer.get_h"]
pub extern "C" fn nyash_integer_get_h_export(h: i64) -> i64 {
use nyash_rust::{box_trait::IntegerBox, runtime::host_handles as handles};
if h <= 0 {
return 0;
}
if let Some(obj) = handles::get(h as u64) {
if let Some(ib) = obj.as_any().downcast_ref::<IntegerBox>() {
return ib.value;
}
}
0
}
// bool.get_h(handle) -> i64 (0/1)
#[export_name = "nyash.bool.get_h"]
pub extern "C" fn nyash_bool_get_h_export(h: i64) -> i64 {
use nyash_rust::{box_trait::BoolBox, runtime::host_handles as handles};
if h <= 0 {
return 0;
}
if let Some(obj) = handles::get(h as u64) {
if let Some(bb) = obj.as_any().downcast_ref::<BoolBox>() {
return if bb.value { 1 } else { 0 };
}
}
0
}
// float.get_bits_h(handle) -> i64 (f64 bits)
#[export_name = "nyash.float.get_bits_h"]
pub extern "C" fn nyash_float_get_bits_h_export(h: i64) -> i64 {
use nyash_rust::{boxes::FloatBox, runtime::host_handles as handles};
if h <= 0 {
return 0;
}
if let Some(obj) = handles::get(h as u64) {
if let Some(fb) = obj.as_any().downcast_ref::<FloatBox>() {
return fb.value.to_bits() as i64;
}
}
0
}
// env.box.new(type_name: *const i8) -> handle (i64)
// Minimal shim for Core-13 pure AOT: constructs Box via registry by name (no args)
#[export_name = "nyash.env.box.new"]
pub extern "C" fn nyash_env_box_new(type_name: *const i8) -> i64 {
use nyash_rust::{
box_trait::NyashBox,
runtime::{box_registry::get_global_registry, host_handles as handles},
};
use std::ffi::CStr;
if type_name.is_null() {
return 0;
}
let cstr = unsafe { CStr::from_ptr(type_name) };
let ty = match cstr.to_str() {
Ok(s) => s,
Err(_) => return 0,
};
// Core-first special cases: construct built-in boxes directly
if ty == "MapBox" {
use nyash_rust::boxes::map_box::MapBox;
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(MapBox::new());
return handles::to_handle_arc(arc) as i64;
}
if ty == "ArrayBox" {
use nyash_rust::boxes::array::ArrayBox;
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(ArrayBox::new());
let h = handles::to_handle_arc(arc) as i64;
if std::env::var("NYASH_CLI_VERBOSE").ok().as_deref() == Some("1") {
eprintln!("nyrt: env.box.new ArrayBox -> handle={}", h);
}
return h;
}
let reg = get_global_registry();
match reg.create_box(ty, &[]) {
Ok(b) => {
let arc: std::sync::Arc<dyn NyashBox> = b.into();
handles::to_handle_arc(arc) as i64
}
Err(_) => 0,
}
}
// env.box.new_i64x(type_name: *const i8, argc: i64, a1: i64, a2: i64, a3: i64, a4: i64) -> handle (i64)
// Minimal shim: construct args from handles or wrap i64 as IntegerBox
#[export_name = "nyash.env.box.new_i64x"]
pub extern "C" fn nyash_env_box_new_i64x(
type_name: *const i8,
argc: i64,
a1: i64,
a2: i64,
a3: i64,
a4: i64,
) -> i64 {
use nyash_rust::{
box_trait::{IntegerBox, NyashBox},
runtime::{box_registry::get_global_registry, host_handles as handles},
};
use std::ffi::CStr;
if type_name.is_null() {
return 0;
}
let cstr = unsafe { CStr::from_ptr(type_name) };
let ty = match cstr.to_str() {
Ok(s) => s,
Err(_) => return 0,
};
// Build args vec from provided i64 words
let mut argv: Vec<Box<dyn NyashBox>> = Vec::new();
let push_val = |dst: &mut Vec<Box<dyn NyashBox>>, v: i64| {
if v > 0 {
if let Some(obj) = handles::get(v as u64) {
dst.push(obj.share_box());
return;
}
}
dst.push(Box::new(IntegerBox::new(v)));
};
if argc >= 1 {
push_val(&mut argv, a1);
}
if argc >= 2 {
push_val(&mut argv, a2);
}
if argc >= 3 {
push_val(&mut argv, a3);
}
if argc >= 4 {
push_val(&mut argv, a4);
}
let reg = get_global_registry();
match reg.create_box(ty, &argv) {
Ok(b) => {
let arc: std::sync::Arc<dyn NyashBox> = b.into();
handles::to_handle_arc(arc) as i64
}
Err(_) => 0,
}
}
// String.lt_hh(lhs_h, rhs_h) -> i64 (0/1)
#[export_name = "nyash.string.lt_hh"]
pub extern "C" fn nyash_string_lt_hh_export(a_h: i64, b_h: i64) -> i64 {
use nyash_rust::runtime::host_handles as handles;
let to_s = |h: i64| -> String {
if h > 0 {
if let Some(o) = handles::get(h as u64) {
return o.to_string_box().value;
}
}
String::new()
};
if to_s(a_h) < to_s(b_h) {
1
} else {
0
}
}
// Any.length_h(handle) -> i64 (Array/String/Map)
#[export_name = "nyash.any.length_h"]
pub extern "C" fn nyash_any_length_h_export(handle: i64) -> i64 {
use nyash_rust::runtime::host_handles as handles;
if std::env::var("NYASH_JIT_TRACE_LEN").ok().as_deref() == Some("1") {
let present = if handle > 0 {
handles::get(handle as u64).is_some()
} else {
false
};
eprintln!(
"[AOT-LEN_H] any.length_h handle={} present={}",
handle, present
);
}
if handle <= 0 {
return 0;
}
if let Some(obj) = handles::get(handle as u64) {
if let Some(arr) = obj
.as_any()
.downcast_ref::<nyash_rust::boxes::array::ArrayBox>()
{
if let Some(ib) = arr
.length()
.as_any()
.downcast_ref::<nyash_rust::box_trait::IntegerBox>()
{
return ib.value;
}
}
if let Some(sb) = obj
.as_any()
.downcast_ref::<nyash_rust::box_trait::StringBox>()
{
return sb.value.len() as i64;
}
if let Some(map) = obj
.as_any()
.downcast_ref::<nyash_rust::boxes::map_box::MapBox>()
{
if let Some(ib) = map
.size()
.as_any()
.downcast_ref::<nyash_rust::box_trait::IntegerBox>()
{
return ib.value;
}
}
}
0
}
// Any.is_empty_h(handle) -> i64 (0/1)
#[export_name = "nyash.any.is_empty_h"]
pub extern "C" fn nyash_any_is_empty_h_export(handle: i64) -> i64 {
use nyash_rust::runtime::host_handles as handles;
if handle <= 0 {
return 1;
}
if let Some(obj) = handles::get(handle as u64) {
if let Some(arr) = obj
.as_any()
.downcast_ref::<nyash_rust::boxes::array::ArrayBox>()
{
if let Ok(items) = arr.items.read() {
return if items.is_empty() { 1 } else { 0 };
}
}
if let Some(sb) = obj
.as_any()
.downcast_ref::<nyash_rust::box_trait::StringBox>()
{
return if sb.value.is_empty() { 1 } else { 0 };
}
if let Some(map) = obj
.as_any()
.downcast_ref::<nyash_rust::boxes::map_box::MapBox>()
{
if let Some(ib) = map
.size()
.as_any()
.downcast_ref::<nyash_rust::box_trait::IntegerBox>()
{
return if ib.value == 0 { 1 } else { 0 };
}
}
}
1
}
// Instance birth by name (packed u64x2 + len) -> handle
// export: nyash.instance.birth_name_u64x2(lo, hi, len) -> i64
#[export_name = "nyash.instance.birth_name_u64x2"]
pub extern "C" fn nyash_instance_birth_name_u64x2_export(lo: i64, hi: i64, len: i64) -> i64 {
use nyash_rust::runtime::get_global_plugin_host;
let mut bytes = Vec::with_capacity(len.max(0) as usize);
let lo_u = lo as u64;
let hi_u = hi as u64;
let l = len.max(0) as usize;
let take = core::cmp::min(16, l);
for i in 0..take.min(8) {
bytes.push(((lo_u >> (8 * i)) & 0xff) as u8);
}
for i in 0..take.saturating_sub(8) {
bytes.push(((hi_u >> (8 * i)) & 0xff) as u8);
}
// If len > 16, remaining bytes are not represented in (lo,hi); assume names <=16 bytes for now.
if bytes.len() != l {
bytes.resize(l, 0);
}
let name = String::from_utf8_lossy(&bytes).to_string();
if let Ok(host_g) = get_global_plugin_host().read() {
if let Ok(b) = host_g.create_box(&name, &[]) {
let arc: std::sync::Arc<dyn nyash_rust::box_trait::NyashBox> = std::sync::Arc::from(b);
let h = nyash_rust::runtime::host_handles::to_handle_arc(arc) as u64;
return h as i64;
}
}
0
}
// Construct StringBox from two u64 words (little-endian) + length (<=16) and return handle
// export: nyash.string.from_u64x2(lo, hi, len) -> i64
#[export_name = "nyash.string.from_u64x2"]
pub extern "C" fn nyash_string_from_u64x2_export(lo: i64, hi: i64, len: i64) -> i64 {
use nyash_rust::{
box_trait::{NyashBox, StringBox},
runtime::host_handles as handles,
};
let l = if len < 0 {
0
} else {
core::cmp::min(len as usize, 16)
};
let mut bytes: Vec<u8> = Vec::with_capacity(l);
let lo_u = lo as u64;
let hi_u = hi as u64;
for i in 0..l.min(8) {
bytes.push(((lo_u >> (8 * i)) & 0xff) as u8);
}
for i in 0..l.saturating_sub(8) {
bytes.push(((hi_u >> (8 * i)) & 0xff) as u8);
}
let s = String::from_utf8_lossy(&bytes).to_string();
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::new(StringBox::new(s.clone()));
nyash_rust::runtime::global_hooks::gc_alloc(s.len() as u64);
handles::to_handle_arc(arc) as i64
}
// ✂️ REMOVED: Legacy VM argument processing - replaced by Plugin-First architecture
// This function was part of the 42% deletable shim functions identified by ChatGPT5 Pro
// Functionality now handled by unified plugin system
// ---- Reserved runtime/GC externs for AOT linking ----
// Exported as: nyash.rt.checkpoint
#[export_name = "nyash.rt.checkpoint"]
pub extern "C" fn nyash_rt_checkpoint_export() -> i64 {
if std::env::var("NYASH_RUNTIME_CHECKPOINT_TRACE")
.ok()
.as_deref()
== Some("1")
{
eprintln!("[nyrt] nyash.rt.checkpoint reached");
}
0
}
// Exported as: nyash.gc.barrier_write
#[export_name = "nyash.gc.barrier_write"]
pub extern "C" fn nyash_gc_barrier_write_export(handle_or_ptr: i64) -> i64 {
let _ = handle_or_ptr;
if std::env::var("NYASH_GC_BARRIER_TRACE").ok().as_deref() == Some("1") {
eprintln!("[nyrt] nyash.gc.barrier_write h=0x{:x}", handle_or_ptr);
}
// Forward to runtime GC hooks when available (Write barrier)
nyash_rust::runtime::global_hooks::gc_barrier(nyash_rust::runtime::BarrierKind::Write);
0
}
// LLVM safepoint exports (llvmlite harness)
// export: ny_safepoint(live_count: i64, live_values: i64*) -> void
#[no_mangle]
pub extern "C" fn ny_safepoint(_live_count: i64, _live_values: *const i64) {
// For now we ignore live-values; runtime uses cooperative safepoint + poll
nyash_rust::runtime::global_hooks::safepoint_and_poll();
}
// export: ny_check_safepoint() -> void
#[no_mangle]
pub extern "C" fn ny_check_safepoint() {
nyash_rust::runtime::global_hooks::safepoint_and_poll();
}
#[export_name = "nyash.string.birth_h"]
pub extern "C" fn nyash_string_birth_h_export() -> i64 {
// Create a new StringBox via unified plugin host; return runtime handle as i64
if let Ok(host_g) = nyash_rust::runtime::get_global_plugin_host().read() {
if let Ok(b) = host_g.create_box("StringBox", &[]) {
let arc: std::sync::Arc<dyn nyash_rust::box_trait::NyashBox> = std::sync::Arc::from(b);
let h = nyash_rust::runtime::host_handles::to_handle_arc(arc) as u64;
nyash_rust::runtime::global_hooks::gc_alloc(0);
return h as i64;
}
}
0
}
#[export_name = "nyash.integer.birth_h"]
pub extern "C" fn nyash_integer_birth_h_export() -> i64 {
if let Ok(host_g) = nyash_rust::runtime::get_global_plugin_host().read() {
if let Ok(b) = host_g.create_box("IntegerBox", &[]) {
let arc: std::sync::Arc<dyn nyash_rust::box_trait::NyashBox> = std::sync::Arc::from(b);
let h = nyash_rust::runtime::host_handles::to_handle_arc(arc) as u64;
nyash_rust::runtime::global_hooks::gc_alloc(0);
return h as i64;
}
}
0
}
// ConsoleBox birth shim for AOT/JIT handle-based creation
#[export_name = "nyash.console.birth_h"]
pub extern "C" fn nyash_console_birth_h_export() -> i64 {
if let Ok(host_g) = nyash_rust::runtime::get_global_plugin_host().read() {
if let Ok(b) = host_g.create_box("ConsoleBox", &[]) {
let arc: std::sync::Arc<dyn nyash_rust::box_trait::NyashBox> = std::sync::Arc::from(b);
let h = nyash_rust::runtime::host_handles::to_handle_arc(arc) as u64;
nyash_rust::runtime::global_hooks::gc_alloc(0);
return h as i64;
}
}
0
}
// ArrayBox birth shim for AOT/JIT handle-based creation
#[export_name = "nyash.array.birth_h"]
pub extern "C" fn nyash_array_birth_h_export() -> i64 {
let arc: std::sync::Arc<dyn nyash_rust::box_trait::NyashBox> =
std::sync::Arc::new(nyash_rust::boxes::array::ArrayBox::new());
nyash_rust::runtime::global_hooks::gc_alloc(0);
nyash_rust::runtime::host_handles::to_handle_arc(arc) as i64
}
// MapBox birth shim for AOT/JIT handle-based creation
#[export_name = "nyash.map.birth_h"]
pub extern "C" fn nyash_map_birth_h_export() -> i64 {
let arc: std::sync::Arc<dyn nyash_rust::box_trait::NyashBox> =
std::sync::Arc::new(nyash_rust::boxes::map_box::MapBox::new());
nyash_rust::runtime::global_hooks::gc_alloc(0);
nyash_rust::runtime::host_handles::to_handle_arc(arc) as i64
}
// ---- Process entry (driver) ----
#[cfg(not(test))]
#[no_mangle]
pub extern "C" fn main() -> i32 {
// Phase 88: AOT 実行器でも Ring0Context は必須PluginHost/ログなどが依存する)。
// EXE 直起動では host 側の init が存在しないため、ここで先に初期化する。
if nyash_rust::runtime::ring0::GLOBAL_RING0.get().is_none() {
nyash_rust::runtime::ring0::init_global_ring0(nyash_rust::runtime::ring0::default_ring0());
}
// Initialize plugin host: prefer nyash.toml next to the executable; fallback to CWD
let exe_dir = std::env::current_exe()
.ok()
.and_then(|p| p.parent().map(|d| d.to_path_buf()));
// Windows: assist DLL/plugin discovery by extending PATH and normalizing PYTHONHOME
#[cfg(target_os = "windows")]
if let Some(dir) = &exe_dir {
use std::path::PathBuf;
// Extend PATH with exe_dir and exe_dir\plugins if not already present
let mut path_val = std::env::var("PATH").unwrap_or_default();
let add_path = |pv: &mut String, p: &PathBuf| {
let ps = p.display().to_string();
if !pv.split(';').any(|seg| seg.eq_ignore_ascii_case(&ps)) {
if !pv.is_empty() {
pv.push(';');
}
pv.push_str(&ps);
}
};
add_path(&mut path_val, dir);
let plug = dir.join("plugins");
if plug.is_dir() {
add_path(&mut path_val, &plug);
}
std::env::set_var("PATH", &path_val);
// Normalize PYTHONHOME: if unset, point to exe_dir\python when present.
match std::env::var("PYTHONHOME") {
Ok(v) => {
// If relative, make absolute under exe_dir
let pb = PathBuf::from(&v);
if pb.is_relative() {
let abs = dir.join(pb);
std::env::set_var("PYTHONHOME", abs.display().to_string());
}
}
Err(_) => {
let cand = dir.join("python");
if cand.is_dir() {
std::env::set_var("PYTHONHOME", cand.display().to_string());
}
}
}
}
// Initialize a minimal runtime to back global hooks (GC/scheduler) for safepoints
// Choose GC hooks based on env (default dev: Counting for observability unless explicitly off)
let mut rt_builder = nyash_rust::runtime::NyashRuntimeBuilder::new();
let gc_mode = nyash_rust::runtime::gc_mode::GcMode::from_env();
let controller = std::sync::Arc::new(nyash_rust::runtime::gc_controller::GcController::new(
gc_mode,
));
rt_builder = rt_builder.with_gc_hooks(controller);
let rt_hooks = rt_builder.build();
nyash_rust::runtime::global_hooks::set_from_runtime(&rt_hooks);
let mut inited = false;
if let Some(dir) = &exe_dir {
let candidate = dir.join("nyash.toml");
if candidate.exists() {
let _ =
nyash_rust::runtime::init_global_plugin_host(candidate.to_string_lossy().as_ref());
inited = true;
}
}
if !inited {
let _ = nyash_rust::runtime::init_global_plugin_host("nyash.toml");
}
// Optional verbosity
if std::env::var("NYASH_CLI_VERBOSE").ok().as_deref() == Some("1") {
println!(
"🔌 nyrt: plugin host init attempted (exe_dir={}, cwd={})",
exe_dir
.as_ref()
.map(|p| p.display().to_string())
.unwrap_or_else(|| "?".into()),
std::env::current_dir()
.map(|p| p.display().to_string())
.unwrap_or_else(|_| "?".into())
);
}
// Call exported Nyash entry if linked: `ny_main` (i64 -> return code normalized)
unsafe {
extern "C" {
fn ny_main() -> i64;
}
// SAFETY: if not linked, calling will be an unresolved symbol at link-time; we rely on link step to include ny_main.
let v = ny_main();
let exit_code: i64 = {
use nyash_rust::{
box_trait::{IntegerBox, NyashBox},
runtime::host_handles as handles,
};
if v > 0 {
if let Some(obj) = handles::get(v as u64) {
if let Some(ib) = obj.as_any().downcast_ref::<IntegerBox>() {
ib.value as i64
} else {
0
}
} else {
v
}
} else {
v
}
};
// Print standardized result line for golden comparisons (can be silenced for tests)
let silent = std::env::var("NYASH_NYRT_SILENT_RESULT").ok().as_deref() == Some("1");
if !silent {
println!("Result: {}", exit_code);
}
// Optional GC metrics after program completes
let want_json = std::env::var("NYASH_GC_METRICS_JSON").ok().as_deref() == Some("1");
let want_text = std::env::var("NYASH_GC_METRICS").ok().as_deref() == Some("1");
if want_json || want_text {
let (sp, br, bw) = rt_hooks.gc.snapshot_counters().unwrap_or((0, 0, 0));
// ✂️ REMOVED: Legacy JIT handles::len() - part of 42% deletable functions
let handles = 0u64; // Placeholder: handles tracking removed with JIT archival
let gc_mode_s = gc_mode.as_str();
// Include allocation totals if controller is used
let any_gc: &dyn std::any::Any = &*rt_hooks.gc;
let (
alloc_count,
alloc_bytes,
trial_nodes,
trial_edges,
collect_total,
collect_sp,
collect_alloc,
last_ms,
last_reason,
) = if let Some(ctrl) =
any_gc.downcast_ref::<nyash_rust::runtime::gc_controller::GcController>()
{
let (ac, ab) = ctrl.alloc_totals();
let (tn, te) = ctrl.trial_reachability_last();
let (ct, csp, calloc) = ctrl.collection_totals();
let lms = ctrl.trial_duration_last_ms();
let lrf = ctrl.trial_reason_last_bits();
(ac, ab, tn, te, ct, csp, calloc, lms, lrf)
} else {
(0, 0, 0, 0, 0, 0, 0, 0, 0)
};
// Settings snapshot (env)
let sp_interval = std::env::var("NYASH_GC_COLLECT_SP")
.ok()
.and_then(|s| s.parse::<u64>().ok())
.unwrap_or(0);
let alloc_thresh = std::env::var("NYASH_GC_COLLECT_ALLOC")
.ok()
.and_then(|s| s.parse::<u64>().ok())
.unwrap_or(0);
let auto_sp = std::env::var("NYASH_LLVM_AUTO_SAFEPOINT")
.ok()
.map(|v| v == "1")
.unwrap_or(true);
if want_json {
// Minimal JSON assembly to avoid extra deps in nyrt
println!(
"{{\"kind\":\"gc_metrics\",\"safepoints\":{},\"barrier_reads\":{},\"barrier_writes\":{},\"jit_handles\":{},\"alloc_count\":{},\"alloc_bytes\":{},\"trial_nodes\":{},\"trial_edges\":{},\"collections\":{},\"collect_by_sp\":{},\"collect_by_alloc\":{},\"last_collect_ms\":{},\"last_reason_bits\":{},\"sp_interval\":{},\"alloc_threshold\":{},\"auto_safepoint\":{},\"gc_mode\":\"{}\"}}",
sp, br, bw, handles, alloc_count, alloc_bytes, trial_nodes, trial_edges, collect_total, collect_sp, collect_alloc, last_ms, last_reason, sp_interval, alloc_thresh, if auto_sp {1} else {0}, gc_mode_s
);
} else if want_text {
eprintln!(
"[GC] metrics: safepoints={} read_barriers={} write_barriers={} jit_handles={} allocs={} bytes={} collections={} (sp={} alloc={}) last_ms={} mode={}",
sp, br, bw, handles, alloc_count, alloc_bytes, collect_total, collect_sp, collect_alloc, last_ms, gc_mode_s
);
}
// Threshold warning
if let Ok(s) = std::env::var("NYASH_GC_ALLOC_THRESHOLD") {
if let Ok(th) = s.parse::<u64>() {
if alloc_bytes > th {
eprintln!(
"[GC][warn] allocation bytes {} exceeded threshold {}",
alloc_bytes, th
);
}
}
}
}
// ✂️ REMOVED: Legacy JIT leak diagnostics - part of 42% deletable functions
// Leak diagnostics functionality removed with JIT archival
// handles::type_tally() no longer available in Plugin-First architecture
exit_code as i32
}
}
#[cfg(test)]
mod tests {
use super::*;
use nyash_rust::{
box_trait::{NyashBox, StringBox},
runtime::{host_handles as handles, plugin_loader_v2::make_plugin_box_v2},
};
use std::sync::Arc;
unsafe extern "C" fn fake_i32(
_t: u32,
_m: u32,
_i: u32,
_a: *const u8,
_al: usize,
res: *mut u8,
len: *mut usize,
) -> i32 {
let mut buf = Vec::new();
buf.extend_from_slice(&1u16.to_le_bytes());
buf.extend_from_slice(&1u16.to_le_bytes());
buf.push(2);
buf.push(0);
buf.extend_from_slice(&4u16.to_le_bytes());
buf.extend_from_slice(&123i32.to_le_bytes());
if res.is_null() || len.is_null() || unsafe { *len } < buf.len() {
unsafe {
if !len.is_null() {
*len = buf.len();
}
}
return -1;
}
unsafe {
std::ptr::copy_nonoverlapping(buf.as_ptr(), res, buf.len());
*len = buf.len();
}
0
}
unsafe extern "C" fn fake_str(
_t: u32,
_m: u32,
_i: u32,
_a: *const u8,
_al: usize,
res: *mut u8,
len: *mut usize,
) -> i32 {
let s = b"hi";
let mut buf = Vec::new();
buf.extend_from_slice(&1u16.to_le_bytes());
buf.extend_from_slice(&1u16.to_le_bytes());
buf.push(7);
buf.push(0);
buf.extend_from_slice(&(s.len() as u16).to_le_bytes());
buf.extend_from_slice(s);
if res.is_null() || len.is_null() || unsafe { *len } < buf.len() {
unsafe {
if !len.is_null() {
*len = buf.len();
}
}
return -1;
}
unsafe {
std::ptr::copy_nonoverlapping(buf.as_ptr(), res, buf.len());
*len = buf.len();
}
0
}
#[test]
fn decode_i32_and_string_returns() {
let pb = make_plugin_box_v2("Dummy".into(), 1, 1, fake_i32);
let arc: Arc<dyn NyashBox> = Arc::new(pb);
let handle = handles::to_handle_arc(arc) as i64;
let val = nyash_plugin_invoke3_tagged_i64(1, 0, 0, handle, 0, 0, 0, 0, 0, 0, 0, 0);
assert_eq!(val, 123);
let pb = make_plugin_box_v2("Dummy".into(), 1, 2, fake_str);
let arc: Arc<dyn NyashBox> = Arc::new(pb);
let handle = handles::to_handle_arc(arc) as i64;
let h = nyash_plugin_invoke3_tagged_i64(1, 0, 0, handle, 0, 0, 0, 0, 0, 0, 0, 0);
assert!(h > 0);
let obj = handles::get(h as u64).unwrap();
let sb = obj.as_any().downcast_ref::<StringBox>().unwrap();
assert_eq!(sb.value, "hi");
}
}