The str-size arm of the global data emit was size-keyed and matched a 24-sized array, emitting a second DATAW for the same symbol. Gate on the array kind (!isarr8). Review item #12.
163 lines
4.5 KiB
C
163 lines
4.5 KiB
C
/*
|
|
* 689_arrglob_nodup_run (#12) — a no-init module-level array global emits
|
|
* its zero-fill DATAW row EXACTLY ONCE, and cstage / wwstage agree
|
|
* byte-for-byte.
|
|
*
|
|
* THE BUG (wwstage only): emitletdataw's str-payload zero-fallback arm is
|
|
* SIZE-keyed (`sz == size(str)` == 24), not type-keyed. A no-init array
|
|
* global whose bytes sum to 24 (e.g. `let g: [3]u64;`) matched that arm AND
|
|
* the dedicated TY_ARRAY arm below → two identical `DATAW main.g` rows.
|
|
* cstage discriminates on the declared type kind (let_isstr) and emits one.
|
|
* Runtime reads the null bytes correctly either way (the linker keeps one
|
|
* symbol), so the divergence is byte-id-visible only — the asm-byte-id check
|
|
* is the real discriminator; the row-count + run rows pin absolute correctness.
|
|
*
|
|
* THE FIX: exclude arrays from the str-size arm (`&& !isarr8`), mirroring the
|
|
* isarr8 guard already on the sz==8 scalar arm. The emitarraydata path owns
|
|
* array globals.
|
|
*
|
|
* check | shape | want
|
|
* -------------------+-----------------------------+--------------
|
|
* run | g[0]+g[1]+g[2], = 1+2+3 | 6
|
|
* dataw_rows (ww) | count of `DATAW main.g` rows | 1
|
|
* asm_byte_identical | w6c vs w6c_ww .s | identical
|
|
* Pre-fix: ww emitted 2 `DATAW main.g` rows; cs vs ww .s differed.
|
|
*/
|
|
#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;
|
|
}
|
|
|
|
static const char *SRC =
|
|
"package main;\n"
|
|
"let g: [3]u64;\n"
|
|
"export fn main() i32 = {\n"
|
|
" g[0] = 1; g[1] = 2; g[2] = 3;\n"
|
|
" return (g[0] + g[1] + g[2]): i32;\n"
|
|
"};\n";
|
|
|
|
static int
|
|
run_driver(const char *driver)
|
|
{
|
|
char src[64], tmpdir[64], cmd[1024];
|
|
snprintf(src, sizeof src, "/tmp/agnd_%d.ww", getpid());
|
|
snprintf(tmpdir, sizeof tmpdir, "/tmp/agnd_%d_d", getpid());
|
|
|
|
FILE *f = fopen(src, "wb");
|
|
if (!f) return -1;
|
|
fputs(SRC, f);
|
|
fclose(f);
|
|
|
|
mkdir(tmpdir, 0755);
|
|
snprintf(cmd, sizeof cmd, "cd %s && %s build %s 2>/dev/null",
|
|
tmpdir, driver, src);
|
|
if (runwait(cmd) != 0) { unlink(src); rmdir(tmpdir); return -1; }
|
|
|
|
const char *base = strrchr(src, '/');
|
|
base = base ? base + 1 : src;
|
|
char outbin[128];
|
|
snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base);
|
|
char *dot = strrchr(outbin, '.');
|
|
if (dot && strcmp(dot, ".ww") == 0) *dot = '\0';
|
|
int got = runwait(outbin);
|
|
|
|
unlink(src); unlink(outbin); rmdir(tmpdir);
|
|
return got;
|
|
}
|
|
|
|
/* emit .s via `tool`, return the count of `DATAW main.g(SB)` rows, or -1. */
|
|
static int
|
|
dataw_rows(const char *bin, const char *tool)
|
|
{
|
|
char src[64], asmf[80], cmd[1024];
|
|
snprintf(src, sizeof src, "/tmp/agnd_asm_%d.ww", getpid());
|
|
snprintf(asmf, sizeof asmf, "/tmp/agnd_asm_%d_%s.s", getpid(), tool);
|
|
|
|
FILE *f = fopen(src, "wb");
|
|
if (!f) return -1;
|
|
fputs(SRC, f);
|
|
fclose(f);
|
|
|
|
snprintf(cmd, sizeof cmd, "%s/%s -o %s %s 2>/dev/null", bin, tool, asmf, src);
|
|
if (runwait(cmd) != 0) { unlink(src); return -1; }
|
|
|
|
FILE *a = fopen(asmf, "rb");
|
|
int n = 0;
|
|
if (a) {
|
|
char line[512];
|
|
while (fgets(line, sizeof line, a))
|
|
if (strncmp(line, "DATAW main.g(SB)", 16) == 0) n++;
|
|
fclose(a);
|
|
} else {
|
|
n = -1;
|
|
}
|
|
unlink(src); unlink(asmf);
|
|
return n;
|
|
}
|
|
|
|
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 cdrv[1024], wdrv[1024];
|
|
snprintf(cdrv, sizeof cdrv, "%s/ww", bin);
|
|
snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin);
|
|
int have_ww = (access(wdrv, X_OK) == 0);
|
|
|
|
int fail = 0, total = 0;
|
|
|
|
/* run correctness, both drivers */
|
|
total++;
|
|
if (run_driver(cdrv) != 6) {
|
|
fprintf(stderr, "arrglob_nodup[cstage]: run != 6\n"); fail++;
|
|
}
|
|
if (have_ww) {
|
|
total++;
|
|
if (run_driver(wdrv) != 6) {
|
|
fprintf(stderr, "arrglob_nodup[wwstage]: run != 6\n"); fail++;
|
|
}
|
|
}
|
|
|
|
/* exactly one DATAW row per stage */
|
|
total++;
|
|
if (dataw_rows(bin, "w6c") != 1) {
|
|
fprintf(stderr, "arrglob_nodup[w6c]: DATAW main.g rows != 1\n"); fail++;
|
|
}
|
|
if (access(wdrv, X_OK) == 0) {
|
|
total++;
|
|
int r = dataw_rows(bin, "w6c_ww");
|
|
if (r != 1) {
|
|
fprintf(stderr, "arrglob_nodup[w6c_ww]: DATAW main.g rows = %d "
|
|
"(want 1 — double-emit #12)\n", r);
|
|
fail++;
|
|
}
|
|
}
|
|
|
|
if (fail) {
|
|
fprintf(stderr, "arrglob_nodup_run: %d/%d checks failed\n", fail, total);
|
|
return 1;
|
|
}
|
|
printf("arrglob_nodup_run: %d/%d ok\n", total, total);
|
|
return 0;
|
|
}
|