Successfully split the massive instructions.rs (1400+ lines) into organized submodules: Structure: - instructions/mod.rs - Module exports and wiring - instructions/blocks.rs - Basic block creation and PHI setup - instructions/flow.rs - Control flow (Return, Jump, Branch) - instructions/externcall.rs - External call handling - instructions/newbox.rs - NewBox operations - instructions/boxcall.rs - BoxCall lowering (main dispatch) - instructions/strings.rs - String fast-paths (concat, length) - instructions/arrays.rs - Array operations (get/set/push/length) - instructions/maps.rs - Map operations (size/get/set/has) - instructions/arith.rs - Arithmetic operations (UnaryOp, BinOp, Compare) - instructions/mem.rs - Memory operations (Load, Store) - instructions/consts.rs - Constant value handling Benefits: - Improved maintainability (each file ~200-400 lines) - Clear separation of concerns - No behavior changes (pure refactoring) - All existing smoke tests pass 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
155 lines
6.6 KiB
Rust
155 lines
6.6 KiB
Rust
use std::collections::HashMap;
|
|
|
|
use inkwell::AddressSpace;
|
|
use inkwell::values::BasicValueEnum as BVE;
|
|
|
|
use crate::backend::llvm::context::CodegenContext;
|
|
use crate::mir::ValueId;
|
|
|
|
// NewBox lowering (subset consistent with existing code)
|
|
pub(in super::super) fn lower_newbox<'ctx>(
|
|
codegen: &CodegenContext<'ctx>,
|
|
vmap: &mut HashMap<ValueId, inkwell::values::BasicValueEnum<'ctx>>,
|
|
dst: ValueId,
|
|
box_type: &str,
|
|
args: &[ValueId],
|
|
box_type_ids: &HashMap<String, i64>,
|
|
) -> Result<(), String> {
|
|
match (box_type, args.len()) {
|
|
("StringBox", 1) => {
|
|
// Keep as i8* string pointer (AOT string fast-path)
|
|
let av = *vmap.get(&args[0]).ok_or("StringBox arg missing")?;
|
|
vmap.insert(dst, av);
|
|
Ok(())
|
|
}
|
|
(_, n) if n == 1 || n == 2 => {
|
|
let type_id = *box_type_ids.get(box_type).unwrap_or(&0);
|
|
let i64t = codegen.context.i64_type();
|
|
let fnty = i64t.fn_type(&[i64t.into(), i64t.into(), i64t.into(), i64t.into()], false);
|
|
let callee = codegen
|
|
.module
|
|
.get_function("nyash.box.birth_i64")
|
|
.unwrap_or_else(|| codegen.module.add_function("nyash.box.birth_i64", fnty, None));
|
|
let argc = i64t.const_int(args.len() as u64, false);
|
|
let mut a1 = i64t.const_zero();
|
|
let mut a2 = i64t.const_zero();
|
|
if args.len() >= 1 {
|
|
let v = *vmap.get(&args[0]).ok_or("newbox arg[0] missing")?;
|
|
a1 = match v {
|
|
BVE::IntValue(iv) => iv,
|
|
BVE::PointerValue(pv) => codegen
|
|
.builder
|
|
.build_ptr_to_int(pv, i64t, "arg0_p2i")
|
|
.map_err(|e| e.to_string())?,
|
|
_ => {
|
|
return Err(
|
|
"newbox arg[0]: unsupported type (expect int or handle ptr)"
|
|
.to_string(),
|
|
)
|
|
}
|
|
};
|
|
}
|
|
if args.len() >= 2 {
|
|
let v = *vmap.get(&args[1]).ok_or("newbox arg[1] missing")?;
|
|
a2 = match v {
|
|
BVE::IntValue(iv) => iv,
|
|
BVE::PointerValue(pv) => codegen
|
|
.builder
|
|
.build_ptr_to_int(pv, i64t, "arg1_p2i")
|
|
.map_err(|e| e.to_string())?,
|
|
_ => {
|
|
return Err(
|
|
"newbox arg[1]: unsupported type (expect int or handle ptr)"
|
|
.to_string(),
|
|
)
|
|
}
|
|
};
|
|
}
|
|
let tid = i64t.const_int(type_id as u64, true);
|
|
let call = codegen
|
|
.builder
|
|
.build_call(callee, &[tid.into(), argc.into(), a1.into(), a2.into()], "birth_i64")
|
|
.map_err(|e| e.to_string())?;
|
|
let h = call
|
|
.try_as_basic_value()
|
|
.left()
|
|
.ok_or("birth_i64 returned void".to_string())?
|
|
.into_int_value();
|
|
let pty = codegen.context.ptr_type(AddressSpace::from(0));
|
|
let ptr = codegen
|
|
.builder
|
|
.build_int_to_ptr(h, pty, "handle_to_ptr")
|
|
.map_err(|e| e.to_string())?;
|
|
vmap.insert(dst, ptr.into());
|
|
Ok(())
|
|
}
|
|
_ => {
|
|
// No-arg birth via central type registry (preferred),
|
|
// fallback to env.box.new(name) when type_id is unavailable.
|
|
if !args.is_empty() {
|
|
return Err("NewBox with >2 args not yet supported in LLVM lowering".to_string());
|
|
}
|
|
let type_id = *box_type_ids.get(box_type).unwrap_or(&0);
|
|
// Temporary gate: allow forcing MapBox to plugin path explicitly
|
|
let force_plugin_map = std::env::var("NYASH_LLVM_FORCE_PLUGIN_MAP")
|
|
.ok()
|
|
.as_deref()
|
|
== Some("1");
|
|
let i64t = codegen.context.i64_type();
|
|
if type_id != 0 && !(box_type == "MapBox" && !force_plugin_map) {
|
|
// declare i64 @nyash.box.birth_h(i64)
|
|
let fn_ty = i64t.fn_type(&[i64t.into()], false);
|
|
let callee = codegen
|
|
.module
|
|
.get_function("nyash.box.birth_h")
|
|
.unwrap_or_else(|| codegen.module.add_function("nyash.box.birth_h", fn_ty, None));
|
|
let tid = i64t.const_int(type_id as u64, true);
|
|
let call = codegen
|
|
.builder
|
|
.build_call(callee, &[tid.into()], "birth")
|
|
.map_err(|e| e.to_string())?;
|
|
let h_i64 = call
|
|
.try_as_basic_value()
|
|
.left()
|
|
.ok_or("birth_h returned void".to_string())?
|
|
.into_int_value();
|
|
let pty = codegen.context.ptr_type(AddressSpace::from(0));
|
|
let ptr = codegen
|
|
.builder
|
|
.build_int_to_ptr(h_i64, pty, "handle_to_ptr")
|
|
.map_err(|e| e.to_string())?;
|
|
vmap.insert(dst, ptr.into());
|
|
Ok(())
|
|
} else {
|
|
// Fallback: call i64 @nyash.env.box.new(i8*) with type name
|
|
let i8p = codegen.context.ptr_type(AddressSpace::from(0));
|
|
let fn_ty = i64t.fn_type(&[i8p.into()], false);
|
|
let callee = codegen
|
|
.module
|
|
.get_function("nyash.env.box.new")
|
|
.unwrap_or_else(|| codegen.module.add_function("nyash.env.box.new", fn_ty, None));
|
|
let tn = codegen
|
|
.builder
|
|
.build_global_string_ptr(box_type, "box_type_name")
|
|
.map_err(|e| e.to_string())?;
|
|
let call = codegen
|
|
.builder
|
|
.build_call(callee, &[tn.as_pointer_value().into()], "env_box_new")
|
|
.map_err(|e| e.to_string())?;
|
|
let h_i64 = call
|
|
.try_as_basic_value()
|
|
.left()
|
|
.ok_or("env.box.new returned void".to_string())?
|
|
.into_int_value();
|
|
let pty = codegen.context.ptr_type(AddressSpace::from(0));
|
|
let ptr = codegen
|
|
.builder
|
|
.build_int_to_ptr(h_i64, pty, "handle_to_ptr")
|
|
.map_err(|e| e.to_string())?;
|
|
vmap.insert(dst, ptr.into());
|
|
Ok(())
|
|
}
|
|
}
|
|
}
|
|
}
|