FABRIC-3.10.8 K-10: remove the stale Hermes-VM references
CONNECT-HERMES (birthed the removed hermes:init.4th; always failed) and ARTEMIS-ANNOUNCE-READY (no callers) are gone; DoE CSV column 17 is now hestia_heat_q48, same position. New baseline on all three ISAs: word_count 544, M7.1a hash 0x927513aabd543433, Hera 0x4953a2e2d11fff34, Artemis 0xc5a8cff4b805b6a0, Hestia unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
ff8e505308
commit
a66c4f3d5e
@@ -130,8 +130,8 @@ CapsuleRunResult capsule_runcap_birth(
|
||||
out_vm_id, out_vm_ctx);
|
||||
|
||||
/* capsule_birth_baby() itself never sets the registry entry's own
|
||||
* .name -- every existing caller (mama_word_birth, CONNECT-HERMES/
|
||||
* -ARTEMIS) does this as a separate step after a successful birth,
|
||||
* .name -- every existing caller (mama_word_birth, CONNECT-ARTEMIS)
|
||||
* does this as a separate step after a successful birth,
|
||||
* via capsule_vm_registry_set_name(). Found live: skipping this left
|
||||
* a freshly RUNCAP-born VM's registry name empty, which the idle-loop
|
||||
* pump (FABRIC-2.md Phase C) then read as a zero-length name and
|
||||
|
||||
@@ -2235,65 +2235,6 @@ static void mama_word_bye(VM *vm __attribute__((unused)))
|
||||
arch_cold_reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief CONNECT-HERMES ( -- ) — Enter Hermes's REPL, birthing it first if needed.
|
||||
*
|
||||
* Idempotent: if Hermes is already born (LIVE or STOPPED) it is entered
|
||||
* directly without re-birthing. On BYE from Hermes, control returns here.
|
||||
*/
|
||||
static void mama_word_connect_hermes(VM *vm)
|
||||
{
|
||||
VMRegistryEntry entry;
|
||||
VM *hermes;
|
||||
char saved_name[VM_NAME_MAX];
|
||||
|
||||
/* Birth if not found or previously dead/stillborn */
|
||||
if (capsule_vm_find_by_name_nocase("Hermes", &entry) != 0 ||
|
||||
entry.state == VM_STATE_DEAD ||
|
||||
entry.state == VM_STATE_STILLBORN) {
|
||||
VMUuid new_vm_id = vm_uuid_none();
|
||||
char saved[VM_NAME_MAX]; console_save_vm_name(saved, sizeof(saved));
|
||||
CapsuleRunResult r;
|
||||
|
||||
console_set_vm_name("Hermes");
|
||||
r = capsule_birth_baby(
|
||||
"hermes:init.4th",
|
||||
capsule_get_directory(),
|
||||
capsule_get_descriptors(),
|
||||
capsule_get_names(),
|
||||
capsule_get_arena(),
|
||||
vm->stadium_vm_id, /* §H.12 step 7: who is birthing this VM */
|
||||
0, /* skip_pki_sig: normal build-time capsule */
|
||||
&new_vm_id, (void **)0);
|
||||
console_set_vm_name(saved);
|
||||
|
||||
if (r != CAPSULE_RUN_OK) {
|
||||
console_println("CONNECT-HERMES: birth failed");
|
||||
return;
|
||||
}
|
||||
capsule_vm_registry_set_name(new_vm_id, "Hermes");
|
||||
if (capsule_vm_find_by_name_nocase("Hermes", &entry) != 0) {
|
||||
console_println("CONNECT-HERMES: registry error");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
hermes = (VM *)entry.vm_ptr;
|
||||
if (!hermes) {
|
||||
console_println("CONNECT-HERMES: no VM pointer");
|
||||
return;
|
||||
}
|
||||
|
||||
console_save_vm_name(saved_name, sizeof(saved_name));
|
||||
console_set_vm_name(entry.name);
|
||||
capsule_vm_set_state(entry.vm_id, VM_STATE_LIVE);
|
||||
|
||||
sk_repl_run(hermes);
|
||||
|
||||
capsule_vm_set_state(entry.vm_id, VM_STATE_STOPPED);
|
||||
console_set_vm_name(saved_name);
|
||||
}
|
||||
|
||||
/* Forward declarations: these 8 are defined later in this file (originally
|
||||
* only ever used from register_child_vm_words(), which comes after them),
|
||||
* but FABRIC-3.md SXX now also registers them here, earlier in the file. */
|
||||
@@ -2317,7 +2258,6 @@ void register_mama_forth_words(VM *vm)
|
||||
{
|
||||
/* Register words in FORTH vocabulary first */
|
||||
register_word(vm, "BYE", mama_word_bye);
|
||||
register_word(vm, "CONNECT-HERMES", mama_word_connect_hermes);
|
||||
register_word(vm, "CONNECT-ARTEMIS", mama_word_connect_artemis);
|
||||
register_word(vm, "BIRTH", mama_word_birth);
|
||||
register_word(vm, "KILL", mama_word_kill);
|
||||
@@ -2381,7 +2321,6 @@ void register_mama_forth_words(VM *vm)
|
||||
|
||||
/* Re-register in MAMA vocabulary context */
|
||||
register_word(vm, "BYE", mama_word_bye);
|
||||
register_word(vm, "CONNECT-HERMES", mama_word_connect_hermes);
|
||||
register_word(vm, "CONNECT-ARTEMIS", mama_word_connect_artemis);
|
||||
register_word(vm, "BIRTH", mama_word_birth);
|
||||
register_word(vm, "KILL", mama_word_kill);
|
||||
|
||||
@@ -49,7 +49,9 @@
|
||||
* 14. time_trust_q48 uint64 — TIME-TRUST in Q48.16 format
|
||||
* 15. variance_q48 uint64 — timing variance in Q48.16 format
|
||||
* 16. hera_heat_q48 uint64 — VM fleet physics: Hera's execution_heat_q48
|
||||
* 17. hermes_heat_q48 uint64 — VM fleet physics: Hermes's execution_heat_q48
|
||||
* 17. hestia_heat_q48 uint64 — VM fleet physics: Hestia's execution_heat_q48
|
||||
* (FABRIC-3.10.8 K-10: was hermes_heat_q48, always
|
||||
* 0 once the Hermes VM was retired; same position)
|
||||
* 18. artemis_heat_q48 uint64 — VM fleet physics: Artemis's execution_heat_q48
|
||||
* 19. fleet_k_q48 uint64 — "K": vm_physics_fleet_heat_sum() over ALL live
|
||||
* VMs (not just the 3 named Tripod members above --
|
||||
@@ -65,11 +67,13 @@
|
||||
* 21. switch_count_cumulative uint64 — Stage 3 preemptive-switch count, cumulative
|
||||
* since boot (capsule_vm_switch_signal.c).
|
||||
* 22. switch_current_slot uint32 — which registered switch-signal participant is
|
||||
* executing at this tick (0=Hera,1=Hermes,
|
||||
* 2=Artemis by current registration order;
|
||||
* 0xFFFFFFFF = none/unregistered at this moment).
|
||||
* executing at this tick, by registration order
|
||||
* (not a fixed VM; 0xFFFFFFFF = none/unregistered
|
||||
* at this moment).
|
||||
* 23. switch_hera_readiness uint32 — Hera's raw readiness accumulator (slot 0).
|
||||
* 24. switch_hermes_readiness uint32 — Hermes's raw readiness accumulator (slot 1).
|
||||
* 24. switch_hermes_readiness uint32 — slot 1's raw readiness accumulator (always 0
|
||||
* since FABRIC-3.8.md Stage C-b; name kept
|
||||
* with the other two, see below).
|
||||
* 25. switch_artemis_readiness uint32 — Artemis's raw readiness accumulator (slot 2).
|
||||
* 26. switch_ticks_since uint32 — ticks elapsed since the last real switch
|
||||
* (capsule_vm_switch_signal.c); empirically
|
||||
@@ -97,7 +101,7 @@
|
||||
* three known Tripod VMs, not a dynamic per-VM column set -- this is a
|
||||
* logging schema for a specific known fleet, not the physics mechanism
|
||||
* itself (which stays genuinely VM-count-agnostic). Reads 0 for any VM not
|
||||
* currently found in the registry (e.g. Hermes momentarily during its
|
||||
* currently found in the registry (e.g. a Tripod VM momentarily during its
|
||||
* kill/rebirth window), which is a legitimate observation, not an error.
|
||||
*/
|
||||
|
||||
@@ -123,7 +127,7 @@ static const char *doe_header =
|
||||
"hot_word_count,avg_word_heat_q48,"
|
||||
"window_width,actual_window_size,predicted_label_hits,jitter_bits,"
|
||||
"apic_ticks,time_trust_q48,variance_q48,vm_call_depth_max,"
|
||||
"hera_heat_q48,hermes_heat_q48,artemis_heat_q48,"
|
||||
"hera_heat_q48,hestia_heat_q48,artemis_heat_q48,"
|
||||
"fleet_k_q48,fleet_conserved,"
|
||||
"switch_count_cumulative,switch_current_slot,"
|
||||
"switch_hera_readiness,switch_hermes_readiness,switch_artemis_readiness,"
|
||||
@@ -204,7 +208,7 @@ void doe_log_tick_row(VM *vm, const HeartbeatTickSnapshot *snap)
|
||||
}
|
||||
|
||||
uint64_t hera_heat_q48 = doe_log_heat_by_name("Hera");
|
||||
uint64_t hermes_heat_q48 = doe_log_heat_by_name("Hermes");
|
||||
uint64_t hestia_heat_q48 = doe_log_heat_by_name("Hestia");
|
||||
uint64_t artemis_heat_q48 = doe_log_heat_by_name("Artemis");
|
||||
uint64_t fleet_k_q48 = vm_physics_fleet_heat_sum();
|
||||
unsigned fleet_conserved = vm_physics_conserved() ? 1u : 0u;
|
||||
@@ -247,7 +251,7 @@ void doe_log_tick_row(VM *vm, const HeartbeatTickSnapshot *snap)
|
||||
(unsigned long long)variance_q48,
|
||||
vm_call_depth_max,
|
||||
(unsigned long long)hera_heat_q48,
|
||||
(unsigned long long)hermes_heat_q48,
|
||||
(unsigned long long)hestia_heat_q48,
|
||||
(unsigned long long)artemis_heat_q48,
|
||||
(unsigned long long)fleet_k_q48,
|
||||
fleet_conserved,
|
||||
|
||||
Reference in New Issue
Block a user