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:
@@ -7,6 +7,7 @@
|
||||
* through v3's own calls.
|
||||
*/
|
||||
#include "v4/blocks.h"
|
||||
#include "starkernel/capsule_blocks.h"
|
||||
#include "block_subsystem.h"
|
||||
|
||||
static void let_go(v4_blocks *w)
|
||||
@@ -162,3 +163,42 @@ int v4_blocks_serve(v4_blocks *w, v4_node *n, v4_cell request)
|
||||
v4_dstack_push(&n->ds, (v4_cell)status);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ---- a capsule of FORTH blocks, placed in RAM (blocks.h) ------------------------------ */
|
||||
|
||||
int v4_blocks_place_capsule(const uint8_t *p, const uint8_t *end, uint32_t *lowest)
|
||||
{
|
||||
uint8_t *b = 0;
|
||||
uint32_t dest = 0;
|
||||
unsigned line = 0;
|
||||
int placed = 0;
|
||||
|
||||
while (p && p < end) {
|
||||
const uint8_t *after, *nl;
|
||||
uint32_t num;
|
||||
unsigned len, i;
|
||||
if (capsule_block_header(p, end, &num, &after)) {
|
||||
if (b && blk_update(dest) != BLK_OK) return -1;
|
||||
if (num < BLK_RAM_USER_BLOCKS) return -1;
|
||||
dest = num - BLK_RAM_USER_BLOCKS;
|
||||
b = blk_get_buffer(dest, 1);
|
||||
if (!b) return -1;
|
||||
for (i = 0; i < V4_BLOCK_CELLS * 4u; i++) b[i] = ' ';
|
||||
if (placed == 0 || dest < *lowest) *lowest = dest;
|
||||
placed++; line = 0; p = after;
|
||||
continue;
|
||||
}
|
||||
for (nl = p; nl < end && *nl != '\n'; nl++) { }
|
||||
len = (unsigned)(nl - p);
|
||||
if (len && p[len - 1] == '\r') len--;
|
||||
if (b) {
|
||||
if (len > 64u || line >= 16u) return -1;
|
||||
for (i = 0; i < len; i++) b[64u * line + i] = p[i];
|
||||
line++;
|
||||
}
|
||||
p = nl < end ? nl + 1 : end;
|
||||
}
|
||||
if (b && blk_update(dest) != BLK_OK) return -1;
|
||||
return placed;
|
||||
}
|
||||
|
||||
|
||||
+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);
|
||||
|
||||
+29
-4
@@ -65,6 +65,25 @@ static void put_cell(void *self, v4_cell w)
|
||||
typedef struct { const uint8_t *p, *end; int in_block; } reader;
|
||||
static reader reads[MAX_PLACES];
|
||||
|
||||
/* A capsule of FORTH blocks is placed in RAM, block n at n - R, and what is told to the node is the one
|
||||
* line that loads its lowest block (docs/v4.0.0/plans/2026-11-18-capsule-blocks.md): the rest is the
|
||||
* capsule's own (`-->`, `LOAD`, `THRU`). The line goes in text; its length, 0 when the capsule had no
|
||||
* block, or -1 when it could not be placed. */
|
||||
static int placed_line(const uint8_t *p, uint32_t length, char *text)
|
||||
{
|
||||
uint32_t lowest = 0, v;
|
||||
char d[12];
|
||||
int placed = v4_blocks_place_capsule(p, p + length, &lowest), at = 0, nd = 0;
|
||||
const char *s;
|
||||
if (placed <= 0) return placed;
|
||||
v = lowest;
|
||||
do { d[nd++] = (char)('0' + v % 10u); v /= 10u; } while (v);
|
||||
while (nd) text[at++] = d[--nd];
|
||||
for (s = " LOAD"; *s; s++) text[at++] = *s;
|
||||
return at;
|
||||
}
|
||||
static char load_text[MAX_PLACES][24]; /* each place's one line, while its reader gives it */
|
||||
|
||||
static int open_cb(void *self, unsigned asker, const char *name, unsigned len)
|
||||
{
|
||||
char cname[V4_MANAGE_LINE + 1u];
|
||||
@@ -84,7 +103,13 @@ static int open_cb(void *self, unsigned asker, const char *name, unsigned len)
|
||||
p = v4_boot_capsule(&bt, cname, &length, &id, &hash);
|
||||
if (!p) return 0;
|
||||
the->reading_nucleus[asker] = 0;
|
||||
reads[asker].p = p; reads[asker].end = p + length; reads[asker].in_block = 0;
|
||||
{
|
||||
int len = placed_line(p, length, load_text[asker]);
|
||||
if (len < 0) return 0;
|
||||
reads[asker].p = (const uint8_t *)load_text[asker];
|
||||
reads[asker].end = reads[asker].p + len;
|
||||
reads[asker].in_block = 1; /* the one line is the reader's: no header before it */
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
static int cell_cb(void *self, unsigned asker, v4_cell *w)
|
||||
@@ -1225,7 +1250,6 @@ static void post_say(void *self, const char *text, unsigned len) { ((v4_mesh *)s
|
||||
/* Every line of a capsule of FORTH blocks, told to Hera; then its parity line, as v4_boot_run prints it. */
|
||||
static int load(v4_mesh *ms, const char *name)
|
||||
{
|
||||
static reader r;
|
||||
char text[V4_MSG_MAX_CHARS + 1u];
|
||||
uint32_t length;
|
||||
uint64_t id, hash;
|
||||
@@ -1233,8 +1257,9 @@ static int load(v4_mesh *ms, const char *name)
|
||||
int n;
|
||||
v4_fabric_node *h = v4_fabric_node_at(&ms->f, ms->hera_place);
|
||||
if (!p) return 0;
|
||||
r.p = p; r.end = p + length; r.in_block = 0;
|
||||
while ((n = next_line(&r, text, V4_MSG_MAX_CHARS)) >= 0) {
|
||||
n = placed_line(p, length, text);
|
||||
if (n < 0) { say("V4: "); say(name); say(" could not be placed in RAM\n"); return 0; }
|
||||
if (n > 0) {
|
||||
int how = v4_mesh_tell(ms, V4_MESH_HERA, text, (unsigned)n);
|
||||
if (how != V4_TEXT_COMPLETED) {
|
||||
say("V4: "); say(name); say(" did not complete: "); ms->out(text, (unsigned)n); say("\n");
|
||||
|
||||
Reference in New Issue
Block a user