Decouple ForthVM from wasmtime via a Runtime trait so the same outer interpreter, compiler, and 200+ word definitions work on both native (wasmtime) and browser (js-sys WebAssembly API) backends. Runtime trait (runtime.rs): - HostAccess trait for memory/global ops inside host function closures - HostFn type: Box<dyn Fn(&mut dyn HostAccess) -> Result<()>> - Runtime trait: memory, globals, table, instantiate, call, register NativeRuntime (runtime_native.rs): - Wraps wasmtime Engine/Store/Memory/Table/Global/Func - CallerHostAccess bridges HostAccess to wasmtime Caller API - Feature-gated behind "native" (default) outer.rs refactor: - ForthVM<R: Runtime> — generic over execution backend - All 87 host functions converted from Func::new closures to HostFn - All memory access via rt.mem_read/write_*, global access via rt.get/set_* - Zero logic changes — pure API conversion wafer-core feature gates: - default = ["native"] includes wasmtime + all native modules - Without "native": pure Rust only (outer, codegen, optimizer, dictionary) Browser REPL (crates/web): - WebRuntime: js-sys WebAssembly.Memory/Table/Global/Module/Instance - WaferRepl: wasm-bindgen entry point (evaluate, data_stack, reset) - WebAssembly.Function with Safari fallback (wrapper module) - Frontend: dark terminal UI, word panel, init code editor, history - Build: wasm-pack build --target web All 452 tests pass (431 unit + 1 benchmark + 9 comparison + 11 compliance).
5.0 KiB
WAFER Project Conventions
What is WAFER?
WAFER (WebAssembly Forth Engine in Rust) is an optimizing Forth 2012 compiler targeting WebAssembly. Currently a working Forth system with 200+ words, JIT compilation, 12 word sets at 100% compliance, and a full optimization pipeline (peephole, constant folding, inlining, strength reduction, DCE, tail calls, stack-to-local promotion with loop/IF support, self-recursive direct calls, consolidation). Beats gforth on all benchmarks in release mode. Includes a browser-based REPL via wasm-pack.
Architecture
- Each Forth word compiles to its own WASM module via
wasm-encoder - Modules share memory, globals (dsp/rsp/fsp), and a function table via runtime imports
- IR-based compilation: Forth ->
Vec<IrOp>-> WASM codegen -> runtime instantiation - Dictionary: linked-list in a
Vec<u8>buffer simulating WASM linear memory - Primitives: either IR-based (compiled to WASM) or host functions (closures via
HostFn) - Runtime trait:
ForthVM<R: Runtime>is generic over the execution backendNativeRuntime(wasmtime) -- CLI, tests, AOT compilationWebRuntime(js-sys) -- browser REPL via wasm-pack
Crate Structure
crates/core-- compiler, optimizer, codegen, dictionary, runtime traits, outer interpretercrates/cli-- CLI REPL with rustyline,wafer build/wafer runcommandscrates/web-- browser REPL (wasm-bindgen entry point, WebRuntime, HTML/CSS/JS frontend)
Key Files
crates/core/src/outer.rs--ForthVM<R: Runtime>: outer interpreter, compiler, all primitivescrates/core/src/runtime.rs--Runtime+HostAccesstraits (execution backend abstraction)crates/core/src/runtime_native.rs--NativeRuntime: wasmtime implementation (behindnativefeature)crates/core/src/codegen.rs-- IR-to-WASM translation, module generationcrates/core/src/dictionary.rs-- Dictionary data structure with create/find/revealcrates/core/src/ir.rs-- IrOp enum (the intermediate representation)crates/core/src/memory.rs-- Memory layout constants (stack regions, dictionary base, etc.)crates/core/src/optimizer.rs-- IR optimization passes (peephole, fold, inline, DCE, etc.)crates/core/src/config.rs-- WaferConfig: unified optimization configurationcrates/core/src/consolidate.rs-- Consolidation recompiler (single-module direct calls)crates/core/boot.fth-- Bootstrap Forth definitions loaded at startupcrates/cli/src/main.rs-- CLI REPL with rustylinecrates/web/src/lib.rs--WaferReplwasm-bindgen entry pointcrates/web/src/runtime_web.rs--WebRuntime: browser WebAssembly API via js-syscrates/web/www/-- Frontend (index.html, style.css, app.js)
Feature Flags (wafer-core)
default = ["native"]-- includes wasmtime, NativeRuntime, runner, export, etc.native-- enablesdep:wasmtimeand all native-only modules- No features -- pure Rust only (dictionary, IR, optimizer, codegen, outer interpreter). Used by
wafer-web.
Adding a New Word
IR primitive (simple stack/arithmetic/logic -- preferred when possible):
self.register_primitive("WORD_NAME", false, vec![IrOp::Dup, IrOp::Mul])?;
Host function (needs Rust logic -- I/O, dictionary manipulation, complex stack access):
let shared_state = Arc::clone(&self.some_field);
let func: HostFn = Box::new(move |ctx: &mut dyn HostAccess| {
let sp = ctx.get_dsp();
let val = ctx.mem_read_i32(sp);
// ... logic using ctx for memory/global access ...
ctx.set_dsp(sp + CELL_SIZE);
Ok(())
});
self.register_host_primitive("WORD_NAME", false, func)?;
Special interpreter token (defining words like VARIABLE, CONSTANT, CREATE):
Handle in interpret_token_immediate() or compile_token() as a special case.
Code Style
cargo fmt --allandcargo clippy --workspacemust pass with no warnings- Every public function needs a doc comment
- Use
thiserrorfor error types in core crate,anyhowfor CLI - Prefer returning
Resultover panicking
Testing
- Run
cargo test --workspacebefore committing (currently 431 unit + 1 benchmark + 11 compliance + 9 comparison) - Forth 2012 compliance:
cargo test -p wafer-core --test compliance - Cross-engine comparison (vs gforth):
cargo test -p wafer-core --test comparison - Performance benchmarks (release mode):
cargo test -p wafer-core --test comparison -- --nocapture --ignored - Test helper in outer.rs:
eval_output("forth code")returns printed output as String - Test helper:
eval_stack("forth code")returns data stack as Vec
Web REPL
- Build:
cd crates/web && wasm-pack build --target web --out-dir www/pkg - Serve:
python3 -m http.server -d crates/web/www 8080 - Open:
http://localhost:8080/ - Dev build (faster, unoptimized):
wasm-pack build --target web --dev --out-dir www/pkg
Key Principles
- Correctness first, performance second
- Maximize Forth, minimize Rust (self-hosting goal -- not yet started)
- Test-driven: if it's not tested, it doesn't work
- Every word set at 100% compliance before moving to the next
- Never break existing tests