The 7-row table covered u8 addr-of (local + *struct param) and the
non-u8 stride only on the slice path. Two coverage gaps closed:
addr_i32 &x.o[2] on a [4]i32 field, *p read -> 88. The addr-of
complex-base arm scales the index by esz=sizeof(elem)
independent of the base-address path; only u8 (esz=1)
rows exercised it before. Proves IMULQ $4 stride
composes with the dotbaseaddr LEAQ base.
slice_ptr_u8 x.o[1:4] via a *e param. dotbaseaddr's viaptr arm
(MOVQ (BP) deref) on the slice base was untested — all
slice rows used a value-struct (LEAQ) base.
Both run-correct + cs==ww byte-identical.
260 lines
7.6 KiB
C
260 lines
7.6 KiB
C
/*
|
|
* 949_dotbase_addr_slice_run — runtime + byte-id net for #252, the
|
|
* addr-of + slice SIBLING of #135 (949_dotbase_arr_run covers the
|
|
* read/write index path). Taking `&x.o[i]` (address-of an element) or
|
|
* slicing `x.o[lo:hi]` / `x.o[lo:]` of a struct's `[N]T`-typed FIELD
|
|
* computed the field's VALUE as the base address instead of its
|
|
* ADDRESS: cgen emitted `MOVL off(BP),AX` (load the field's first
|
|
* 8 bytes as a pointer) where it must emit `LEAQ off(BP),AX` (the
|
|
* field's address) -> garbage pointer -> SEGFAULT. The index
|
|
* read/write path was fixed in #135; the addr-of N_INDEX "complex
|
|
* base" arm and the N_SLICE base arm still fell to the generic
|
|
* cgexpr(base) auto-deref. cs==ww BOTH stages broken identically
|
|
* pre-fix (gate-blind, pure correctness — not a byte-id divergence).
|
|
*
|
|
* Fix wires the same `cg_dotbase_addr` (cstage) / `dotbaseaddr`
|
|
* (wwstage) helper #135 introduced into those two base-address paths
|
|
* (guarded `if(!cg_dotbase_addr(...)) cgexpr(base)`). For the slice
|
|
* path the element stride (esz) and default-hi length are extended to
|
|
* an N_DOT array-field base too (read from the field's element tinfo /
|
|
* array length via the type table — rule-13), so non-u8 element slices
|
|
* scale correctly and `s.obuf[lo:]` gets the array's element count.
|
|
*
|
|
* Rows (cstage `ww build` + run for exit code; w6c vs w6c_ww `.s` cmp
|
|
* for rule-10 byte-id):
|
|
* - addr_local_u8 &x.o[1] on a local value-struct, *p read → 66
|
|
* - addr_ptr_u8 &x.o[2] via a *struct param, *p read → 77
|
|
* - addr_i32 &x.o[2] on [4]i32 field, *p read (esz=4) → 88
|
|
* - slice_u8_expl x.o[1:4] explicit hi, s[0] read → 66
|
|
* - slice_u8_dflthi x.o[1:] default hi, s[0] read → 66
|
|
* - slice_ptr_u8 x.o[1:4] via a *struct param, s[0] read → 66
|
|
* - slice_i32_expl [4]i32 field x.o[1:3], s[1] read (esz=4) → 88
|
|
* - slice_i32_dflt [4]i32 field x.o[1:], s[2] read (esz=4) → 55
|
|
* - control_bare bare-local [4]u8 &a[1] write + a[1:4] read → 44
|
|
*
|
|
* The bare-local control asserts the N_IDENT base paths (untouched by
|
|
* this fix) still emit correct code; the non-u8 rows assert the esz
|
|
* stride extension is wired (not silently esz=1).
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/wait.h>
|
|
|
|
static int
|
|
runwait(const char *cmd)
|
|
{
|
|
int rc = system(cmd);
|
|
if (rc == -1) return -1;
|
|
if (WIFEXITED(rc)) return WEXITSTATUS(rc);
|
|
return -1;
|
|
}
|
|
|
|
struct row { const char *label; const char *src; int want_exit; };
|
|
|
|
static const struct row rows[] = {
|
|
{ "addr_local_u8",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]u8 };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[1] = 66u8;\n"
|
|
" let p: *u8 = &x.o[1];\n"
|
|
" return (*p): i32;\n"
|
|
"};\n", 66 },
|
|
{ "addr_ptr_u8",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]u8 };\n"
|
|
"fn rd(x: *e) u8 = { let p: *u8 = &x.o[2]; return *p; };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[2] = 77u8;\n"
|
|
" return rd(&x): i32;\n"
|
|
"};\n", 77 },
|
|
{ "addr_i32",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]i32 };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[2] = 88;\n"
|
|
" let p: *i32 = &x.o[2];\n"
|
|
" return *p;\n"
|
|
"};\n", 88 },
|
|
{ "slice_u8_expl",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]u8 };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[1] = 66u8;\n"
|
|
" let s: []u8 = x.o[1:4];\n"
|
|
" return s[0]: i32;\n"
|
|
"};\n", 66 },
|
|
{ "slice_u8_dflthi",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]u8 };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[1] = 66u8;\n"
|
|
" let s: []u8 = x.o[1:];\n"
|
|
" return s[0]: i32;\n"
|
|
"};\n", 66 },
|
|
{ "slice_ptr_u8",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]u8 };\n"
|
|
"fn sl(x: *e) u8 = { let s: []u8 = x.o[1:4]; return s[0]; };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[1] = 66u8;\n"
|
|
" return sl(&x): i32;\n"
|
|
"};\n", 66 },
|
|
{ "slice_i32_expl",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]i32 };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[1] = 99;\n"
|
|
" x.o[2] = 88;\n"
|
|
" let s: []i32 = x.o[1:3];\n"
|
|
" return s[1];\n"
|
|
"};\n", 88 },
|
|
{ "slice_i32_dflt",
|
|
"package main;\n"
|
|
"type e = struct { o: [4]i32 };\n"
|
|
"export fn main() i32 = {\n"
|
|
" let x: e;\n"
|
|
" x.o[3] = 55;\n"
|
|
" let s: []i32 = x.o[1:];\n"
|
|
" return s[2];\n"
|
|
"};\n", 55 },
|
|
{ "control_bare",
|
|
"package main;\n"
|
|
"export fn main() i32 = {\n"
|
|
" let a: [4]u8;\n"
|
|
" a[2] = 44u8;\n"
|
|
" let p: *u8 = &a[1];\n"
|
|
" *p = 33u8;\n"
|
|
" let s: []u8 = a[1:4];\n"
|
|
" return s[1]: i32;\n"
|
|
"};\n", 44 },
|
|
{ NULL, NULL, 0 }
|
|
};
|
|
|
|
static int
|
|
slurp_eq(const char *a, const char *b)
|
|
{
|
|
FILE *fa = fopen(a, "rb");
|
|
FILE *fb = fopen(b, "rb");
|
|
if (!fa || !fb) { if (fa) fclose(fa); if (fb) fclose(fb); return -1; }
|
|
int rc = 0;
|
|
for (;;) {
|
|
int ca = fgetc(fa);
|
|
int cb = fgetc(fb);
|
|
if (ca != cb) { rc = -1; break; }
|
|
if (ca == EOF) break;
|
|
}
|
|
fclose(fa); fclose(fb);
|
|
return rc;
|
|
}
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
const char *bin = getenv("BIN");
|
|
if (!bin) bin = "out/bin";
|
|
char absbin[1024];
|
|
if (bin[0] != '/') {
|
|
char cwd[1024];
|
|
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
|
snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin);
|
|
bin = absbin;
|
|
}
|
|
|
|
char w6c[1100], w6c_ww[1100];
|
|
snprintf(w6c, sizeof w6c, "%s/w6c", bin);
|
|
snprintf(w6c_ww, sizeof w6c_ww, "%s/w6c_ww", bin);
|
|
if (access(w6c_ww, X_OK) != 0) {
|
|
fprintf(stderr, "dotbaseaddr: w6c_ww missing — cannot run the "
|
|
"cs==ww byte-id gate (the whole point of this test)\n");
|
|
return 1;
|
|
}
|
|
|
|
int n = 0, fail = 0;
|
|
for (int i = 0; rows[i].src; i++, n++) {
|
|
char src[64];
|
|
snprintf(src, sizeof src, "/tmp/wwdbs_%d_%d.ww", getpid(), i);
|
|
FILE *f = fopen(src, "wb");
|
|
if (f == NULL) { fail++; continue; }
|
|
fputs(rows[i].src, f);
|
|
fclose(f);
|
|
|
|
char tmpdir[64];
|
|
snprintf(tmpdir, sizeof tmpdir, "/tmp/wwdbs_%d_d_%d",
|
|
getpid(), i);
|
|
mkdir(tmpdir, 0755);
|
|
|
|
char cmd[2048];
|
|
snprintf(cmd, sizeof cmd, "cd %s && %s/ww build %s",
|
|
tmpdir, bin, src);
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "row[%s]: cstage build failed\n",
|
|
rows[i].label);
|
|
fail++;
|
|
unlink(src); rmdir(tmpdir);
|
|
continue;
|
|
}
|
|
|
|
char outbin[128];
|
|
const char *base = strrchr(src, '/');
|
|
base = base ? base + 1 : src;
|
|
snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base);
|
|
char *dot = strrchr(outbin, '.');
|
|
if (dot && strcmp(dot, ".ww") == 0) *dot = '\0';
|
|
|
|
int got = runwait(outbin);
|
|
if (got != rows[i].want_exit) {
|
|
fprintf(stderr, "row[%s]: cstage exit %d, want %d\n",
|
|
rows[i].label, got, rows[i].want_exit);
|
|
fail++;
|
|
}
|
|
unlink(outbin); rmdir(tmpdir);
|
|
|
|
char cs_s[64], ws_s[64];
|
|
snprintf(cs_s, sizeof cs_s, "/tmp/wwdbs_%d_%d_cs.s",
|
|
getpid(), i);
|
|
snprintf(ws_s, sizeof ws_s, "/tmp/wwdbs_%d_%d_ww.s",
|
|
getpid(), i);
|
|
|
|
snprintf(cmd, sizeof cmd, "%s -o %s %s 2>/dev/null",
|
|
w6c, cs_s, src);
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "row[%s]: w6c failed\n", rows[i].label);
|
|
fail++; unlink(src); continue;
|
|
}
|
|
snprintf(cmd, sizeof cmd, "%s -o %s %s 2>/dev/null",
|
|
w6c_ww, ws_s, src);
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "row[%s]: w6c_ww failed\n",
|
|
rows[i].label);
|
|
fail++; unlink(src); unlink(cs_s); continue;
|
|
}
|
|
if (slurp_eq(cs_s, ws_s) != 0) {
|
|
fprintf(stderr,
|
|
"row[%s]: cstage/wwstage .s DIFFER (rule-10 "
|
|
"byte-id violation)\n", rows[i].label);
|
|
fail++;
|
|
}
|
|
unlink(src); unlink(cs_s); unlink(ws_s);
|
|
}
|
|
|
|
if (fail) {
|
|
fprintf(stderr, "%d/%d dotbase-addr-slice tests failed\n",
|
|
fail, n);
|
|
return 1;
|
|
}
|
|
printf("dotbaseaddr: %d/%d ok (cstage run + cs==ww byte-id)\n",
|
|
n, n);
|
|
return 0;
|
|
}
|