Hojun-Cho
2c33228b7e
Plan 9-style w-prefix on the per-arch tools, disambiguating from the
real Plan 9 6c/6a/6l in ref/plan9front/:
cmd/wwc/ → cmd/wcc/ libwwc.a → libwcc.a
cmd/6{c,a,l} → cmd/w6{c,a,l} binary names too
test/wwc/ → test/wcc/ 6 test files w/ w6 prefix
selfhost/cmd mirror in lockstep
bootstrap/amd64/{w6c,w6a,w6l} snapshot binaries (gitignored)
WW_6{C,A,L} → WW_W6{C,A,L} env-var overrides
Plan 9 source-tree refs ("Plan 9 6c shape", ref/plan9front/, etc.)
preserved. Hare-style driver, both C and ww sides:
ww test [path] discover *_test.ww in a directory module, run
each; single-file mode for `ww test foo.ww`
Module-by-name `ww build foo` resolves to foo.ww or foo/foo.ww
via search path (cwd : -I dirs : $WW_LIB)
Default-to-cwd `ww build` / `ww test` build the cwd module
Run pass-through `ww run path arg1 arg2` reaches the program
lib/os: getcwd (79) and getdents64 (217) syscalls power `.` resolution
and directory enumeration on the ww side.
Makefile: wwstage tool deps now include lib/os/os.ww (+ lib/strconv
for wwdump_ww) so lib/* edits force their rebuild instead of leaving
stale binaries — surfaced when test 995 first failed against a stale
w6c_ww built before the lib/os additions.
Test 993 byte-identical parity gate (C-side ww vs ww-side ww_ww on a
build corpus) stays green; all 19 tests pass.
123 lines
3.2 KiB
C
123 lines
3.2 KiB
C
/*
|
|
* 996_dyn_ww — phase-8 marker for ET_DYN linking on the ww side.
|
|
*
|
|
* Drives w6l_ww with -L/-l flags over examples/snake/snake.o and diffs
|
|
* the result against the C-built w6l on the same inputs. A green run
|
|
* means the ww-side linker emits PT_INTERP/PT_DYNAMIC binaries byte-
|
|
* for-byte identical to the C linker — i.e. the dynamic linking story
|
|
* is fully ported and snake no longer depends on Cstage.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.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 *
|
|
absbin(void)
|
|
{
|
|
const char *b = getenv("BIN");
|
|
if (!b) b = "out/bin";
|
|
if (b[0] == '/') return b;
|
|
static char buf[2048];
|
|
char cwd[1024];
|
|
if (getcwd(cwd, sizeof cwd) == NULL) return NULL;
|
|
snprintf(buf, sizeof buf, "%s/%s", cwd, b);
|
|
return buf;
|
|
}
|
|
|
|
static int
|
|
slurp(const char *path, char **outbuf, size_t *outlen)
|
|
{
|
|
FILE *f = fopen(path, "rb");
|
|
if (!f) return -1;
|
|
fseek(f, 0, SEEK_END);
|
|
long n = ftell(f);
|
|
fseek(f, 0, SEEK_SET);
|
|
if (n < 0) { fclose(f); return -1; }
|
|
char *b = malloc((size_t)n + 1);
|
|
if (!b) { fclose(f); return -1; }
|
|
if (fread(b, 1, (size_t)n, f) != (size_t)n) { free(b); fclose(f); return -1; }
|
|
b[n] = '\0';
|
|
fclose(f);
|
|
*outbuf = b;
|
|
*outlen = (size_t)n;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
const char *bin = absbin();
|
|
if (!bin) return 1;
|
|
|
|
char cwd[1024];
|
|
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
|
|
|
/* Ensure snake.o exists. The example's Makefile produces it via
|
|
* the C-side `ww build`. Re-run that so the test is self-contained. */
|
|
char cmd[4096];
|
|
snprintf(cmd, sizeof cmd,
|
|
"cd %s/examples/snake && %s/ww build snake.ww -L /usr/lib "
|
|
"-l ncurses -l c >/dev/null 2>&1",
|
|
cwd, bin);
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "w6l_ww-dyn FAIL: cannot build snake.o via C driver\n");
|
|
return 1;
|
|
}
|
|
|
|
char co[64], wo[64];
|
|
snprintf(co, sizeof co, "/tmp/wwld_%d_c", getpid());
|
|
snprintf(wo, sizeof wo, "/tmp/wwld_%d_w", getpid());
|
|
|
|
/* C-side w6l with the dynamic flags. */
|
|
snprintf(cmd, sizeof cmd,
|
|
"%s/w6l -o %s %s/examples/snake/snake.o -L /usr/lib "
|
|
"-l ncurses -l c %s/out/lib/libwwrt.a 2>/dev/null",
|
|
bin, co, cwd, cwd);
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "w6l_ww-dyn FAIL: C w6l errored\n");
|
|
unlink(co);
|
|
return 1;
|
|
}
|
|
|
|
/* ww-side w6l with the same flags. */
|
|
snprintf(cmd, sizeof cmd,
|
|
"%s/w6l_ww -o %s %s/examples/snake/snake.o -L /usr/lib "
|
|
"-l ncurses -l c %s/out/lib/libwwrt.a 2>/dev/null",
|
|
bin, wo, cwd, cwd);
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "w6l_ww-dyn FAIL: ww w6l errored\n");
|
|
unlink(co); unlink(wo);
|
|
return 1;
|
|
}
|
|
|
|
char *bc = NULL, *bw = NULL;
|
|
size_t nc = 0, nw = 0;
|
|
int rc = 0;
|
|
if (slurp(co, &bc, &nc) < 0 || slurp(wo, &bw, &nw) < 0) {
|
|
fprintf(stderr, "w6l_ww-dyn FAIL: cannot read outputs\n");
|
|
rc = 1;
|
|
} else if (nc != nw || memcmp(bc, bw, nc) != 0) {
|
|
fprintf(stderr, "w6l_ww-dyn FAIL: C %zu vs ww %zu bytes\n",
|
|
nc, nw);
|
|
rc = 1;
|
|
} else {
|
|
printf("w6l_ww-dyn: byte-identical to C w6l on snake "
|
|
"(PT_INTERP + PT_DYNAMIC + .rela.plt + .gnu.version_r, "
|
|
"%zu bytes)\n", nc);
|
|
}
|
|
free(bc); free(bw);
|
|
unlink(co); unlink(wo);
|
|
return rc;
|
|
}
|