tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Phase 33 NORM canon test: enforce normalized dev route for P1/P2/JP mini

Browse Source
This commit is contained in:
nyash-codex
2025-12-11 20:54:33 +09:00
parent 59a985b7fa
commit af6f95cd4b
170 changed files with 4423 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mir/join_ir_vm_bridge_dispatch/exec_routes.rs
View File

@ -23,8 +23,8 @@ pub(crate) fn try_run_skip_ws(module: &MirModule, quiet_pipe: bool) -> bool {
let input = std::env::var("NYASH_JOINIR_INPUT").unwrap_or_else(|_| " abc".to_string());
eprintln!("[joinir/vm_bridge] Input: {:?}", input);
let dev_bridge = joinir_dev_enabled()
|| std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1");
let dev_bridge =
joinir_dev_enabled() || std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1");
let strict = joinir_strict_enabled();
match run_joinir_via_vm(&join_module, JoinFuncId::new(0), &[JoinValue::Str(input)]) {
@ -83,8 +83,8 @@ pub(crate) fn try_run_trim(module: &MirModule, quiet_pipe: bool) -> bool {
let input = std::env::var("NYASH_JOINIR_INPUT").unwrap_or_else(|_| " abc ".to_string());
eprintln!("[joinir/vm_bridge] Input: {:?}", input);
let dev_bridge = joinir_dev_enabled()
|| std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1");
let dev_bridge =
joinir_dev_enabled() || std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1");
let strict = joinir_strict_enabled();
match run_joinir_via_vm(&join_module, JoinFuncId::new(0), &[JoinValue::Str(input)]) {
@ -156,9 +156,10 @@ where
G: Fn(&JoinValue) -> String,
H: Fn(&JoinValue) -> i32,
{
get_global_ring0()
.log
.info(&format!("[joinir/vm_bridge] Attempting JoinIR path for {}", route_name));
get_global_ring0().log.info(&format!(
"[joinir/vm_bridge] Attempting JoinIR path for {}",
route_name
));
let Some(join_module) = lowerer() else {
get_global_ring0().log.info(&format!(
@ -171,15 +172,16 @@ where
return false;
};
let dev_bridge = joinir_dev_enabled()
|| std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1");
let dev_bridge =
joinir_dev_enabled() || std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1");
let strict = joinir_strict_enabled();
match run_joinir_via_vm(&join_module, JoinFuncId::new(0), &[input_val]) {
Ok(result) => {
get_global_ring0()
.log
.info(&format!("[joinir/vm_bridge] ✅ JoinIR result: {:?}", result));
get_global_ring0().log.info(&format!(
"[joinir/vm_bridge] ✅ JoinIR result: {:?}",
result
));
let output = output_formatter(&result);
let exit_code = exit_code_extractor(&result);
@ -201,9 +203,10 @@ where
}
}
Err(e) => {
get_global_ring0()
.log
.info(&format!("[joinir/vm_bridge] ❌ JoinIR {} failed: {:?}", route_name, e));
get_global_ring0().log.info(&format!(
"[joinir/vm_bridge] ❌ JoinIR {} failed: {:?}",
route_name, e
));
get_global_ring0()
.log
.info("[joinir/vm_bridge] Falling back to normal VM path");