Phase 21.2 Complete: VM Adapter正規実装 + devブリッジ完全撤去
## 🎉 Phase 21.2完全達成 ### ✅ 実装完了 - VM static box 永続化(singleton infrastructure) - devブリッジ完全撤去(adapter_dev.rs削除、by-name dispatch削除) - .hako正規実装(MirCallV1Handler, AbiAdapterRegistry等) - text-merge経路完全動作 - 全phase2120 adapter reps PASS(7テスト) ### 🐛 バグ修正 1. strip_local_decl修正 - トップレベルのみlocal削除、メソッド内は保持 - src/runner/modes/common_util/hako.rs:29 2. static box フィールド永続化 - MirInterpreter singleton storage実装 - me parameter binding修正(1:1マッピング) - getField/setField string→singleton解決 - src/backend/mir_interpreter/{mod,exec,handlers/boxes_object_fields}.rs 3. Map.len alias rc=0修正 - [map/missing]パターン検出でnull扱い(4箇所) - lang/src/vm/boxes/mir_call_v1_handler.hako:91-93,131-133,151-153,199-201 ### 📁 主要変更ファイル #### Rust(VM Runtime) - src/backend/mir_interpreter/mod.rs - static box singleton storage - src/backend/mir_interpreter/exec.rs - parameter binding fix - src/backend/mir_interpreter/handlers/boxes_object_fields.rs - singleton resolution - src/backend/mir_interpreter/handlers/calls.rs - dev bridge removal - src/backend/mir_interpreter/utils/mod.rs - adapter_dev module removal - src/backend/mir_interpreter/utils/adapter_dev.rs - DELETED (7555 bytes) - src/runner/modes/vm.rs - static box declaration collection - src/runner/modes/common_util/hako.rs - strip_local_decl fix - src/instance_v2.rs - Clone implementation #### Hako (.hako実装) - lang/src/vm/boxes/mir_call_v1_handler.hako - [map/missing] detection - lang/src/vm/boxes/abi_adapter_registry.hako - NEW (adapter registry) - lang/src/vm/helpers/method_alias_policy.hako - method alias support #### テスト - tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_*.sh - 7 new tests ### 🎯 テスト結果 ``` ✅ s3_vm_adapter_array_len_canary_vm.sh ✅ s3_vm_adapter_array_len_per_recv_canary_vm.sh ✅ s3_vm_adapter_array_length_alias_canary_vm.sh ✅ s3_vm_adapter_array_size_alias_canary_vm.sh ✅ s3_vm_adapter_map_len_alias_state_canary_vm.sh ✅ s3_vm_adapter_map_length_alias_state_canary_vm.sh ✅ s3_vm_adapter_map_size_struct_canary_vm.sh ``` 環境フラグ: HAKO_ABI_ADAPTER=1 HAKO_ABI_ADAPTER_DEV=0 ### 🏆 設計品質 - ✅ ハードコード禁止(AGENTS.md 5.1)完全準拠 - ✅ 構造的・一般化設計(特定Box名のif分岐なし) - ✅ 後方互換性保持(既存コード破壊ゼロ) - ✅ text-merge経路(.hako依存関係正しくマージ) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
26
tools/selfhost/examples/hako_llvm_selfhost_driver.hako
Normal file
26
tools/selfhost/examples/hako_llvm_selfhost_driver.hako
Normal file
@ -0,0 +1,26 @@
|
||||
// hako_llvm_selfhost_driver.hako — minimal driver to emit+link via C‑API from Hako
|
||||
// Usage (env):
|
||||
// _MIR_JSON: v1 JSON text
|
||||
// _EXE_OUT : output path for linked executable
|
||||
// Prints the exe path to stdout.
|
||||
|
||||
using selfhost.vm.helpers.mir_call_v1_handler as MirCallV1HandlerBox // not required but keeps linker alive
|
||||
|
||||
static box Main {
|
||||
method main(args) {
|
||||
local j = env.get("_MIR_JSON")
|
||||
local exe_out = env.get("_EXE_OUT")
|
||||
if j == null { print("[ERR] _MIR_JSON not set"); return 1 }
|
||||
if exe_out == null { exe_out = "/tmp/hako_selfhost_exe" }
|
||||
// emit object
|
||||
local a = new ArrayBox(); a.push(j)
|
||||
local obj = hostbridge.extern_invoke("env.codegen", "emit_object", a)
|
||||
if obj == null { print("[ERR] emit_object failed"); return 2 }
|
||||
// link exe
|
||||
local b = new ArrayBox(); b.push(obj); b.push(exe_out)
|
||||
local exe = hostbridge.extern_invoke("env.codegen", "link_object", b)
|
||||
if exe == null { print("[ERR] link_object failed"); return 3 }
|
||||
print("" + exe)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
32
tools/selfhost/run_all.sh
Normal file
32
tools/selfhost/run_all.sh
Normal file
@ -0,0 +1,32 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
||||
|
||||
echo "[selfhost] Running phase2120 pure/TM reps"
|
||||
export NYASH_LLVM_USE_CAPI=${NYASH_LLVM_USE_CAPI:-1}
|
||||
export HAKO_V1_EXTERN_PROVIDER_C_ABI=${HAKO_V1_EXTERN_PROVIDER_C_ABI:-1}
|
||||
export HAKO_CAPI_PURE=${HAKO_CAPI_PURE:-1}
|
||||
# Optional: set HAKO_CAPI_TM=1 to exercise TargetMachine path
|
||||
|
||||
# Use curated runner to ensure ordering (pure first) and env toggles
|
||||
bash "$ROOT/tools/smokes/v2/profiles/quick/core/phase2120/run_all.sh"
|
||||
|
||||
echo "[selfhost] Running minimal .hako → LLVM selfhost driver"
|
||||
TMP_JSON="/tmp/hako_min44_$$.json"
|
||||
cat > "$TMP_JSON" <<'JSON'
|
||||
{"schema_version":"1.0","functions":[{"name":"main","blocks":[{"id":0,"instructions":[
|
||||
{"op":"const","dst":1,"value":{"type":"i64","value":44}},
|
||||
{"op":"ret","value":1}
|
||||
]}]}]}
|
||||
JSON
|
||||
|
||||
EXE="/tmp/hako_selfhost_min_exe_$$"
|
||||
set +e
|
||||
HAKO_CAPI_PURE=${HAKO_CAPI_PURE:-1} NYASH_LLVM_USE_CAPI=${NYASH_LLVM_USE_CAPI:-1} HAKO_V1_EXTERN_PROVIDER_C_ABI=${HAKO_V1_EXTERN_PROVIDER_C_ABI:-1} \
|
||||
bash "$ROOT/tools/selfhost/run_hako_llvm_selfhost.sh" "$TMP_JSON" "$EXE"
|
||||
RC=$?
|
||||
set -e
|
||||
echo "[selfhost] exe=$EXE rc=$RC"
|
||||
rm -f "$TMP_JSON" || true
|
||||
exit 0
|
||||
46
tools/selfhost/run_hako_llvm_selfhost.sh
Normal file
46
tools/selfhost/run_hako_llvm_selfhost.sh
Normal file
@ -0,0 +1,46 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Usage:
|
||||
# tools/selfhost/run_hako_llvm_selfhost.sh <json_file_or_-'stdin'> [exe_out]
|
||||
# Env toggles:
|
||||
# HAKO_CAPI_PURE=1 (required)
|
||||
# HAKO_CAPI_TM=1 (optional: use TargetMachine path)
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
||||
JSON_IN="${1:-}"
|
||||
EXE_OUT="${2:-/tmp/hako_selfhost_exe}"
|
||||
|
||||
if [[ -z "$JSON_IN" ]]; then
|
||||
echo "Usage: $0 <json_file_or_-'stdin'> [exe_out]" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if [[ "$JSON_IN" == "-" ]]; then
|
||||
MIR_JSON="$(cat)"
|
||||
else
|
||||
MIR_JSON="$(cat "$JSON_IN")"
|
||||
fi
|
||||
|
||||
export NYASH_LLVM_USE_CAPI=${NYASH_LLVM_USE_CAPI:-1}
|
||||
export HAKO_V1_EXTERN_PROVIDER_C_ABI=${HAKO_V1_EXTERN_PROVIDER_C_ABI:-1}
|
||||
export HAKO_CAPI_PURE=${HAKO_CAPI_PURE:-1}
|
||||
|
||||
if [[ "${NYASH_LLVM_USE_CAPI}" != "1" || "${HAKO_V1_EXTERN_PROVIDER_C_ABI}" != "1" || "${HAKO_CAPI_PURE}" != "1" ]]; then
|
||||
echo "[ERR] require NYASH_LLVM_USE_CAPI=1 HAKO_V1_EXTERN_PROVIDER_C_ABI=1 HAKO_CAPI_PURE=1" >&2
|
||||
exit 3
|
||||
fi
|
||||
|
||||
export _MIR_JSON="$MIR_JSON"
|
||||
export _EXE_OUT="$EXE_OUT"
|
||||
|
||||
CODE_CONTENT="$(cat "$ROOT/tools/selfhost/examples/hako_llvm_selfhost_driver.hako")"
|
||||
OUT="$(bash "$ROOT/tools/dev/hako_debug_run.sh" --safe -c "$CODE_CONTENT" 2>/dev/null)" || true
|
||||
EXE_PATH="$(echo "$OUT" | tail -n1 | tr -d '\r')"
|
||||
if [[ ! -f "$EXE_PATH" ]]; then
|
||||
echo "[ERR] exe not produced: $EXE_PATH" >&2
|
||||
exit 4
|
||||
fi
|
||||
echo "$EXE_PATH"
|
||||
"$EXE_PATH"
|
||||
exit $?
|
||||
Reference in New Issue
Block a user