Code review fixes, all compile clean (hosted gcc + aarch64/riscv64 kernel flags):
- repl.c (H1): reentrancy guards on the MSG-TICK idle pump. sk_repl_idle()
now defers when Hera is mid-interpret (g_mama_interpreting) or when its
own vm_interpret is on the stack (g_idle_pump_active), so a blocking
KEY/EXPECT/QUERY inside a dispatched line can no longer re-enter the
interpreter and clobber the in-flight input buffer.
- virtio_rng.c: clamp device-returned used_len to VRNG_BUF_SIZE before the
caller's data_buf copy, closing a device-controlled OOB read.
- block_subsystem.c: first-write path now keys off created_time==0 instead
of dead magic==0 so fresh blocks get a real created_time stamp; first_free/
last_allocated fixed to absolute Forth LBNs (set in blk_compute_fresh_geometry
from slot->start_lbn, no longer the wrong physical-BAM-index values from
compute_totals_from_B); physical-bounds guard on blk_meta_zone_read/write
prevents unsigned underflow on a corrupt fence >= device size.
- capsule_zuse_boot.c / capsule_wirebind.c: identity seed validated magic ->
version -> CRC-64 (compute_crc64 over offsetof(crc)) before trusting it,
so a corrupt/format-mismatched record is refused, never loaded.
- log.h / starkernel/log.h: unused LOG_LINE_MAX 256 renamed LOG_MSG_LINE_MAX
to lift the include-order collision with vm.h's LOG_LINE_MAX 64; stale
include-order comments dropped (kernel_main.c, shim.c, capsule_birth.c).
- FABRIC-3.md: three stale-doc carry-forward items closed [x] with cbe7b49
notes.
Real KEY/?TERMINAL/QUERY/EXPECT bodies (console WIP):
- repl.h/repl.c: sk_console_getkey()/sk_console_key_available()/
sk_console_readline() public bodies; non-destructive peek buffers the
found byte so a following KEY returns it.
- shim.c: getchar()/fgetc()/fgets()/sf_terminal_ready() routed through the
real console paths instead of stubs; sf_terminal_ready() in platform_io.h
with sf_terminal_ready() implemented for the hosted build (linux/io.c,
POSIX select on fd 0) wired into Makefile.
- io_words.c: ?TERMINAL now returns actual terminal-readiness, not constant 0.
Artifacts: minted disk/artemis.img + rebuilt lfs kernel; BLOCK_MAP.md,
doe csv + qemu log regenerated.
70 lines
2.1 KiB
C
70 lines
2.1 KiB
C
/*
|
||
StarForth — Steady-State Virtual Machine Runtime
|
||
|
||
Copyright (c) 2023–2025 Robert A. James
|
||
All rights reserved.
|
||
|
||
Licensed under the StarForth License, Version 1.0
|
||
*/
|
||
|
||
/**
|
||
* starkernel/log.h — Kernel-native logger for LithosAnanke
|
||
*
|
||
* Provides the same API as the hosted include/log.h so all kernel VM
|
||
* code calling log_message() works without source changes.
|
||
*
|
||
* Output routes through console_puts() → UART → serial log.
|
||
* Implementation lives in src/starkernel/vm/host/shim.c.
|
||
*
|
||
* This header shadows include/log.h for kernel TUs because
|
||
* -Iinclude/starkernel precedes -Iinclude in KERNEL_CFLAGS and
|
||
* LOADER_CFLAGS, so #include "log.h" finds this file first.
|
||
*
|
||
* No <stdio.h> dependency — freestanding safe.
|
||
*/
|
||
|
||
#ifndef STARKERNEL_LOG_H
|
||
#define STARKERNEL_LOG_H
|
||
|
||
/* Forward declaration — matches hosted log.h */
|
||
struct VM;
|
||
|
||
/* Renamed from LOG_LINE_MAX: vm.h owns that name for the persistent
|
||
* block-log line width (64, unrelated concept). This is the in-memory log
|
||
* message-formatting line length; keeping a distinct name removes the
|
||
* include-order collision that forced a fragile "vm.h before log.h"
|
||
* convention across the kernel. */
|
||
#ifndef LOG_MSG_LINE_MAX
|
||
#define LOG_MSG_LINE_MAX 256
|
||
#endif
|
||
|
||
/**
|
||
* Log levels — identical to the hosted enumeration so kernel VM code
|
||
* compiled against either header produces compatible call sites.
|
||
*/
|
||
typedef enum {
|
||
LOG_NONE = -1, /* Disable all logging */
|
||
LOG_ERROR = 0, /* Errors only */
|
||
LOG_WARN, /* Warnings and errors */
|
||
LOG_INFO, /* Informational, warnings, and errors */
|
||
LOG_TEST, /* Test results and all above */
|
||
LOG_DEBUG /* Full verbosity */
|
||
} LogLevel;
|
||
|
||
typedef enum {
|
||
TEST_PASS = 0,
|
||
TEST_FAIL,
|
||
TEST_SKIP,
|
||
TEST_ERROR
|
||
} TestResult;
|
||
|
||
void log_set_level(LogLevel level);
|
||
LogLevel log_get_level(void);
|
||
void log_message(LogLevel level, const char *fmt, ...);
|
||
void log_test_result(const char *word_name, TestResult result);
|
||
|
||
/* TODO: persistent logging via VM-backed ring buffer — stub for now */
|
||
void log_set_vm(struct VM *vm);
|
||
|
||
#endif /* STARKERNEL_LOG_H */
|