Capsule blocks steps 3+4 for v4: capsules are placed in RAM and load their lowest block
Captain Bob ruled: Block n lands at n-R; the lowest block is interpreted; chaining is the developer's; together, v4 first. - v4_blocks_place_capsule copies each Block n into RAM block n - R as 16 lines of 64, space-padded, in any file order. A later block of the same number overwrites. It refuses a block below R. - The mesh's load(), its capsule reader (CAPSULE-OPEN/(LINES), so a child's forth79.4th via BIRTH too), boot.c and test_host_unit's model each place a capsule, then interpret "<lowest> LOAD". - mkdictionary.py skips --> when it types capsules at the hosted prompt. - The v4 capsules are renumbered into R..2R-1, landing at RAM 1900 and up, away from POST's blocks 0-5. Each is chained with -->, and centre.4th's gap at 8103 is closed. Test first: - test_host_blocks.c gained 6 placement checks; it failed to build before. - test_mesh_boot.c checks forth79's lowest block in RAM block 1900; it failed before. After: POST is 990/990; all 52 tests at 64 bits, test-32, hosted-check and ASan/UBSan pass; the amd64 kernel builds; the dictionary has 404 words. Logs are in logs/20261118-capsule-place. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RzZgrf7V7Zk2iczBXDRbm
This commit is contained in:
+25
-41
@@ -36,7 +36,6 @@ static const char *const boot_capsules[] = {
|
||||
#define V4_POST_AT_BOOT 1
|
||||
#endif
|
||||
|
||||
#define LINE_MAX 1025u /* a line is at most 1024 characters, a block */
|
||||
#define STEP_LIMIT 4000000000ULL /* instruction words one line may take */
|
||||
|
||||
/* ---- printing ------------------------------------------------------------ */
|
||||
@@ -356,55 +355,40 @@ static const uint8_t *open_capsule(const v4_boot *b, const char *name, const Cap
|
||||
}
|
||||
|
||||
|
||||
static void say_where(const v4_boot *b, const char *name, uint32_t block, uint32_t line)
|
||||
{
|
||||
say(b, "\nV4: capsule "); say(b, name);
|
||||
say(b, " block "); say_dec(b, block);
|
||||
say(b, " line "); say_dec(b, line);
|
||||
}
|
||||
|
||||
static int load_capsule(const v4_boot *b, const char *name)
|
||||
{
|
||||
const CapsuleDesc *cap;
|
||||
const uint8_t *p, *end;
|
||||
uint32_t block = 0, line = 0;
|
||||
int in_block = 0;
|
||||
const uint8_t *p;
|
||||
uint32_t lowest = 0, v;
|
||||
int placed;
|
||||
|
||||
p = open_capsule(b, name, &cap);
|
||||
if (!p) return 0;
|
||||
end = p + cap->length;
|
||||
|
||||
while (p < end) {
|
||||
const uint8_t *after, *nl;
|
||||
uint32_t num;
|
||||
unsigned len, i;
|
||||
char text[LINE_MAX];
|
||||
|
||||
if (capsule_block_header(p, end, &num, &after)) {
|
||||
block = num; line = 0; in_block = 1; p = after;
|
||||
continue;
|
||||
/* Its blocks are placed in RAM, block n at n - R, and the lowest is loaded: what runs after it is
|
||||
* the capsule's own (docs/v4.0.0/plans/2026-11-18-capsule-blocks.md). */
|
||||
placed = v4_blocks_place_capsule(p, p + cap->length, &lowest);
|
||||
if (placed < 0) { say(b, "V4: "); say(b, name); say(b, " could not be placed in RAM\n"); return 0; }
|
||||
if (placed > 0) {
|
||||
char text[24], d[12];
|
||||
unsigned len = 0, nd = 0;
|
||||
const char *s;
|
||||
int how;
|
||||
v = lowest;
|
||||
do { d[nd++] = (char)('0' + v % 10u); v /= 10u; } while (v);
|
||||
while (nd) text[len++] = d[--nd];
|
||||
for (s = " LOAD"; *s; s++) text[len++] = *s;
|
||||
how = v4_boot_line(b, text, len);
|
||||
if (how != V4_TEXT_COMPLETED) {
|
||||
say(b, "V4: "); say(b, name);
|
||||
say(b, how == V4_TEXT_ERROR ? " ended in an error: "
|
||||
: how == V4_TEXT_QUIT ? " ended with QUIT: "
|
||||
: how == V4_BOOT_LINE_NO_INPUT ? " reads the keyboard: "
|
||||
: " stopped the node: ");
|
||||
b->out(text, len); say(b, "\n");
|
||||
return 0;
|
||||
}
|
||||
for (nl = p; nl < end && *nl != '\n'; nl++) { }
|
||||
len = (unsigned)(nl - p);
|
||||
if (len && p[len - 1] == '\r') len--;
|
||||
if (in_block) {
|
||||
line++;
|
||||
if (len >= LINE_MAX) { say_where(b, name, block, line); say(b, " is too long\n"); return 0; }
|
||||
if (len) {
|
||||
for (i = 0; i < len; i++) text[i] = (char)p[i];
|
||||
int how = v4_boot_line(b, text, len);
|
||||
if (how != V4_TEXT_COMPLETED) {
|
||||
say_where(b, name, block, line);
|
||||
say(b, how == V4_TEXT_ERROR ? " ended in an error: "
|
||||
: how == V4_TEXT_QUIT ? " ended with QUIT: "
|
||||
: how == V4_BOOT_LINE_NO_INPUT ? " reads the keyboard: "
|
||||
: " stopped the node: ");
|
||||
b->out(text, len); say(b, "\n");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
p = (nl < end) ? nl + 1 : end;
|
||||
}
|
||||
|
||||
say(b, "PARITY:V4_CAPSULE name="); say(b, name);
|
||||
|
||||
Reference in New Issue
Block a user