admin/LithosAnanake
1
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases Wiki Activity

Move vocabulary and control-flow state off file-scope statics onto VM

Browse Source 
proof/FINDINGS.md's Isabelle/HOL word-source sweep (§1) found the two
defects severe enough to actively corrupt the live Tripod multi-VM fleet:
file-scope C statics standing in for state that belongs on struct VM.

- vocabulary_words.c (highest severity in the sweep): forth_vocab/
  context_vocab/current_vocab, context_var_addr/current_var_addr, the
  ctx_fc/forth_fc first-char search index, and the `initialized` guard
  were all process-wide statics. Only the first VM to touch any
  vocabulary word ever ran setup; every VM after that silently shared
  VM #1's dictionary-chain pointers and reused VM #1's byte-offset
  addresses as if valid in its own vm->memory. One VM's VOCABULARY/
  DEFINITIONS/FORTH silently changed where every other VM looked up and
  defined words.

- control_words.c: cf_stack/cf_sp/cf_last_mode (IF/THEN/BEGIN/DO/CASE
  compile-time nesting) and the LEAVE/ENDOF patch-site bookkeeping
  (leave_addrs/leave_sp/leave_mark_*, endof_addrs/endof_sp/endof_mark_*)
  were also process-wide statics. Two VMs compiling colon definitions at
  overlapping times would corrupt each other's nesting state.

Both moved onto struct VM, following the existing hold_addr/hold_pos
precedent in include/vm.h ("lives in each VM's own memory... so child
VMs never alias Hera's buffer"):

- New VocabularyState struct (vm->vocab): chain heads, VM-cell addresses,
  first-char index, initialized flag.
- New ControlFlowState struct (vm->cf): cf_stack/cf_sp/cf_last_mode plus
  the LEAVE/ENDOF patch-site stacks. cf_tag_t/cf_item_t/CF_STACK_MAX
  moved from control_words.c into include/vm.h since they're now part of
  the struct VM field's type.
- Sentinel fields (-1/-999, meaning "empty") explicitly initialized in
  both vm_init_with_host() implementations (hosted src/vm_bootstrap.c and
  kernel src/starkernel/vm/vm_bootstrap.c) alongside the existing
  dsp/rsp = -1 initialization, since the preceding zero-init leaves them
  at 0 rather than their empty sentinel.

Every word function in both files already took VM *vm, so no call sites
outside these two files needed to change; cf_push_item/cf_pop_item/
cf_peek_item gained a VM* parameter to reach vm->cf.

Verified: hosted (amd64) and kernel (amd64, __STARKERNEL__) both build
clean with -Wall -Werror after a full clean rebuild (struct VM's layout
changed size, and this Makefile has no header-dependency tracking, so a
stale incremental build would have linked mismatched object layouts).
Hosted POST suite 1012/1012 passing (0 regressions). Manually exercised
VOCABULARY/DEFINITIONS/FORTH/ORDER, and IF/ELSE, DO/LOOP/LEAVE,
BEGIN/WHILE/REPEAT, and CASE/OF/ENDOF/ENDCASE (including nested DO with
I/J) in the REPL -- all correct and unchanged from pre-refactor behavior.

Note: a pre-existing CASE/ENDCASE default-clause bug (the code after the
last OF...ENDOF pair does not correctly become the "default" value once
DROP runs) was found while testing this refactor and confirmed present
on unmodified master too -- not touched here, out of scope for this pass.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014Qf6YcnHgaEtEygq3knx19
This commit is contained in:
Claude
2026-09-05 14:07:41 +00:00
parent c36bd99e1e
commit d6895bdd15
6 changed files with 230 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vm.h
+78
View File
@@ -364,6 +364,81 @@ typedef enum
MODE_COMPILE = 1 MODE_COMPILE = 1
} vm_mode_t; } vm_mode_t;
/* Per-VM vocabulary (VOCABULARY/DEFINITIONS/CONTEXT/CURRENT/FORTH) state.
* Was a set of file-scope statics in vocabulary_words.c, shared by every VM
* in the process -- one VM's VOCABULARY/DEFINITIONS/FORTH silently changed
* where every other VM looked up and defined words (proof/FINDINGS.md #1,
* item #5, "highest severity in the sweep"). Moved onto struct VM so each
* VM in the fleet keeps its own vocabulary chains, search order, and VM-cell
* addresses -- same shape as hold_addr/hold_pos below. */
#define VOCAB_FC_BUCKETS 256
typedef struct {
int initialized;
/* Host-side vocabulary chain heads */
DictEntry *forth_vocab; /* FORTH vocabulary head (root of system) */
DictEntry *context_vocab; /* CONTEXT vocabulary head */
DictEntry *current_vocab; /* CURRENT vocabulary head */
/* VM-visible variables: cell addresses in this VM's own memory */
vaddr_t context_var_addr; /* cell containing (DictEntry*) CONTEXT */
vaddr_t current_var_addr; /* cell containing (DictEntry*) CURRENT */
/* First-character search index per chain, lazily rebuilt when that
* chain's head changes (see vocab_find_word in vocabulary_words.c) */
DictEntry **ctx_fc[VOCAB_FC_BUCKETS];
size_t ctx_n[VOCAB_FC_BUCKETS];
DictEntry *ctx_cached_head;
DictEntry **forth_fc[VOCAB_FC_BUCKETS];
size_t forth_n[VOCAB_FC_BUCKETS];
DictEntry *forth_cached_head;
} VocabularyState;
/* Compile-time control-flow bookkeeping for IF/ELSE/THEN, BEGIN/WHILE/REPEAT/
* UNTIL/AGAIN, DO/?DO/LOOP/+LOOP/LEAVE, and CASE/OF/ENDOF/ENDCASE.
* Was a set of file-scope statics in control_words.c, shared by every VM in
* the process -- two VMs compiling control structures at overlapping times
* would corrupt each other's nesting state (proof/FINDINGS.md #1, item #1,
* "the two that would actually corrupt VM behavior in the live Tripod fleet
* today"). Moved onto struct VM so each VM keeps its own compile-time stacks. */
#define CF_STACK_MAX 64
typedef enum {
CF_BEGIN, /* Address of BEGIN target */
CF_IF, /* Address of IF's 0BRANCH literal */
CF_ELSE, /* Address of ELSE's BRANCH literal */
CF_WHILE, /* Address of WHILE's 0BRANCH literal (paired with prior BEGIN) */
CF_DO, /* Address of loop body start (back target for LOOP/+LOOP) */
CF_CASE, /* Marker for CASE statement start */
CF_OF /* Address of OF's 0BRANCH literal */
} cf_tag_t;
typedef struct {
size_t addr; /* byte offset in vm->memory used for patching/back edges */
cf_tag_t tag;
} cf_item_t;
typedef struct {
cf_item_t cf_stack[CF_STACK_MAX];
int cf_sp;
int cf_last_mode; /* reset cf_stack on mode transitions (INTERPRET/COMPILE) */
/* LEAVE patch sites: one entry per LEAVE, collected until LOOP/+LOOP */
size_t leave_addrs[CF_STACK_MAX];
int leave_sp;
/* One mark per DO nesting: leave_sp at DO/?DO entry, restored at LOOP/+LOOP */
int leave_mark_stack[CF_STACK_MAX];
int leave_mark_sp;
/* ENDOF patch sites: one entry per ENDOF, collected until ENDCASE */
size_t endof_addrs[CF_STACK_MAX];
int endof_sp;
/* One mark per CASE nesting: endof_sp at CASE entry, restored at ENDCASE */
int endof_mark_stack[CF_STACK_MAX];
int endof_mark_sp;
} ControlFlowState;
#ifdef __STARKERNEL__ #ifdef __STARKERNEL__
#include "starkernel/vm_uuid.h" /* VMUuid -- item 4.2, VM.stadium_vm_id */ #include "starkernel/vm_uuid.h" /* VMUuid -- item 4.2, VM.stadium_vm_id */
#include "starkernel/vm_identity.h" /* VMIdentity -- FABRIC-2.md §F.2/§F.16 */ #include "starkernel/vm_identity.h" /* VMIdentity -- FABRIC-2.md §F.2/§F.16 */
@@ -472,6 +547,9 @@ typedef struct VM
vaddr_t hold_addr; /* VM memory offset of the 64-byte pictured-number hold buffer */ vaddr_t hold_addr; /* VM memory offset of the 64-byte pictured-number hold buffer */
int hold_pos; /* Current fill count in hold buffer (<# ... #> state) */ int hold_pos; /* Current fill count in hold buffer (<# ... #> state) */
VocabularyState vocab; /* Per-VM VOCABULARY/DEFINITIONS/CONTEXT/CURRENT state */
ControlFlowState cf; /* Per-VM compile-time control-flow bookkeeping */
/* Block I/O window — BLK_VM_SLOTS slots at BLK_VM_WINDOW_BASE in vm->memory. /* Block I/O window — BLK_VM_SLOTS slots at BLK_VM_WINDOW_BASE in vm->memory.
* BLOCK/BUFFER copy C-layer buffers here; UPDATE copies back; lbn==0 means empty. */ * BLOCK/BUFFER copy C-layer buffers here; UPDATE copies back; lbn==0 means empty. */
uint32_t blk_vm_lbn[BLK_VM_SLOTS]; /* LBN currently in each slot (0 = empty) */ uint32_t blk_vm_lbn[BLK_VM_SLOTS]; /* LBN currently in each slot (0 = empty) */
proof/FINDINGS.md
+9
View File
@@ -47,6 +47,15 @@ the two that would actually corrupt VM behavior in the live Tripod fleet
today, if two VMs exercise them concurrently. Worth scoping as a real fix today, if two VMs exercise them concurrently. Worth scoping as a real fix
independent of this proof work — moving these into `struct VM` fields. independent of this proof work — moving these into `struct VM` fields.
**RESOLVED 2026-09-05:** both #1 and #5 moved onto `struct VM`, following
the `hold_addr`/`hold_pos` precedent already in `include/vm.h`. `vocabulary_words.c`'s
chain heads, VM-cell addresses, first-char index, and `initialized` guard
now live at `vm->vocab` (a new `VocabularyState` struct); `control_words.c`'s
`cf_stack`/`leave_*`/`endof_*` bookkeeping now lives at `vm->cf` (a new
`ControlFlowState` struct). Every word function in both files already took
`VM *vm`, so no call sites outside these two files needed to change. #2, #3,
#4, #6, #7 remain open — out of scope for this pass.
--- ---
## 2. Missing overflow/capacity guards before stack pushes ## 2. Missing overflow/capacity guards before stack pushes
src/starkernel/vm/vm_bootstrap.c
+9
View File
@@ -190,6 +190,15 @@ void vm_init_with_host(VM* vm, const VMHostServices *host)
vm->rsp = -1; vm->rsp = -1;
vm->here = 0; vm->here = 0;
vm->exit_colon = 0; vm->exit_colon = 0;
/* Control-flow bookkeeping sentinels (-1/-999 mean "empty"; the
* `*vm = (VM){0}` above already zeroed the arrays themselves) */
vm->cf.cf_sp = -1;
vm->cf.cf_last_mode = -999;
vm->cf.leave_sp = -1;
vm->cf.leave_mark_sp = -1;
vm->cf.endof_sp = -1;
vm->cf.endof_mark_sp = -1;
vm->abort_requested = 0; vm->abort_requested = 0;
log_message(LOG_DEBUG, "vm_init: memory=%p here=%zu", (void*)vm->memory, vm->here); log_message(LOG_DEBUG, "vm_init: memory=%p here=%zu", (void*)vm->memory, vm->here);
src/vm_bootstrap.c
+9
View File
@@ -178,6 +178,15 @@ void vm_init(VM* vm)
vm->rsp = -1; vm->rsp = -1;
vm->here = 0; vm->here = 0;
vm->exit_colon = 0; vm->exit_colon = 0;
/* Control-flow bookkeeping sentinels (-1/-999 mean "empty"; memset above
* already zeroed the arrays themselves) */
vm->cf.cf_sp = -1;
vm->cf.cf_last_mode = -999;
vm->cf.leave_sp = -1;
vm->cf.leave_mark_sp = -1;
vm->cf.endof_sp = -1;
vm->cf.endof_mark_sp = -1;
vm->abort_requested = 0; vm->abort_requested = 0;
vm_align(vm); vm_align(vm);
src/word_source/control_words.c
+80 -121
View File
@@ -87,100 +87,59 @@ static void control_forth_EXIT(VM * vm);
/** /**
* @defgroup cf Control Flow Stack * @defgroup cf Control Flow Stack
* Compile-time control flow stack for tracking branch targets and loop structures * Compile-time control flow stack for tracking branch targets and loop
* structures. The types (cf_tag_t, cf_item_t, ControlFlowState) and the
* CF_STACK_MAX constant live in include/vm.h and the storage itself lives
* per-VM at vm->cf, so two VMs compiling colon definitions concurrently
* never share nesting state (see include/vm.h's ControlFlowState comment).
* @{ * @{
*/ */
/** Maximum depth of control flow stack */
#define CF_STACK_MAX 64
/** Control flow item types */
typedef enum {
CF_BEGIN, /**< Address of BEGIN target */
CF_IF, /**< Address of IF's 0BRANCH literal */
CF_ELSE, /**< Address of ELSE's BRANCH literal */
CF_WHILE, /**< Address of WHILE's 0BRANCH literal (paired with prior BEGIN) */
CF_DO, /**< Address of loop body start (back target for LOOP/+LOOP) */
CF_CASE, /**< Marker for CASE statement start */
CF_OF /**< Address of OF's 0BRANCH literal */
} cf_tag_t;
/** @} */
typedef struct {
size_t addr; /* byte offset in vm->memory used for patching/back edges */
cf_tag_t tag;
} cf_item_t;
static cf_item_t cf_stack[CF_STACK_MAX];
static int cf_sp = -1;
/* Reset CF stack on mode transitions (between INTERPRET/COMPILE) */
static int cf_last_mode = -999;
static inline void cf_epoch_sync(VM *vm) { static inline void cf_epoch_sync(VM *vm) {
if (!vm) return; if (!vm) return;
if (cf_last_mode == -999) { if (vm->cf.cf_last_mode == -999) {
cf_last_mode = vm->mode; vm->cf.cf_last_mode = vm->mode;
return; return;
} }
if ((int)vm->mode != cf_last_mode) { if ((int)vm->mode != vm->cf.cf_last_mode) {
cf_sp = -1; vm->cf.cf_sp = -1;
cf_last_mode = vm->mode; vm->cf.cf_last_mode = vm->mode;
log_message(LOG_DEBUG, "CF: reset (mode transition)"); log_message(LOG_DEBUG, "CF: reset (mode transition)");
} }
} }
static inline int cf_push_item(cf_tag_t tag, size_t mark) { static inline int cf_push_item(VM *vm, cf_tag_t tag, size_t mark) {
if (cf_sp + 1 >= CF_STACK_MAX) { if (vm->cf.cf_sp + 1 >= CF_STACK_MAX) {
log_message(LOG_ERROR, "CF: overflow"); log_message(LOG_ERROR, "CF: overflow");
return 0; return 0;
} }
++cf_sp; ++vm->cf.cf_sp;
cf_stack[cf_sp].tag = tag; vm->cf.cf_stack[vm->cf.cf_sp].tag = tag;
cf_stack[cf_sp].addr = mark; vm->cf.cf_stack[vm->cf.cf_sp].addr = mark;
return 1; return 1;
} }
static inline int cf_pop_item(cf_item_t *out) { static inline int cf_pop_item(VM *vm, cf_item_t *out) {
if (cf_sp < 0) { if (vm->cf.cf_sp < 0) {
log_message(LOG_ERROR, "CF: underflow"); log_message(LOG_ERROR, "CF: underflow");
return 0; return 0;
} }
if (out) { if (out) {
*out = cf_stack[cf_sp]; *out = vm->cf.cf_stack[vm->cf.cf_sp];
} }
--cf_sp; --vm->cf.cf_sp;
return 1; return 1;
} }
static inline int cf_peek_item(cf_item_t *out) { static inline int cf_peek_item(VM *vm, cf_item_t *out) {
if (cf_sp < 0) return 0; if (vm->cf.cf_sp < 0) return 0;
if (out) { if (out) {
*out = cf_stack[cf_sp]; *out = vm->cf.cf_stack[vm->cf.cf_sp];
} }
return 1; return 1;
} }
/* ===================== LEAVE patching (compile-time) ===================== */ /** @} */
/* We collect BRANCH literals for LEAVE sites and patch them at LOOP/+LOOP. */
static size_t leave_addrs[CF_STACK_MAX];
static int leave_sp = -1;
/* One mark per DO nesting: record leave_sp at DO/?DO; at LOOP/+LOOP patch and restore. */
static int leave_mark_stack[CF_STACK_MAX];
static int leave_mark_sp = -1;
/* ===================== CASE/ENDOF patching (compile-time) ===================== */
/* We collect BRANCH literals for ENDOF sites and patch them at ENDCASE. */
static size_t endof_addrs[CF_STACK_MAX];
static int endof_sp = -1;
/* One mark per CASE nesting: record endof_sp at CASE; at ENDCASE patch and restore. */
static int endof_mark_stack[CF_STACK_MAX];
static int endof_mark_sp = -1;
/* ===================== Low-level compile helpers ===================== */ /* ===================== Low-level compile helpers ===================== */
@@ -459,7 +418,7 @@ static void control_forth_if(VM *vm) {
} }
vm_compile_call(vm, control_forth_0branch); vm_compile_call(vm, control_forth_0branch);
size_t lit = emit_cell(vm, 0); size_t lit = emit_cell(vm, 0);
if (!cf_push_item(CF_IF, lit)) { if (!cf_push_item(vm, CF_IF, lit)) {
vm->error = 1; vm->error = 1;
return; return;
} }
@@ -474,17 +433,17 @@ static void control_forth_else(VM *vm) {
return; return;
} }
cf_item_t it; cf_item_t it;
if (!cf_peek_item(&it) || it.tag != CF_IF) { if (!cf_peek_item(vm, &it) || it.tag != CF_IF) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "ELSE: missing IF"); log_message(LOG_ERROR, "ELSE: missing IF");
return; return;
} }
(void) cf_pop_item(&it); (void) cf_pop_item(vm, &it);
vm_compile_call(vm, control_forth_branch); vm_compile_call(vm, control_forth_branch);
size_t new_lit = emit_cell(vm, 0); size_t new_lit = emit_cell(vm, 0);
cell_t off = (cell_t)((size_t) vm->here - it.addr); cell_t off = (cell_t)((size_t) vm->here - it.addr);
*(cell_t *) (vm->memory + it.addr) = off; *(cell_t *) (vm->memory + it.addr) = off;
if (!cf_push_item(CF_ELSE, new_lit)) { if (!cf_push_item(vm, CF_ELSE, new_lit)) {
vm->error = 1; vm->error = 1;
return; return;
} }
@@ -499,7 +458,7 @@ static void control_forth_then(VM *vm) {
return; return;
} }
cf_item_t it; cf_item_t it;
if (!cf_pop_item(&it) || (it.tag != CF_IF && it.tag != CF_ELSE)) { if (!cf_pop_item(vm, &it) || (it.tag != CF_IF && it.tag != CF_ELSE)) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "THEN: unmatched"); log_message(LOG_ERROR, "THEN: unmatched");
return; return;
@@ -516,7 +475,7 @@ static void control_forth_begin(VM *vm) {
log_message(LOG_ERROR, "BEGIN: compile-only"); log_message(LOG_ERROR, "BEGIN: compile-only");
return; return;
} }
if (!cf_push_item(CF_BEGIN, vm->here)) { if (!cf_push_item(vm, CF_BEGIN, vm->here)) {
vm->error = 1; vm->error = 1;
return; return;
} }
@@ -531,7 +490,7 @@ static void control_forth_until(VM *vm) {
return; return;
} }
cf_item_t begin; cf_item_t begin;
if (!cf_pop_item(&begin) || begin.tag != CF_BEGIN) { if (!cf_pop_item(vm, &begin) || begin.tag != CF_BEGIN) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "UNTIL: missing BEGIN"); log_message(LOG_ERROR, "UNTIL: missing BEGIN");
return; return;
@@ -550,7 +509,7 @@ static void control_forth_again(VM *vm) {
return; return;
} }
cf_item_t begin; cf_item_t begin;
if (!cf_pop_item(&begin) || begin.tag != CF_BEGIN) { if (!cf_pop_item(vm, &begin) || begin.tag != CF_BEGIN) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "AGAIN: missing BEGIN"); log_message(LOG_ERROR, "AGAIN: missing BEGIN");
return; return;
@@ -569,14 +528,14 @@ static void control_forth_while(VM *vm) {
return; return;
} }
cf_item_t b; cf_item_t b;
if (!cf_peek_item(&b) || b.tag != CF_BEGIN) { if (!cf_peek_item(vm, &b) || b.tag != CF_BEGIN) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "WHILE: needs BEGIN"); log_message(LOG_ERROR, "WHILE: needs BEGIN");
return; return;
} }
vm_compile_call(vm, control_forth_0branch); vm_compile_call(vm, control_forth_0branch);
size_t lit = emit_cell(vm, 0); size_t lit = emit_cell(vm, 0);
if (!cf_push_item(CF_WHILE, lit)) { if (!cf_push_item(vm, CF_WHILE, lit)) {
vm->error = 1; vm->error = 1;
return; return;
} }
@@ -591,12 +550,12 @@ static void control_forth_repeat(VM *vm) {
return; return;
} }
cf_item_t w, b; cf_item_t w, b;
if (!cf_pop_item(&w) || w.tag != CF_WHILE) { if (!cf_pop_item(vm, &w) || w.tag != CF_WHILE) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "REPEAT: missing WHILE"); log_message(LOG_ERROR, "REPEAT: missing WHILE");
return; return;
} }
if (!cf_pop_item(&b) || b.tag != CF_BEGIN) { if (!cf_pop_item(vm, &b) || b.tag != CF_BEGIN) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "REPEAT: missing BEGIN"); log_message(LOG_ERROR, "REPEAT: missing BEGIN");
return; return;
@@ -619,16 +578,16 @@ static void control_forth_qdo(VM *vm) {
} }
vm_compile_call(vm, control_forth_runtime_qdo); vm_compile_call(vm, control_forth_runtime_qdo);
size_t fwd_lit = emit_cell(vm, 0); size_t fwd_lit = emit_cell(vm, 0);
if (!cf_push_item(CF_DO, vm->here)) { if (!cf_push_item(vm, CF_DO, vm->here)) {
vm->error = 1; vm->error = 1;
return; return;
} /* back target for LOOP */ } /* back target for LOOP */
if (!cf_push_item(CF_WHILE, fwd_lit)) { if (!cf_push_item(vm, CF_WHILE, fwd_lit)) {
vm->error = 1; vm->error = 1;
return; return;
} /* forward to loop-end */ } /* forward to loop-end */
leave_mark_stack[++leave_mark_sp] = leave_sp; vm->cf.leave_mark_stack[++vm->cf.leave_mark_sp] = vm->cf.leave_sp;
log_message(LOG_DEBUG, "?DO: fwd lit @ %zu; back mark=%d", fwd_lit, leave_mark_stack[leave_mark_sp]); log_message(LOG_DEBUG, "?DO: fwd lit @ %zu; back mark=%d", fwd_lit, vm->cf.leave_mark_stack[vm->cf.leave_mark_sp]);
} }
/* DO ( limit index -- ) compile */ /* DO ( limit index -- ) compile */
@@ -640,12 +599,12 @@ static void control_forth_do(VM *vm) {
return; return;
} }
vm_compile_call(vm, control_forth_runtime_do); vm_compile_call(vm, control_forth_runtime_do);
if (!cf_push_item(CF_DO, vm->here)) { if (!cf_push_item(vm, CF_DO, vm->here)) {
vm->error = 1; vm->error = 1;
return; return;
} }
leave_mark_stack[++leave_mark_sp] = leave_sp; vm->cf.leave_mark_stack[++vm->cf.leave_mark_sp] = vm->cf.leave_sp;
log_message(LOG_DEBUG, "DO: mark @ %zu; leave_mark=%d", vm->here, leave_mark_stack[leave_mark_sp]); log_message(LOG_DEBUG, "DO: mark @ %zu; leave_mark=%d", vm->here, vm->cf.leave_mark_stack[vm->cf.leave_mark_sp]);
} }
/* LEAVE — compile runtime LEAVE plus BRANCH <placeholder>, collect patch site */ /* LEAVE — compile runtime LEAVE plus BRANCH <placeholder>, collect patch site */
@@ -659,13 +618,13 @@ static void control_forth_leave(VM *vm) {
/* verify inside DO */ /* verify inside DO */
int seen_do = 0; int seen_do = 0;
for (int i = cf_sp; i >= 0; --i) { for (int i = vm->cf.cf_sp; i >= 0; --i) {
if (cf_stack[i].tag == CF_DO) { if (vm->cf.cf_stack[i].tag == CF_DO) {
seen_do = 1; seen_do = 1;
break; break;
} }
} }
if (!seen_do || leave_mark_sp < 0) { if (!seen_do || vm->cf.leave_mark_sp < 0) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "LEAVE: needs DO"); log_message(LOG_ERROR, "LEAVE: needs DO");
return; return;
@@ -674,13 +633,13 @@ static void control_forth_leave(VM *vm) {
vm_compile_call(vm, control_forth_runtime_leave); vm_compile_call(vm, control_forth_runtime_leave);
vm_compile_call(vm, control_forth_branch); vm_compile_call(vm, control_forth_branch);
size_t lit = emit_cell(vm, 0); size_t lit = emit_cell(vm, 0);
if (leave_sp + 1 >= CF_STACK_MAX) { if (vm->cf.leave_sp + 1 >= CF_STACK_MAX) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "LEAVE: too many sites"); log_message(LOG_ERROR, "LEAVE: too many sites");
return; return;
} }
leave_addrs[++leave_sp] = lit; vm->cf.leave_addrs[++vm->cf.leave_sp] = lit;
log_message(LOG_DEBUG, "LEAVE: site lit @ %zu (leave_sp=%d)", lit, leave_sp); log_message(LOG_DEBUG, "LEAVE: site lit @ %zu (leave_sp=%d)", lit, vm->cf.leave_sp);
} }
/* LOOP — compile runtime LOOP + backoffset; patch ?DO fwd and LEAVE sites */ /* LOOP — compile runtime LOOP + backoffset; patch ?DO fwd and LEAVE sites */
@@ -696,14 +655,14 @@ static void control_forth_loop(VM *vm) {
cf_item_t maybe_qdo; cf_item_t maybe_qdo;
int have_qdo = 0; int have_qdo = 0;
cf_item_t top; cf_item_t top;
if (cf_peek_item(&top) && top.tag == CF_WHILE) { if (cf_peek_item(vm, &top) && top.tag == CF_WHILE) {
(void) cf_pop_item(&maybe_qdo); (void) cf_pop_item(vm, &maybe_qdo);
have_qdo = 1; have_qdo = 1;
} }
/* Required DO back mark */ /* Required DO back mark */
cf_item_t do_mark; cf_item_t do_mark;
if (!cf_pop_item(&do_mark) || do_mark.tag != CF_DO) { if (!cf_pop_item(vm, &do_mark) || do_mark.tag != CF_DO) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "LOOP: missing DO"); log_message(LOG_ERROR, "LOOP: missing DO");
return; return;
@@ -719,19 +678,19 @@ static void control_forth_loop(VM *vm) {
log_message(LOG_DEBUG, "LOOP: patched ?DO @ %zu -> +%ld", maybe_qdo.addr, (long) fwd); log_message(LOG_DEBUG, "LOOP: patched ?DO @ %zu -> +%ld", maybe_qdo.addr, (long) fwd);
} }
if (leave_mark_sp < 0) { if (vm->cf.leave_mark_sp < 0) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "LOOP: LEAVE mark underflow"); log_message(LOG_ERROR, "LOOP: LEAVE mark underflow");
return; return;
} }
int mark = leave_mark_stack[leave_mark_sp--]; int mark = vm->cf.leave_mark_stack[vm->cf.leave_mark_sp--];
for (int i = leave_sp; i > mark; --i) { for (int i = vm->cf.leave_sp; i > mark; --i) {
size_t addr = leave_addrs[i]; size_t addr = vm->cf.leave_addrs[i];
cell_t fwd = (cell_t)((size_t) vm->here - addr); cell_t fwd = (cell_t)((size_t) vm->here - addr);
*(cell_t *) (vm->memory + addr) = fwd; *(cell_t *) (vm->memory + addr) = fwd;
log_message(LOG_DEBUG, "LEAVE: patched @ %zu -> +%ld", addr, (long) fwd); log_message(LOG_DEBUG, "LEAVE: patched @ %zu -> +%ld", addr, (long) fwd);
} }
leave_sp = mark; vm->cf.leave_sp = mark;
log_message(LOG_DEBUG, "LOOP: back -> %zu (%ld bytes)", do_mark.addr, (long) back); log_message(LOG_DEBUG, "LOOP: back -> %zu (%ld bytes)", do_mark.addr, (long) back);
} }
@@ -748,13 +707,13 @@ static void control_forth_plus_loop(VM *vm) {
cf_item_t maybe_qdo; cf_item_t maybe_qdo;
int have_qdo = 0; int have_qdo = 0;
cf_item_t top; cf_item_t top;
if (cf_peek_item(&top) && top.tag == CF_WHILE) { if (cf_peek_item(vm, &top) && top.tag == CF_WHILE) {
(void) cf_pop_item(&maybe_qdo); (void) cf_pop_item(vm, &maybe_qdo);
have_qdo = 1; have_qdo = 1;
} }
cf_item_t do_mark; cf_item_t do_mark;
if (!cf_pop_item(&do_mark) || do_mark.tag != CF_DO) { if (!cf_pop_item(vm, &do_mark) || do_mark.tag != CF_DO) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "+LOOP: missing DO"); log_message(LOG_ERROR, "+LOOP: missing DO");
return; return;
@@ -770,19 +729,19 @@ static void control_forth_plus_loop(VM *vm) {
log_message(LOG_DEBUG, "+LOOP: patched ?DO @ %zu -> +%ld", maybe_qdo.addr, (long) fwd); log_message(LOG_DEBUG, "+LOOP: patched ?DO @ %zu -> +%ld", maybe_qdo.addr, (long) fwd);
} }
if (leave_mark_sp < 0) { if (vm->cf.leave_mark_sp < 0) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "+LOOP: LEAVE mark underflow"); log_message(LOG_ERROR, "+LOOP: LEAVE mark underflow");
return; return;
} }
int mark = leave_mark_stack[leave_mark_sp--]; int mark = vm->cf.leave_mark_stack[vm->cf.leave_mark_sp--];
for (int i = leave_sp; i > mark; --i) { for (int i = vm->cf.leave_sp; i > mark; --i) {
size_t addr = leave_addrs[i]; size_t addr = vm->cf.leave_addrs[i];
cell_t fwd = (cell_t)((size_t) vm->here - addr); cell_t fwd = (cell_t)((size_t) vm->here - addr);
*(cell_t *) (vm->memory + addr) = fwd; *(cell_t *) (vm->memory + addr) = fwd;
log_message(LOG_DEBUG, "LEAVE: patched @ %zu -> +%ld", addr, (long) fwd); log_message(LOG_DEBUG, "LEAVE: patched @ %zu -> +%ld", addr, (long) fwd);
} }
leave_sp = mark; vm->cf.leave_sp = mark;
log_message(LOG_DEBUG, "+LOOP: back -> %zu (%ld bytes)", do_mark.addr, (long) back); log_message(LOG_DEBUG, "+LOOP: back -> %zu (%ld bytes)", do_mark.addr, (long) back);
} }
@@ -810,18 +769,18 @@ static void control_forth_case(VM *vm) {
log_message(LOG_ERROR, "CASE: compile-only"); log_message(LOG_ERROR, "CASE: compile-only");
return; return;
} }
if (!cf_push_item(CF_CASE, 0)) { if (!cf_push_item(vm, CF_CASE, 0)) {
vm->error = 1; vm->error = 1;
return; return;
} }
/* Record current endof_sp so ENDCASE knows which branches to patch */ /* Record current endof_sp so ENDCASE knows which branches to patch */
if (endof_mark_sp + 1 >= CF_STACK_MAX) { if (vm->cf.endof_mark_sp + 1 >= CF_STACK_MAX) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "CASE: nesting overflow"); log_message(LOG_ERROR, "CASE: nesting overflow");
return; return;
} }
endof_mark_stack[++endof_mark_sp] = endof_sp; vm->cf.endof_mark_stack[++vm->cf.endof_mark_sp] = vm->cf.endof_sp;
log_message(LOG_DEBUG, "CASE: mark (endof_mark=%d)", endof_mark_stack[endof_mark_sp]); log_message(LOG_DEBUG, "CASE: mark (endof_mark=%d)", vm->cf.endof_mark_stack[vm->cf.endof_mark_sp]);
} }
/* OF ( n1 n2 -- | n1 ) compile-time: compare and branch */ /* OF ( n1 n2 -- | n1 ) compile-time: compare and branch */
@@ -835,8 +794,8 @@ static void control_forth_of(VM *vm) {
/* Verify inside CASE */ /* Verify inside CASE */
int seen_case = 0; int seen_case = 0;
for (int i = cf_sp; i >= 0; --i) { for (int i = vm->cf.cf_sp; i >= 0; --i) {
if (cf_stack[i].tag == CF_CASE) { if (vm->cf.cf_stack[i].tag == CF_CASE) {
seen_case = 1; seen_case = 1;
break; break;
} }
@@ -865,7 +824,7 @@ static void control_forth_of(VM *vm) {
size_t of_branch = emit_cell(vm, 0); /* Placeholder for ENDOF */ size_t of_branch = emit_cell(vm, 0); /* Placeholder for ENDOF */
vm_compile_call(vm, drop_entry->func); vm_compile_call(vm, drop_entry->func);
if (!cf_push_item(CF_OF, of_branch)) { if (!cf_push_item(vm, CF_OF, of_branch)) {
vm->error = 1; vm->error = 1;
return; return;
} }
@@ -883,7 +842,7 @@ static void control_forth_endof(VM *vm) {
/* Pop CF_OF and patch its forward branch */ /* Pop CF_OF and patch its forward branch */
cf_item_t of_item; cf_item_t of_item;
if (!cf_pop_item(&of_item) || of_item.tag != CF_OF) { if (!cf_pop_item(vm, &of_item) || of_item.tag != CF_OF) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "ENDOF: missing OF"); log_message(LOG_ERROR, "ENDOF: missing OF");
return; return;
@@ -898,12 +857,12 @@ static void control_forth_endof(VM *vm) {
*(cell_t *) (vm->memory + of_item.addr) = off; *(cell_t *) (vm->memory + of_item.addr) = off;
/* Save ENDOF's branch for ENDCASE patching */ /* Save ENDOF's branch for ENDCASE patching */
if (endof_sp + 1 >= CF_STACK_MAX) { if (vm->cf.endof_sp + 1 >= CF_STACK_MAX) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "ENDOF: too many clauses"); log_message(LOG_ERROR, "ENDOF: too many clauses");
return; return;
} }
endof_addrs[++endof_sp] = endcase_branch; vm->cf.endof_addrs[++vm->cf.endof_sp] = endcase_branch;
log_message(LOG_DEBUG, "ENDOF: patched OF @ %zu -> +%ld; endcase branch @ %zu", log_message(LOG_DEBUG, "ENDOF: patched OF @ %zu -> +%ld; endcase branch @ %zu",
of_item.addr, (long) off, endcase_branch); of_item.addr, (long) off, endcase_branch);
@@ -920,7 +879,7 @@ static void control_forth_endcase(VM *vm) {
/* Pop CF_CASE marker */ /* Pop CF_CASE marker */
cf_item_t case_item; cf_item_t case_item;
if (!cf_pop_item(&case_item) || case_item.tag != CF_CASE) { if (!cf_pop_item(vm, &case_item) || case_item.tag != CF_CASE) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "ENDCASE: missing CASE"); log_message(LOG_ERROR, "ENDCASE: missing CASE");
return; return;
@@ -936,19 +895,19 @@ static void control_forth_endcase(VM *vm) {
vm_compile_call(vm, drop_entry->func); vm_compile_call(vm, drop_entry->func);
/* Patch all ENDOF branches to here */ /* Patch all ENDOF branches to here */
if (endof_mark_sp < 0) { if (vm->cf.endof_mark_sp < 0) {
vm->error = 1; vm->error = 1;
log_message(LOG_ERROR, "ENDCASE: mark underflow"); log_message(LOG_ERROR, "ENDCASE: mark underflow");
return; return;
} }
int mark = endof_mark_stack[endof_mark_sp--]; int mark = vm->cf.endof_mark_stack[vm->cf.endof_mark_sp--];
for (int i = endof_sp; i > mark; --i) { for (int i = vm->cf.endof_sp; i > mark; --i) {
size_t addr = endof_addrs[i]; size_t addr = vm->cf.endof_addrs[i];
cell_t fwd = (cell_t)((size_t) vm->here - addr); cell_t fwd = (cell_t)((size_t) vm->here - addr);
*(cell_t *) (vm->memory + addr) = fwd; *(cell_t *) (vm->memory + addr) = fwd;
log_message(LOG_DEBUG, "ENDCASE: patched ENDOF @ %zu -> +%ld", addr, (long) fwd); log_message(LOG_DEBUG, "ENDCASE: patched ENDOF @ %zu -> +%ld", addr, (long) fwd);
} }
endof_sp = mark; vm->cf.endof_sp = mark;
log_message(LOG_DEBUG, "ENDCASE: complete"); log_message(LOG_DEBUG, "ENDCASE: complete");
} }
src/word_source/vocabulary_words.c
+44 -51
View File
@@ -91,19 +91,13 @@ static size_t vocab_safe_len(const char *text, size_t max_len)
} }
/* ---- first-character index for vocab chains (lazy rebuild) ---- */ /* ---- first-character index for vocab chains (lazy rebuild) ----
#define SF_FC_BUCKETS 256 * Bucket arrays themselves live per-VM (VM.vocab.ctx_fc / .forth_fc,
* declared in include/vm.h as VocabularyState); these two helpers just
static DictEntry **ctx_fc[SF_FC_BUCKETS]; /* arrays of entry pointers */ * operate on whichever VM's arrays are passed in. */
static size_t ctx_n[SF_FC_BUCKETS];
static DictEntry *ctx_cached_head = NULL;
static DictEntry **forth_fc[SF_FC_BUCKETS];
static size_t forth_n[SF_FC_BUCKETS];
static DictEntry *forth_cached_head = NULL;
static void fc_free(DictEntry ***lists, size_t *counts) { static void fc_free(DictEntry ***lists, size_t *counts) {
for (size_t i = 0; i < SF_FC_BUCKETS; ++i) { for (size_t i = 0; i < VOCAB_FC_BUCKETS; ++i) {
free(lists[i]); free(lists[i]);
lists[i] = NULL; lists[i] = NULL;
counts[i] = 0; counts[i] = 0;
@@ -119,14 +113,14 @@ static void fc_rebuild(DictEntry *head, DictEntry ***lists, size_t *counts, Dict
counts[c]++; counts[c]++;
} }
/* alloc */ /* alloc */
for (size_t i = 0; i < SF_FC_BUCKETS; ++i) { for (size_t i = 0; i < VOCAB_FC_BUCKETS; ++i) {
if (counts[i]) { if (counts[i]) {
lists[i] = (DictEntry **) malloc(counts[i] * sizeof(DictEntry *)); lists[i] = (DictEntry **) malloc(counts[i] * sizeof(DictEntry *));
if (!lists[i]) counts[i] = 0; /* malloc failed: zero count so fill skips */ if (!lists[i]) counts[i] = 0; /* malloc failed: zero count so fill skips */
} }
} }
/* second pass: fill oldest→newest (we’ll search newest-first by iterating backwards) */ /* second pass: fill oldest→newest (we’ll search newest-first by iterating backwards) */
size_t filled[SF_FC_BUCKETS] = {0}; size_t filled[VOCAB_FC_BUCKETS] = {0};
for (DictEntry *e = head; e; e = e->link) { for (DictEntry *e = head; e; e = e->link) {
unsigned c = (unsigned char) e->name[0]; unsigned c = (unsigned char) e->name[0];
if (lists[c]) lists[c][filled[c]++] = e; /* skip null buckets */ if (lists[c]) lists[c][filled[c]++] = e; /* skip null buckets */
@@ -141,21 +135,12 @@ static void fc_rebuild(DictEntry *head, DictEntry ***lists, size_t *counts, Dict
- No ALSO/ONLY/PREVIOUS here. Period. - No ALSO/ONLY/PREVIOUS here. Period.
*/ */
/* Host-side state */
static DictEntry *forth_vocab = NULL; /* FORTH vocabulary head (root of system) */
static DictEntry *context_vocab = NULL; /* CONTEXT vocabulary head */
static DictEntry *current_vocab = NULL; /* CURRENT vocabulary head */
/* VM-visible variables (addresses in VM space) */
static vaddr_t context_var_addr = 0; /* cell containing (DictEntry*) CONTEXT */
static vaddr_t current_var_addr = 0; /* cell containing (DictEntry*) CURRENT */
/* Sync host state -> VM cells */ /* Sync host state -> VM cells */
static inline void vocab_sync_vm_vars(VM *vm) { static inline void vocab_sync_vm_vars(VM *vm) {
if (!context_var_addr || !current_var_addr) return; if (!vm->vocab.context_var_addr || !vm->vocab.current_var_addr) return;
#if defined(__STARKERNEL__) && SK_PARITY_DEBUG #if defined(__STARKERNEL__) && SK_PARITY_DEBUG
uint64_t cv = (uint64_t)(uintptr_t)context_vocab; uint64_t cv = (uint64_t)(uintptr_t)vm->vocab.context_vocab;
uint64_t rv = (uint64_t)(uintptr_t)current_vocab; uint64_t rv = (uint64_t)(uintptr_t)vm->vocab.current_vocab;
uint64_t base = (uintptr_t)vm->memory; uint64_t base = (uintptr_t)vm->memory;
console_puts("[VOC_SYNC] context="); console_puts("[VOC_SYNC] context=");
@@ -163,13 +148,13 @@ static inline void vocab_sync_vm_vars(VM *vm) {
console_puts(" current="); console_puts(" current=");
vocabulary_debug_print_hex(rv); vocabulary_debug_print_hex(rv);
console_puts(" context_addr="); console_puts(" context_addr=");
vocabulary_debug_print_hex((uint64_t)context_var_addr); vocabulary_debug_print_hex((uint64_t)vm->vocab.context_var_addr);
console_puts(" current_addr="); console_puts(" current_addr=");
vocabulary_debug_print_hex((uint64_t)current_var_addr); vocabulary_debug_print_hex((uint64_t)vm->vocab.current_var_addr);
console_puts(" vm_base="); console_puts(" vm_base=");
vocabulary_debug_print_hex(base); vocabulary_debug_print_hex(base);
console_puts(" context_vocab="); console_puts(" context_vocab=");
vocabulary_debug_print_hex((uint64_t)(uintptr_t)context_vocab); vocabulary_debug_print_hex((uint64_t)(uintptr_t)vm->vocab.context_vocab);
console_println(""); console_println("");
/* Truncation check */ /* Truncation check */
@@ -191,23 +176,25 @@ static inline void vocab_sync_vm_vars(VM *vm) {
/* NOTE: DictEntry* (vocabulary pointers) live in the kernel heap, not the /* NOTE: DictEntry* (vocabulary pointers) live in the kernel heap, not the
* VM arena. An arena-range check here is always wrong — omitted. */ * VM arena. An arena-range check here is always wrong — omitted. */
#endif #endif
vm_store_cell(vm, context_var_addr, (cell_t)(uintptr_t)context_vocab); vm_store_cell(vm, vm->vocab.context_var_addr, (cell_t)(uintptr_t)vm->vocab.context_vocab);
vm_store_cell(vm, current_var_addr, (cell_t)(uintptr_t)current_vocab); vm_store_cell(vm, vm->vocab.current_var_addr, (cell_t)(uintptr_t)vm->vocab.current_vocab);
} }
/** /**
* @brief Initialize the FORTH vocabulary system * @brief Initialize the FORTH vocabulary system
* @details Sets up FORTH as root vocabulary and allocates VM cells for CONTEXT/CURRENT * @details Sets up FORTH as root vocabulary and allocates VM cells for CONTEXT/CURRENT.
* Per-VM (vm->vocab.initialized): each VM in the fleet seeds its own
* vocabulary roots from its own dictionary, rather than every VM after
* the first silently sharing whichever VM ran this first.
* @param vm Pointer to VM instance * @param vm Pointer to VM instance
*/ */
static void init_vocabulary_system(VM *vm) { static void init_vocabulary_system(VM *vm) {
static int initialized = 0; if (vm->vocab.initialized) return;
if (initialized) return;
/* Treat vm->latest as the FORTH vocabulary head */ /* Treat vm->latest as the FORTH vocabulary head */
forth_vocab = vm->latest; vm->vocab.forth_vocab = vm->latest;
context_vocab = forth_vocab; vm->vocab.context_vocab = vm->vocab.forth_vocab;
current_vocab = forth_vocab; vm->vocab.current_vocab = vm->vocab.forth_vocab;
/* Allocate VM cells for CONTEXT and CURRENT */ /* Allocate VM cells for CONTEXT and CURRENT */
void *p1 = vm_allot(vm, sizeof(cell_t)); void *p1 = vm_allot(vm, sizeof(cell_t));
@@ -216,7 +203,7 @@ static void init_vocabulary_system(VM *vm) {
log_message(LOG_ERROR, "VOCAB: failed CONTEXT cell"); log_message(LOG_ERROR, "VOCAB: failed CONTEXT cell");
return; return;
} }
context_var_addr = (vaddr_t)((uint8_t *) p1 - vm->memory); vm->vocab.context_var_addr = (vaddr_t)((uint8_t *) p1 - vm->memory);
void *p2 = vm_allot(vm, sizeof(cell_t)); void *p2 = vm_allot(vm, sizeof(cell_t));
if (!p2) { if (!p2) {
@@ -224,10 +211,10 @@ static void init_vocabulary_system(VM *vm) {
log_message(LOG_ERROR, "VOCAB: failed CURRENT cell"); log_message(LOG_ERROR, "VOCAB: failed CURRENT cell");
return; return;
} }
current_var_addr = (vaddr_t)((uint8_t *) p2 - vm->memory); vm->vocab.current_var_addr = (vaddr_t)((uint8_t *) p2 - vm->memory);
vocab_sync_vm_vars(vm); vocab_sync_vm_vars(vm);
initialized = 1; vm->vocab.initialized = 1;
} }
/* Finder: search CONTEXT chain first, then FORTH chain; skip hidden/smudged */ /* Finder: search CONTEXT chain first, then FORTH chain; skip hidden/smudged */
@@ -237,16 +224,18 @@ static DictEntry *vocab_find_word(VM *vm, const char *name, size_t len) {
if (!name || len == 0) return NULL; if (!name || len == 0) return NULL;
/* rebuild per-vocab indices if heads changed */ /* rebuild per-vocab indices if heads changed */
if (ctx_cached_head != context_vocab) fc_rebuild(context_vocab, ctx_fc, ctx_n, &ctx_cached_head); if (vm->vocab.ctx_cached_head != vm->vocab.context_vocab)
if (forth_cached_head != forth_vocab) fc_rebuild(forth_vocab, forth_fc, forth_n, &forth_cached_head); fc_rebuild(vm->vocab.context_vocab, vm->vocab.ctx_fc, vm->vocab.ctx_n, &vm->vocab.ctx_cached_head);
if (vm->vocab.forth_cached_head != vm->vocab.forth_vocab)
fc_rebuild(vm->vocab.forth_vocab, vm->vocab.forth_fc, vm->vocab.forth_n, &vm->vocab.forth_cached_head);
const unsigned char first = (unsigned char) name[0]; const unsigned char first = (unsigned char) name[0];
const unsigned char last = (unsigned char) name[len - 1]; const unsigned char last = (unsigned char) name[len - 1];
/* search CONTEXT bucket (newest-first) */ /* search CONTEXT bucket (newest-first) */
{ {
DictEntry **bucket = ctx_fc[first]; DictEntry **bucket = vm->vocab.ctx_fc[first];
size_t n = ctx_n[first]; size_t n = vm->vocab.ctx_n[first];
if (UNLIKELY(!bucket || n == 0)) goto skip_ctx; if (UNLIKELY(!bucket || n == 0)) goto skip_ctx;
for (size_t i = n; i-- > 0;) { for (size_t i = n; i-- > 0;) {
DictEntry *e = bucket[i]; DictEntry *e = bucket[i];
@@ -266,9 +255,9 @@ static DictEntry *vocab_find_word(VM *vm, const char *name, size_t len) {
skip_ctx:; skip_ctx:;
/* then FORTH bucket (if different) */ /* then FORTH bucket (if different) */
if (context_vocab != forth_vocab) { if (vm->vocab.context_vocab != vm->vocab.forth_vocab) {
DictEntry **bucket = forth_fc[first]; DictEntry **bucket = vm->vocab.forth_fc[first];
size_t n = forth_n[first]; size_t n = vm->vocab.forth_n[first];
if (UNLIKELY(!bucket || n == 0)) goto skip_forth; if (UNLIKELY(!bucket || n == 0)) goto skip_forth;
for (size_t i = n; i-- > 0;) { for (size_t i = n; i-- > 0;) {
DictEntry *e = bucket[i]; DictEntry *e = bucket[i];
@@ -299,7 +288,7 @@ static void vocabulary_select_runtime(VM *vm) {
* Fall back to vm->latest only if somehow NULL. */ * Fall back to vm->latest only if somehow NULL. */
DictEntry *selected = vm->current_executing_entry; DictEntry *selected = vm->current_executing_entry;
if (!selected) selected = vm->latest; if (!selected) selected = vm->latest;
context_vocab = selected; vm->vocab.context_vocab = selected;
vocab_sync_vm_vars(vm); vocab_sync_vm_vars(vm);
log_message(LOG_DEBUG, "Vocabulary selected (CONTEXT updated)"); log_message(LOG_DEBUG, "Vocabulary selected (CONTEXT updated)");
@@ -446,7 +435,7 @@ void vocabulary_create_vocabulary_direct(VM *vm, const char *name)
*/ */
void vocabulary_word_definitions(VM *vm) { void vocabulary_word_definitions(VM *vm) {
init_vocabulary_system(vm); init_vocabulary_system(vm);
current_vocab = context_vocab; vm->vocab.current_vocab = vm->vocab.context_vocab;
vocab_sync_vm_vars(vm); vocab_sync_vm_vars(vm);
log_message(LOG_DEBUG, "DEFINITIONS: CURRENT := CONTEXT"); log_message(LOG_DEBUG, "DEFINITIONS: CURRENT := CONTEXT");
} }
@@ -459,7 +448,7 @@ void vocabulary_word_definitions(VM *vm) {
*/ */
void vocabulary_word_context(VM *vm) { void vocabulary_word_context(VM *vm) {
init_vocabulary_system(vm); init_vocabulary_system(vm);
vm_push(vm, CELL(context_var_addr)); vm_push(vm, CELL(vm->vocab.context_var_addr));
} }
/* CURRENT ( -- addr ) Return VM address of CURRENT cell */ /* CURRENT ( -- addr ) Return VM address of CURRENT cell */
@@ -470,7 +459,7 @@ void vocabulary_word_context(VM *vm) {
*/ */
void vocabulary_word_current(VM *vm) { void vocabulary_word_current(VM *vm) {
init_vocabulary_system(vm); init_vocabulary_system(vm);
vm_push(vm, CELL(current_var_addr)); vm_push(vm, CELL(vm->vocab.current_var_addr));
} }
/* FORTH ( -- ) Make FORTH the CONTEXT vocabulary (and nothing else) */ /* FORTH ( -- ) Make FORTH the CONTEXT vocabulary (and nothing else) */
@@ -481,7 +470,7 @@ void vocabulary_word_current(VM *vm) {
*/ */
void vocabulary_word_forth(VM *vm) { void vocabulary_word_forth(VM *vm) {
init_vocabulary_system(vm); init_vocabulary_system(vm);
context_vocab = forth_vocab; vm->vocab.context_vocab = vm->vocab.forth_vocab;
vocab_sync_vm_vars(vm); vocab_sync_vm_vars(vm);
log_message(LOG_DEBUG, "FORTH selected (CONTEXT := FORTH)"); log_message(LOG_DEBUG, "FORTH selected (CONTEXT := FORTH)");
} }
@@ -537,6 +526,10 @@ void vocabulary_word_paren_find(VM *vm) {
void vocabulary_word_order(VM *vm) { void vocabulary_word_order(VM *vm) {
init_vocabulary_system(vm); init_vocabulary_system(vm);
DictEntry *context_vocab = vm->vocab.context_vocab;
DictEntry *forth_vocab = vm->vocab.forth_vocab;
DictEntry *current_vocab = vm->vocab.current_vocab;
printf("Search order: "); printf("Search order: ");
if (context_vocab && context_vocab->name_len > 0) { if (context_vocab && context_vocab->name_len > 0) {
fwrite(context_vocab->name, 1, (size_t) context_vocab->name_len, stdout); fwrite(context_vocab->name, 1, (size_t) context_vocab->name_len, stdout);