Files
LithosAnanke/src/word_source/system_words.c
T
Claude c36bd99e1e Fix EXECUTE/?/DUMP/TYPE/DECIMAL-HEX-OCTAL/ALIGN defects from proof sweep
proof/FINDINGS.md's Isabelle/HOL word-source sweep (§4) flagged five real
defects; this fixes all five and records resolution in that doc:

- EXECUTE (system_words.c): cast a popped cell straight to a DictEntry*
  and called through it with only a null check. Now validates via a new
  shared vm_dict_entry_ok(), promoted out of starforth_words.c's
  ENTROPY@/ENTROPY! guard (dictionary_management.c) so EXECUTE gets the
  same live-entry check.

- ? and DUMP (format_words.c): dereferenced the popped cell as a raw host
  pointer, bypassing vm_addr_ok entirely (out-of-VM-bounds read). Both now
  go through VM_ADDR/vm_addr_ok/vm_load_cell/vm_ptr like every other
  memory word (@, `,`, editor_words.c).

- TYPE (io_words.c): bounds check computed addr+count in signed 64-bit
  arithmetic, which can overflow and bypass the check on large operands.
  Replaced with vm_addr_ok(), which is written to avoid that overflow.

- DECIMAL/HEX/OCTAL (format_words.c): wrote only the BASE memory cell,
  never vm->base, the host-mirror field number-output words actually read
  via current_base() -- so these words silently affected number parsing
  but never printing. Now call the existing vm_set_base() (previously
  only used at boot init), which updates both. vm_get_base/vm_set_base
  promoted to public declarations in include/vm.h.

- ALIGN vs ALLOT/,/C,/2, (dictionary_words.c): disagreed on dictionary
  growth ceiling (2MB vs 5MB). Investigated which was correct rather than
  blindly widening: vm_get_block_addr() maps block N to
  vm->memory + N*BLOCK_SIZE across the full 5MB arena, and
  USER_BLOCKS_START (block 2048) lines up exactly with
  DICTIONARY_MEMORY_SIZE -- so ALLOT/,/C,/2, letting `here` grow past 2MB
  could silently corrupt live block/user data sharing that memory.
  Tightened ALLOT/,/C,/2, to DICTIONARY_MEMORY_SIZE to match ALIGN.

Verified: hosted (amd64) and kernel (amd64, __STARKERNEL__) both build
clean with -Wall -Werror; hosted POST suite 1012/1012 passing (0
regressions); manually exercised EXECUTE, ?/DUMP, TYPE, HEX/DECIMAL/OCTAL,
and large-ALLOT rejection in the REPL.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014Qf6YcnHgaEtEygq3knx19
2026-09-05 14:07:11 +00:00

614 lines
19 KiB
C
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
/*
StarForth — Steady-State Virtual Machine Runtime
Copyright (c) 2023–2025 Robert A. James
All rights reserved.
This file is part of the StarForth project.
Licensed under the StarForth License, Version 1.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at:
https://github.com/star.4th@proton.me/StarForth/LICENSE.txt
This software is provided "AS IS", WITHOUT WARRANTY OF ANY KIND,
express or implied, including but not limited to the warranties of
merchantability, fitness for a particular purpose, and noninfringement.
See the License for the specific language governing permissions and
limitations under the License.
StarForth — Steady-State Virtual Machine Runtime
Copyright (c) 2023–2025 Robert A. James
All rights reserved.
This file is part of the StarForth project.
Licensed under the StarForth License, Version 1.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at:
https://github.com/star.4th@proton.me/StarForth/LICENSE.txt
This software is provided "AS IS", WITHOUT WARRANTY OF ANY KIND,
express or implied, including but not limited to the warranties of
merchantability, fitness for a particular purpose, and noninfringement.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include "include/system_words.h"
#include "../../include/vm.h"
#include "../../include/word_registry.h"
#include "../../include/log.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include "starkernel/kernel_args.h"
#ifdef __STARKERNEL__
#include "starkernel/uefi.h"
#include "starkernel/console.h"
extern EFI_RUNTIME_SERVICES *g_sk_runtime_services;
#endif
/* ───────────────────────── Global system state ───────────────────────── */
/** @brief Flag indicating if the Forth system is currently running */
static int system_running = 1;
/** @brief Flag controlling FORTH-79 standard compliance mode */
static int forth_79_standard = 1;
/* ─────────────────────────── Utilities/helpers ───────────────────────── */
/* Print a word’s name (no newline) */
static void print_word_name(const DictEntry *entry) {
if (!entry) return;
for (size_t i = 0; i < entry->name_len; i++) {
putchar((unsigned char) entry->name[i]);
}
}
/* Reset VM to a known state. If cold_start!=0, also rewinds HERE a bit. */
static void reset_vm_state(VM *vm, int cold_start) {
if (!vm) return;
/* Reset stacks */
vm->dsp = -1;
vm->rsp = -1;
/* Clear error state & enter interpret mode */
vm->error = 0;
vm->mode = MODE_INTERPRET;
if (cold_start) {
/* In a complete system, this would restore a boot image.
For now we keep a minimal fence by not crushing the base dictionary. */
if (vm->here > 1024) vm->here = 1024;
}
system_running = 1;
}
/* ───────────────────────────── Core words ───────────────────────────── */
/* ( ( -- ) : Begin comment; skip to closing ) — IMMEDIATE */
static void forth_paren(VM *vm) {
char word[64];
int paren_depth = 1;
while (paren_depth > 0 && vm_parse_word(vm, word, sizeof(word))) {
if (strcmp(word, "(") == 0) {
paren_depth++;
} else if (strcmp(word, ")") == 0) {
paren_depth--;
}
/* else: ignore */
}
if (paren_depth > 0) {
log_message(LOG_WARN, "( Unterminated comment");
}
}
/* \ ( -- ) : Line comment; skip from current position to end of line — IMMEDIATE */
static void forth_backslash(VM *vm) {
if (!vm) return;
while (vm->input_pos < vm->input_length) {
char c = vm->input_buffer[vm->input_pos++];
if (c == '\n') break;
}
}
/* COLD ( -- ) */
void system_word_cold(VM *vm) {
puts("FORTH-79 Cold Start");
reset_vm_state(vm, 1);
puts("System initialized.");
}
/* WARM ( -- ) */
void system_word_warm(VM *vm) {
puts("FORTH-79 Warm Start");
reset_vm_state(vm, 0);
puts("System restarted.");
}
/* BYE ( -- ) */
void system_word_bye(VM *vm) {
puts("Goodbye!");
vm->halted = 1; /* Signal the REPL to stop */
}
/* SAVE-SYSTEM ( -- ) : trivial snapshot of memory prefix */
void system_word_save_system(VM *vm) {
FILE *save_file = fopen("forth_system.img", "wb");
if (!save_file) {
puts("Error: Cannot create system image file");
vm->error = 1;
return;
}
if (fwrite(&vm->here, sizeof(vm->here), 1, save_file) != 1) {
puts("Error: Failed to save system state");
fclose(save_file);
vm->error = 1;
return;
}
if (fwrite(vm->memory, 1, vm->here, save_file) != (size_t) vm->here) {
puts("Error: Failed to save memory image");
fclose(save_file);
vm->error = 1;
return;
}
fclose(save_file);
puts("System image saved successfully");
}
/* WORDS ( -- ) : list words in current vocabulary */
void system_word_words(VM *vm) {
DictEntry *e = vm->latest;
int count = 0, per_line = 0;
puts("Words in current vocabulary:");
while (e) {
print_word_name(e);
putchar(' ');
count++;
per_line++;
if (per_line >= 8) {
putchar('\n');
per_line = 0;
}
e = e->link;
}
if (per_line) putchar('\n');
printf("Total: %d words\n", count);
}
/* VLIST ( -- ) : detailed listing */
void system_word_vlist(VM *vm) {
DictEntry *e = vm->latest;
int count = 0;
puts("Complete vocabulary listing:");
puts("Name Address Flags");
puts("-------------------- ---------- -----");
while (e) {
/* Name padded to 20 chars */
size_t pad = (e->name_len < 20) ? (20 - e->name_len) : 0;
print_word_name(e);
while (pad--) putchar(' ');
printf(" %p %02lX\n", (void *) e, (unsigned long)e->flags);
count++;
e = e->link;
}
printf("Total: %d words\n", count);
}
/* PAGE ( -- ) */
void system_word_page(VM *vm) {
(void) vm;
printf("\033[2J\033[H");
fflush(stdout);
}
/* NOP ( -- ) */
void system_word_nop(VM *vm) { (void) vm; }
/* 79-STANDARD ( -- flag ) : push -1 if compliance active else 0 */
void system_word_79_standard(VM *vm) {
if (forth_79_standard) {
puts("FORTH-79 Standard compliance: ACTIVE");
puts("System conforms to FORTH-79 specification");
} else {
puts("FORTH-79 Standard compliance: INACTIVE");
puts("System may have extensions or modifications");
}
vm_push(vm, forth_79_standard ? -1 : 0);
}
/* QUIT ( -- ) : FORTH-79 — clear return stack, return to interpreter. IMMEDIATE */
static void system_word_quit(VM *vm) {
if (vm->mode == MODE_COMPILE) {
vm->error = 1;
return;
}
vm->rsp = -1;
vm->mode = MODE_INTERPRET;
vm->error = 0;
}
/* ABORT ( -- ) : Clear both stacks & return to interpreter. NOT an error. */
static void system_word_abort(VM *vm) {
if (!vm) return;
reset_vm_state(vm, 0);
vm->error = 0;
vm->abort_requested = 1; /* Signal immediate termination */
}
/* (ABORT") runtime
Run-time stack: flag addr len --
If flag ≠ 0: print message and perform ABORT semantics (no error). */
static void runtime_abortq(VM *vm) {
if (!vm) return;
if (vm->dsp < 2) {
vm->error = 1;
return;
}
cell_t len = vm_pop(vm);
cell_t addr = vm_pop(vm);
cell_t flag = vm_pop(vm);
if (!flag) return; /* false => no-op */
if (!vm_addr_ok(vm, (vaddr_t) addr, (size_t) len)) {
vm->error = 1;
return;
}
fwrite(vm->memory + (size_t) addr, 1, (size_t) len, stdout);
fputc('\n', stdout);
reset_vm_state(vm, 0); /* control transfer, not a fault */
vm->error = 0;
}
/* ABORT" ( flag -- ) IMMEDIATE
Interpret: parse up to next " ; if flag≠0 print string and ABORT (no error).
Compile: parse string; compile: LIT addr LIT len (ABORT") so at run-time
the stack is: flag addr len and runtime_abortq handles it. */
static void system_word_abort_quote(VM *vm) {
if (!vm) return;
/* Parse message up to closing quote from current input position. */
size_t pos = vm->input_pos, n = vm->input_length;
while (pos < n && (vm->input_buffer[pos] == ' ' || vm->input_buffer[pos] == '\t')) pos++;
size_t start = pos;
while (pos < n && vm->input_buffer[pos] != '"') pos++;
if (pos >= n) {
vm->error = 1;
return;
} /* unmatched quote */
size_t end = pos;
vm->input_pos = pos + 1; /* consume the closing quote */
const size_t msg_len = end - start;
if (vm->mode == MODE_INTERPRET) {
if (vm->dsp < 0) {
vm->error = 1;
return;
}
cell_t flag = vm_pop(vm);
if (!flag) return;
if (msg_len) fwrite(&vm->input_buffer[start], 1, msg_len, stdout);
fputc('\n', stdout);
reset_vm_state(vm, 0);
vm->error = 0;
return;
}
/* MODE_COMPILE */
void *dst = NULL;
if (msg_len) {
dst = vm_allot(vm, msg_len);
if (!dst) {
vm->error = 1;
return;
}
memcpy(dst, &vm->input_buffer[start], msg_len);
}
vaddr_t msg_addr = (vaddr_t) 0;
if (msg_len) msg_addr = (vaddr_t)((uint8_t *) dst - vm->memory);
vm_compile_literal(vm, (cell_t) msg_addr);
vm_compile_literal(vm, (cell_t) msg_len);
/* Compile call to the runtime helper (must be registered) */
vm_compile_call(vm, (word_func_t) runtime_abortq);
}
/* SEE ( "name" -- ) Decompile and display a word's definition */
static void system_word_see(VM *vm) {
if (!vm) return;
/* Parse word name */
char namebuf[WORD_NAME_MAX + 1];
int nlen = vm_parse_word(vm, namebuf, sizeof(namebuf));
if (nlen <= 0) {
printf("SEE: word name required\n");
vm->error = 1;
return;
}
/* Find the word */
DictEntry *entry = vm_find_word(vm, namebuf, (size_t) nlen);
if (!entry) {
printf("SEE: '%.*s' not found\n", nlen, namebuf);
vm->error = 1;
return;
}
/* Print word name and start of definition */
printf(": ");
print_word_name(entry);
printf("\n");
/* Check if it's a primitive (built-in) or colon word */
cell_t *df = vm_dictionary_get_data_field(entry);
if (!df) {
printf(" <primitive>\n;\n");
return;
}
/* Check if it's a colon word by comparing func pointer */
extern void execute_colon_word(VM * vm); /* Forward declaration */
if (entry->func != execute_colon_word) {
/* It's a primitive with data (like CONSTANT, VARIABLE, CREATE) */
printf(" <primitive with data: %ld>\n;\n", (long) *df);
return;
}
/* It's a colon word - decompile the threaded code */
vaddr_t body_addr = (vaddr_t)(uint64_t)(*df);
if (!vm_addr_ok(vm, body_addr, sizeof(cell_t))) {
printf(" <invalid body address>\n;\n");
return;
}
cell_t *ip = (cell_t *) vm_ptr(vm, body_addr);
int indent = 2;
int word_count = 0;
/* Walk through threaded code until EXIT */
while (word_count < 1000) {
/* Safety limit */
/* Check if we're still within valid VM memory */
vaddr_t current_addr = (vaddr_t)((uint8_t *) ip - vm->memory);
if (!vm_addr_ok(vm, current_addr, sizeof(cell_t))) {
printf("\n <invalid address>\n");
break;
}
DictEntry *w = (DictEntry *) (uintptr_t)(*ip);
ip++;
word_count++;
/* Basic sanity checks on the entry pointer */
if (!w) {
printf("\n <null entry>\n");
break;
}
/* Check if name_len is reasonable (0-32 chars) */
if (w->name_len == 0 || w->name_len > 32) {
printf("\n <invalid name_len=%d>\n", w->name_len);
break;
}
/* Print indentation */
for (int i = 0; i < indent; i++) putchar(' ');
/* Print word name */
print_word_name(w);
/* Check for EXIT - end of definition */
if (w->name_len == 4 && strncmp(w->name, "EXIT", 4) == 0) {
printf("\n");
break;
}
/* Check for special words that have inline data */
if (w->name_len == 3 && strncmp(w->name, "LIT", 3) == 0) {
/* Next cell is the literal value */
cell_t lit_val = *ip++;
word_count++;
printf(" %ld", (long) lit_val);
} else if (w->name_len == 7 && strncmp(w->name, "0BRANCH", 7) == 0) {
/* Conditional branch */
cell_t offset = *ip++;
word_count++;
printf(" (offset=%ld)", (long) offset);
} else if (w->name_len == 6 && strncmp(w->name, "BRANCH", 6) == 0) {
/* Unconditional branch */
cell_t offset = *ip++;
word_count++;
printf(" (offset=%ld)", (long) offset);
}
printf("\n");
}
printf(";\n");
}
/* REBOOT ( addr len -- ) : set boot args and cold-reset. Interpret-only. */
static void system_word_reboot(VM *vm) {
cell_t len;
cell_t addr;
const char *str;
/* Interpret-only guard: -14 = "interpretation semantics only" */
if (vm->mode == MODE_COMPILE) {
vm->error = 1;
log_message(LOG_ERROR, "REBOOT: interpretation semantics only");
return;
}
if (vm->dsp < 1) { vm->error = 1; return; }
len = vm_pop(vm);
addr = vm_pop(vm);
if (len <= 0 || len >= KERNEL_ARGS_CMDLINE_MAX) {
vm->error = 1;
log_message(LOG_ERROR, "REBOOT: arg length out of range");
return;
}
if (!vm_addr_ok(vm, (vaddr_t)addr, (size_t)len)) {
vm->error = 1;
return;
}
str = (const char *)vm_ptr(vm, (vaddr_t)addr);
#ifdef __STARKERNEL__
{
EFI_RUNTIME_SERVICES *rt = g_sk_runtime_services;
EFI_GUID vendor_guid = STARFORTH_VENDOR_GUID;
EFI_GET_VARIABLE GetVariable;
EFI_SET_VARIABLE SetVariable;
EFI_RESET_SYSTEM ResetSystem;
uint32_t tries = 0;
UINTN tries_size = sizeof(tries);
EFI_STATUS sv;
if (!rt) {
console_puts("REBOOT: runtime services unavailable\n");
return;
}
GetVariable = (EFI_GET_VARIABLE)rt->GetVariable;
SetVariable = (EFI_SET_VARIABLE)rt->SetVariable;
ResetSystem = (EFI_RESET_SYSTEM)rt->ResetSystem;
/* Read escape-hatch counter */
GetVariable(
(CHAR16 *)SF_VAR_REBOOT_TRIES,
&vendor_guid, NULL,
&tries_size, &tries);
if (tries >= (uint32_t)REBOOT_MAX_TRIES) {
/* Escape hatch: clear both vars, warn, return to REPL */
SetVariable(
(CHAR16 *)SF_VAR_BOOT_ARGS, &vendor_guid,
EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS,
0, NULL);
SetVariable(
(CHAR16 *)SF_VAR_REBOOT_TRIES, &vendor_guid,
EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS,
0, NULL);
console_puts("REBOOT: max tries reached — dropping to REPL\n");
return;
}
/* Write new boot args */
sv = SetVariable(
(CHAR16 *)SF_VAR_BOOT_ARGS,
&vendor_guid,
EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS,
(UINTN)len, (void *)str);
if (sv != EFI_SUCCESS) {
console_puts("REBOOT: NVRAM write failed — dropping to REPL\n");
return;
}
/* Increment tries counter */
tries++;
SetVariable(
(CHAR16 *)SF_VAR_REBOOT_TRIES,
&vendor_guid,
EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS,
sizeof(tries), &tries);
/* Cold reset — does not return */
ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
/* Unreachable, but keep the compiler happy */
console_puts("REBOOT: ResetSystem returned unexpectedly\n");
}
#else
/* Hosted VM: no reset capability */
fputs("[REBOOT] hosted stub — would reboot with: ", stdout);
fwrite(str, 1, (size_t)len, stdout);
fputc('\n', stdout);
vm->halted = 1;
#endif
}
/* EXECUTE ( xt -- ) FORTH-79: execute the word whose xt is on the stack */
static void system_word_execute(VM *vm) {
if (vm->dsp < 0) { vm->error = 1; return; }
cell_t xt = vm_pop(vm);
DictEntry *entry = (DictEntry *)(uintptr_t)xt;
if (!vm_dict_entry_ok(vm, entry) || !entry->func) { vm->error = 1; return; }
vm->current_executing_entry = entry;
entry->func(vm);
}
/* ───────────────────────────── API helpers ─────────────────────────── */
int system_is_running(void) { return system_running; }
void set_forth_79_compliance(int enabled) { forth_79_standard = enabled; }
/* ──────────────────── System Word Registration ─────────────────────── */
void register_system_words(VM *vm) {
/* Comments */
register_word(vm, "(", forth_paren);
vm_make_immediate(vm); /* '(' is IMMEDIATE */
register_word(vm, "\\", forth_backslash);
vm_make_immediate(vm); /* '\' is IMMEDIATE */
/* Environment/system */
register_word(vm, "COLD", system_word_cold);
register_word(vm, "WARM", system_word_warm);
register_word(vm, "BYE", system_word_bye);
register_word(vm, "REBOOT", system_word_reboot);
register_word(vm, "SAVE-SYSTEM", system_word_save_system);
register_word(vm, "WORDS", system_word_words);
register_word(vm, "VLIST", system_word_vlist);
register_word(vm, "SEE", system_word_see);
register_word(vm, "PAGE", system_word_page);
register_word(vm, "EXECUTE", system_word_execute);
register_word(vm, "NOP", system_word_nop);
register_word(vm, "79-STANDARD", system_word_79_standard);
/* Control transfer */
register_word(vm, "QUIT", system_word_quit);
vm_make_immediate(vm); /* forbid inside defs */
register_word(vm, "ABORT", system_word_abort);
/* Internal helper used by ABORT" compiled form */
register_word(vm, "(ABORT\")", runtime_abortq);
/* Immediate */
register_word(vm, "ABORT\"", system_word_abort_quote);
vm_make_immediate(vm); /* ABORT" is IMMEDIATE */
}