fix(v4): overlong lines are refused whole; a refused store moves neither A nor P

- hosted (v4/tools/hosted.c): a line longer than the buffer is read to its
  end and refused as too long. Before, fgets handed it over in 1025-byte
  pieces and the last piece ran as a line of its own.
- bare metal (kernel/src/v4/sk_v4.c): the line editor takes 1024
  characters, as the boot does, and a line typed past that is refused as
  too long instead of being cut at 255 and run. V4_BOOT_LINE_TOO_LONG is
  now reported at the prompt and while a line waits.
- engine (v4/src/exec.c): a store the node itself refuses (to "any port",
  "which port", How or Have) left the opcode running on: !+ advanced A,
  against node.h's FAULTS, and !p advanced P past the handler, into the
  next fault kind's entry. A refused store now does nothing more; a store
  that raises an error (D-18) still counts as made, but P stays the
  handler's.
- test_port.c: both cases; they fail on the old exec.c (A 1017, P 901).

Engine-level tests (all v4/tests/test_*.c but test_host_*) pass at 32 and
64 bits; test_port also under ASan/UBSan. Not yet run: make -C v4 test,
test-32, hosted-check, and the three QEMU acceptance boots.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GE3SDvQn5EoxdGufk84zz2
This commit is contained in:
rajames
2026-11-06 00:40:48 +00:00
co-authored by Claude Opus 5.5
parent 728b0a54eb
commit fd2088255d
4 changed files with 86 additions and 14 deletions
+21 -7
View File
@@ -52,6 +52,24 @@ static void serve(v4_node *node, unsigned request)
}
}
/* A line from stdin, its new line taken off. Returns its length, or -1 when
* the input has ended. A line longer than the buffer is read to its end and
* the rest thrown away, so that no part of it is run as a line of its own:
* the length returned is then the buffer's, which is more than a line may be,
* and the boot refuses it as too long. */
static long read_line(char *line, unsigned cap)
{
size_t len;
int c;
if (!fgets(line, (int)cap, stdin)) return -1;
len = strlen(line);
if (len && line[len - 1] == '\n') return (long)(len - 1);
if (len == cap - 1u)
while ((c = getchar()) != EOF && c != '\n') { }
return (long)len;
}
/* The prompt is the host's, as it is the kernel's REPL's for a v3 VM: read a
* line, hand it to the node, say how it ended. */
int main(void)
@@ -68,23 +86,19 @@ int main(void)
if (!v4_boot_run(&boot)) { fflush(stdout); return 1; }
for (;;) {
size_t len;
long len;
int how;
fputs("ok> ", stdout);
fflush(stdout);
if (!fgets(line, sizeof line, stdin)) { putchar('\n'); return 0; }
len = strlen(line);
if (len && line[len - 1] == '\n') len--;
if ((len = read_line(line, sizeof line)) < 0) { putchar('\n'); return 0; }
how = v4_boot_line(&boot, line, (unsigned)len);
/* The line is waiting for an answer no one here can send. The next
* line typed breaks the wait: the line that was waiting ends in an
* error, and then the line just typed is done (boot.h). */
while (how == V4_BOOT_LINE_WAITING) {
fflush(stdout);
if (!fgets(line, sizeof line, stdin)) { putchar('\n'); return 0; }
len = strlen(line);
if (len && line[len - 1] == '\n') len--;
if ((len = read_line(line, sizeof line)) < 0) { putchar('\n'); return 0; }
how = v4_boot_line(&boot, line, (unsigned)len);
if (how == V4_BOOT_LINE_TOO_LONG) { fputs("Line too long\n ERROR\n", stdout); how = V4_BOOT_LINE_WAITING; continue; }
if (how == V4_TEXT_ERROR) fputs(" ERROR\nok> ", stdout);