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:
@@ -217,6 +217,36 @@ int main(void)
|
||||
CHECK(!v4_blocks_serve(&w, &n, 5) && !v4_blocks_serve(&w, &n, 0) && !v4_blocks_serve(&w, &n, -6) && v4_dstack_pop(&n.ds) == 22 && v4_dstack_pop(&n.ds) == 11,
|
||||
"any other request is not served here, and the stack is as it was");
|
||||
|
||||
/* ---- a capsule placed in RAM (docs/v4.0.0/plans/2026-11-18-capsule-blocks.md) ----
|
||||
* Each `Block n` goes to RAM block n - R (R the RAM block count, blk_layout.h), as 16
|
||||
* lines of 64 characters padded with spaces, whatever its order in the file; a later
|
||||
* block of the same number overwrites; the lowest placed is given back. */
|
||||
{
|
||||
static const char cap[] =
|
||||
"Block 2050\n( two )\n: TWO 2 ;\n"
|
||||
"Block 2049\n( one, written first in RAM order )\n"
|
||||
"Block 2051\n( first )\n"
|
||||
"Block 2051\n( second, overwrites )\n";
|
||||
uint32_t lowest = 0;
|
||||
int placed = v4_blocks_place_capsule((const uint8_t *)cap, (const uint8_t *)cap + sizeof cap - 1u, &lowest);
|
||||
const uint8_t *b1 = blk_get_buffer(1, 0), *b2 = blk_get_buffer(2, 0), *b3 = blk_get_buffer(3, 0);
|
||||
unsigned k, spaces = 1;
|
||||
CHECK(placed == 4 && lowest == 1, "four blocks placed, the lowest at RAM block 1 (%d, %u)", placed, (unsigned)lowest);
|
||||
CHECK(b2 && memcmp(b2, "( two )", 7) == 0 && memcmp(b2 + 64, ": TWO 2 ;", 9) == 0,
|
||||
"block 2050 is at RAM block 2: its lines at 0 and 64");
|
||||
for (k = 7; b2 && k < 64; k++) if (b2[k] != ' ') spaces = 0;
|
||||
for (k = 128 + 0; b2 && k < 1024; k++) if (b2[k] != ' ') spaces = 0;
|
||||
CHECK(spaces, " each line padded with spaces to 64, and the rest of the block spaces");
|
||||
CHECK(b1 && memcmp(b1, "( one, written first in RAM order )", 35) == 0, "block 2049 is at RAM block 1, whatever the file's order");
|
||||
CHECK(b3 && memcmp(b3, "( second, overwrites )", 22) == 0, "a block of the same number overwrites the first");
|
||||
}
|
||||
{
|
||||
static const char low[] = "Block 2047\n( in the RAM itself )\n";
|
||||
uint32_t lowest = 99;
|
||||
CHECK(v4_blocks_place_capsule((const uint8_t *)low, (const uint8_t *)low + sizeof low - 1u, &lowest) == -1,
|
||||
"a block below the RAM count is refused");
|
||||
}
|
||||
|
||||
printf(" %d checks, %d failures\n", checks, failures);
|
||||
return failures ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -100,6 +100,26 @@ static int read_file(reader *r, const char *name)
|
||||
r->at = 0; r->in_block = 0; r->is_f18 = 0; r->cells_at = 0;
|
||||
return 1;
|
||||
}
|
||||
/* A capsule of FORTH blocks, as the kernel takes it in (v4/system/mesh.c; docs/v4.0.0/plans/
|
||||
* 2026-11-18-capsule-blocks.md): its blocks placed in RAM, block n at n - R, and the reader left
|
||||
* with the one line that loads the lowest. 0 if it could not be read or placed. */
|
||||
static int place_file(reader *r, const char *name)
|
||||
{
|
||||
uint32_t lowest = 0;
|
||||
int placed;
|
||||
char one[40];
|
||||
if (!read_file(r, name)) return 0;
|
||||
placed = v4_blocks_place_capsule((const uint8_t *)r->text, (const uint8_t *)r->text + r->len, &lowest);
|
||||
if (placed < 0) return 0;
|
||||
snprintf(one, sizeof one, placed ? "Block 1\n%u LOAD\n" : "\n", (unsigned)lowest);
|
||||
free(r->text);
|
||||
r->len = (long)strlen(one);
|
||||
r->text = (char *)malloc((size_t)r->len + 1);
|
||||
if (!r->text) return 0;
|
||||
memcpy(r->text, one, (size_t)r->len + 1);
|
||||
r->at = 0; r->in_block = 0;
|
||||
return 1;
|
||||
}
|
||||
/* the next line of a block that has anything on it: its length, or -1 */
|
||||
static int next_line(reader *r, char *text)
|
||||
{
|
||||
@@ -175,8 +195,8 @@ static int host_open(void *self, unsigned asker, const char *name, unsigned len)
|
||||
reader *r = &reads[asker];
|
||||
(void)self;
|
||||
if (len == 17 && memcmp(name, "v4:nucleus-64.f18", 17) == 0) { r->is_f18 = 1; r->cells_at = 0; return 1; }
|
||||
if (len == 14 && memcmp(name, "v4:forth79.4th", 14) == 0) return read_file(r, "forth79.4th");
|
||||
if (len == 13 && memcmp(name, "v4:centre.4th", 13) == 0) return read_file(r, "centre.4th");
|
||||
if (len == 14 && memcmp(name, "v4:forth79.4th", 14) == 0) return place_file(r, "forth79.4th");
|
||||
if (len == 13 && memcmp(name, "v4:centre.4th", 13) == 0) return place_file(r, "centre.4th");
|
||||
return 0;
|
||||
}
|
||||
static int host_cell(void *self, unsigned asker, v4_cell *w)
|
||||
@@ -331,15 +351,15 @@ static void post_say(void *self, const char *text, unsigned len)
|
||||
if (post_said_len + len < sizeof post_said) { memcpy(post_said + post_said_len, text, len); post_said_len += len; post_said[post_said_len] = 0; }
|
||||
}
|
||||
|
||||
/* Every line of a capsule of FORTH blocks, told to a node from the console:
|
||||
* how many lines did not complete. */
|
||||
/* A capsule of FORTH blocks, placed in RAM and its lowest block loaded, told to a node from the
|
||||
* console: how many lines did not complete. */
|
||||
static unsigned load(v4_cell node, const char *file)
|
||||
{
|
||||
static reader r;
|
||||
char line[V4_MANAGE_LINE + 1];
|
||||
unsigned bad = 0;
|
||||
int n;
|
||||
if (!read_file(&r, file)) return 1;
|
||||
if (!place_file(&r, file)) return 1;
|
||||
while ((n = next_line(&r, line)) >= 0) {
|
||||
line[n] = 0;
|
||||
(void)tell(node, line);
|
||||
|
||||
@@ -143,6 +143,10 @@ int main(void)
|
||||
/* ---- lines, as messages ---- */
|
||||
r = line(V4_MESH_HERA, "3 4 + .", &how);
|
||||
CHECK(how == V4_TEXT_COMPLETED && strcmp(r, "7 ") == 0, "a line to Hera: \"%s\" (%d)", r, how);
|
||||
/* the capsules were placed in RAM, block n at n - R, and loaded from there (capsule blocks plan, step 4):
|
||||
* forth79.4th's lowest block, 3948, is RAM block 1900 */
|
||||
r = line(V4_MESH_HERA, "1900 BLOCK 16 TYPE", &how);
|
||||
CHECK(how == V4_TEXT_COMPLETED && strncmp(r, "( forth79.4th --", 16) == 0, "forth79.4th's lowest block is in RAM block 1900: \"%.20s\" (%d)", r, how);
|
||||
/* starshipos.4th, a system capsule loaded before POST (MACHINE.md 3, step 3; ruled 2026-11-18) */
|
||||
r = line(V4_MESH_HERA, "STARSHIPOS S\" ok\" DOE", &how); /* COLD leaves FORTH alone in the search; init.4th will set it */
|
||||
CHECK(how == V4_TEXT_COMPLETED && strcmp(r, "ok") == 0, "starshipos.4th is loaded: in STARSHIPOS, DOE types its name: \"%s\" (%d)", r, how);
|
||||
|
||||
Reference in New Issue
Block a user