- `woc` now emits `.wob` that `wovm` runs: emit.ml lowers the typed, owner-annotated AST (scope-stack registers with a >64 WO-E401 diagnostic, Lua-style call windows, ICALL by slot, dedup const pool, drop maps, line tables, implicit terminators); disasm.ml backs `--dump-bc` goldens. - Ownership lowering consumes the four owner tables verbatim; RESIDUAL is the only source of borrow ops, coalesced per operand. Review caught the emitter consuming only 2 of owner.ml's 4 residual producers — an assignment-anchored aliasing violation ran to exit 0 instead of trapping; fixed, plus a backstop raising WO-E404 for any residual region left unconsumed. - Conformance harness `scripts/oop-e2e.sh` (`just oop-e2e`): four fixture kinds with exact outcomes — byte-exact stdout, one WO-E### anchored on `error CODE:`, numeric trap code, gc trace. 25 fixtures incl. pricing-demo logic, the ownership suite, and DB_STUB's parse-but-trap. `tests/` un-ignored so the corpus is actually tracked. - `woc build` produces a self-contained binary: wovm copy + appended image + 20-byte trailer, self-exec via /proc/self/exe. Verified relocated outside the repo, argless, and against adversarial trailer corruption. - Milestone 1's five spec criteria all MET (`just oop-accept`). Criterion 3 closed by WO-E405 — the entry must return `Int`, since program mode already says its return value is the exit code — which deletes the leak class without adding return-type metadata to the format. `gc/held-cycle` retired: an externally-held cycle is not expressible in a post-exit pump. - New spec: inferred GC + incremental per-shard tri-color mark-sweep, retiring `@gc` and reference counting. Story gains iterations 7b (that work) and 9b (`@table`, relations, compiler-checked query); `.dev/reference` gains a sparse System.Linq checkout. Priority: 5→6→7 (log-watcher) then 7b, 8, 9, 9b.
67 lines
2.1 KiB
Makefile
67 lines
2.1 KiB
Makefile
CC ?= cc
|
|
CFLAGS ?= -O2 -Wall -Wextra -std=c11
|
|
LDFLAGS ?= -pthread
|
|
|
|
wo-rt: wo-rt.c
|
|
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
|
|
|
|
# ---- wovm VM core (src/) + unit tests (test/) ----
|
|
# Each test/test_*.c builds into its own ASan+UBSan binary linked against
|
|
# every src/*.c except main.c; `make test` runs them all.
|
|
VMSRC := $(filter-out src/main.c,$(wildcard src/*.c))
|
|
VMHDR := $(wildcard src/*.h) $(wildcard test/*.h)
|
|
TESTS := $(wildcard test/test_*.c)
|
|
TESTBIN := $(TESTS:test/%.c=build/%)
|
|
TCFLAGS := -std=c11 -Wall -Wextra -Werror -g -O1 \
|
|
-fsanitize=address,undefined -fno-omit-frame-pointer
|
|
|
|
build:
|
|
mkdir -p build
|
|
|
|
TESTHELP := $(wildcard test/wob_build.c)
|
|
|
|
build/%: test/%.c $(VMSRC) $(TESTHELP) $(VMHDR) | build
|
|
$(CC) $(TCFLAGS) -Isrc -Itest -o $@ $< $(TESTHELP) $(VMSRC)
|
|
|
|
test: $(TESTBIN)
|
|
@for t in $(TESTBIN); do echo "== $$t"; ./$$t || exit 1; done
|
|
|
|
# ISO dispatch flavor (switch instead of computed goto) — gated in every
|
|
# run so the fallback can never rot
|
|
ISOBIN := $(TESTS:test/%.c=build/iso_%)
|
|
|
|
build/iso_%: test/%.c $(VMSRC) $(TESTHELP) $(VMHDR) | build
|
|
$(CC) $(TCFLAGS) -DWO_ISO_C -Isrc -Itest -o $@ $< $(TESTHELP) $(VMSRC)
|
|
|
|
test-iso: $(ISOBIN)
|
|
@for t in $(ISOBIN); do echo "== $$t"; ./$$t || exit 1; done
|
|
|
|
# the wovm binary (plain optimized build; the test suite is the ASan gate)
|
|
wovm: src/main.c $(VMSRC) $(VMHDR)
|
|
$(CC) $(CFLAGS) -Isrc -o $@ src/main.c $(VMSRC)
|
|
|
|
# ASan+UBSan wovm, same flags as the unit tests, for corpus fixtures that
|
|
# need a sanitizer to prove a free actually happened (gc/ cycle fixtures) —
|
|
# tasks 3/4 hand-built this each time because it didn't exist yet
|
|
build/wovm_asan: src/main.c $(VMSRC) $(VMHDR) | build
|
|
$(CC) $(TCFLAGS) -Isrc -o $@ src/main.c $(VMSRC)
|
|
|
|
wovm-asan: build/wovm_asan
|
|
|
|
# fixture generator for the CLI smoke test
|
|
build/mkwob: test/mkwob.c test/wob_build.c $(VMHDR) | build
|
|
$(CC) $(CFLAGS) -Isrc -Itest -o $@ test/mkwob.c test/wob_build.c
|
|
|
|
bench/bench: bench/bench.c
|
|
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
|
|
|
|
bench: bench/bench
|
|
|
|
run: wo-rt
|
|
./wo-rt
|
|
|
|
clean:
|
|
rm -f wo-rt bench/bench wovm
|
|
rm -rf build
|
|
|
|
.PHONY: bench run clean test test-iso wovm-asan
|