mirror of
https://github.com/imjasonh/nescript
synced 2026-07-09 09:18:01 +00:00
Add jsnes emulator harness and fix four codegen bugs it surfaced
Running the compiled example ROMs through a headless puppeteer +
local jsnes harness exposed four latent bugs that the
header-structure-only integration tests couldn't catch:
- src/asm/mod.rs: the first pass treated ANY instruction with
`AddressingMode::Label` as a label definition, silently dropping
every `JMP`/`JSR` to a label. Now only `NOP + Label` is a label
def; other opcodes emit the opcode byte plus a 2-byte absolute
fixup resolved in pass two. Without this, every example crashed
with "invalid opcode at $1xxx" once the CPU fell through into
the math runtime and hit an unbalanced `RTS`.
- src/ir/lowering.rs (lower_handler): handler-local `VarDecl`s
(e.g. `var i: u8 = 0` inside a `while`) were pushed onto
`current_locals` but the handler built its own throwaway
`locals` list, so those var ids never got RAM addresses and
every `LoadVar`/`StoreVar` for them silently emitted nothing.
Seed `current_locals` with the state's declared locals and
reuse it so `lower_statement`'s appends flow through to the
`IrFunction`. Fixes the black screen in `arrays_and_functions`.
- src/ir/lowering.rs (global init): struct-literal initializers
on globals (`var player: Player = Player { x: 120, ... }`) fell
through to `eval_const`, which returned `None` for a
non-literal, so no init code was emitted. Now the per-field
synthetic globals each get their own `init_value`. Fixes the
black screen in `structs_enums_for`.
- src/codegen/mod.rs: the legacy AST codegen was emitting
`JSR __fn_poke` / treating `peek` as `LDA #0` for the hardware
intrinsics. It only "worked" before because the broken
assembler swallowed the bogus JSR. Handle `poke`/`peek` as
direct STA/LDA to a compile-time-constant absolute address,
matching the IR codegen's intrinsic path.
The harness lives in `tests/emulator/`: a tiny HTML page that
wraps the `jsnes` npm package, driven by a puppeteer script that
loads each ROM, runs ~180 frames, snapshots the canvas, and
records a smoke-test verdict (booted without a CPU crash, non-zero
pixels rendered, frames differ over time). `npm install && node
run_examples.mjs` from `tests/emulator/` runs the full sweep.
9/9 example ROMs now load, render, and animate where expected.
All 324 unit + 35 integration tests still pass.
https://claude.ai/code/session_014Z5y3Q9krLcAxYpZQJhZ5V
This commit is contained in:
parent
593a333eec
commit
81f3fd7de0
17 changed files with 1479 additions and 10 deletions
|
|
@ -80,8 +80,31 @@ impl Assembler {
|
|||
fn emit_instruction(&mut self, inst: &Instruction) {
|
||||
match &inst.mode {
|
||||
AddressingMode::Label(name) => {
|
||||
// This should be a label definition, not an instruction
|
||||
self.labels.insert(name.clone(), self.current_address());
|
||||
// A `NOP` with a `Label` mode is the label-definition
|
||||
// pseudo-instruction: it records the current address and
|
||||
// emits no bytes. Any other opcode paired with `Label` is
|
||||
// an actual jump-style instruction targeting that label
|
||||
// (e.g. `JMP __ir_main_loop`, `JSR __ir_fn_frame`), which
|
||||
// needs an opcode byte plus a 2-byte absolute-address
|
||||
// fixup resolved in the second pass.
|
||||
if inst.opcode == Opcode::NOP {
|
||||
self.labels.insert(name.clone(), self.current_address());
|
||||
} else if let Some(op) = opcodes::encode(inst.opcode, &AddressingMode::Absolute(0))
|
||||
{
|
||||
self.output.push(op);
|
||||
self.fixups.push(Fixup {
|
||||
offset: self.output.len(),
|
||||
label: name.clone(),
|
||||
kind: FixupKind::Absolute,
|
||||
});
|
||||
self.output.push(0); // placeholder low byte
|
||||
self.output.push(0); // placeholder high byte
|
||||
} else {
|
||||
panic!(
|
||||
"opcode {:?} cannot target a label (no absolute encoding)",
|
||||
inst.opcode
|
||||
);
|
||||
}
|
||||
}
|
||||
AddressingMode::LabelRelative(name) => {
|
||||
// Branch to label — emit opcode + placeholder
|
||||
|
|
|
|||
|
|
@ -362,6 +362,19 @@ impl CodeGen {
|
|||
}
|
||||
}
|
||||
Statement::Call(name, args, _) => {
|
||||
// Built-in `poke(addr, value)` writes `value` to the
|
||||
// compile-time-constant `addr`. The IR codegen handles
|
||||
// this intrinsic in ir/lowering.rs; the legacy AST
|
||||
// codegen has to recognize it here too, otherwise it
|
||||
// falls through to the generic JSR path and tries to
|
||||
// call a non-existent `__fn_poke` routine.
|
||||
if name == "poke" && args.len() == 2 {
|
||||
if let Some(addr) = const_u16(&args[0]) {
|
||||
self.gen_expr(&args[1]);
|
||||
self.emit(STA, AM::Absolute(addr));
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Pass arguments via zero-page param slots ($04-$07)
|
||||
for (i, arg) in args.iter().enumerate() {
|
||||
self.gen_expr(arg);
|
||||
|
|
@ -868,9 +881,20 @@ impl CodeGen {
|
|||
self.emit_load(addr);
|
||||
}
|
||||
}
|
||||
Expr::Call(_, _, _) => {
|
||||
// Function calls as expressions need JSR — handled elsewhere
|
||||
// For now, result is 0
|
||||
Expr::Call(name, args, _) => {
|
||||
// Built-in `peek(addr)` reads a byte from the
|
||||
// compile-time-constant `addr`. Matches the IR codegen's
|
||||
// `Peek` handling so the legacy AST path doesn't emit a
|
||||
// bogus JSR to a non-existent `__fn_peek` routine.
|
||||
if name == "peek" && args.len() == 1 {
|
||||
if let Some(addr) = const_u16(&args[0]) {
|
||||
self.emit(LDA, AM::Absolute(addr));
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Other function calls as expressions would need JSR
|
||||
// with a return-value slot; the legacy codegen doesn't
|
||||
// implement that yet, so fall back to loading 0.
|
||||
self.emit(LDA, AM::Immediate(0));
|
||||
}
|
||||
Expr::ArrayLiteral(_, _) => {
|
||||
|
|
@ -1122,3 +1146,14 @@ fn button_mask(button: &str) -> u8 {
|
|||
_ => 0x00,
|
||||
}
|
||||
}
|
||||
|
||||
/// Return the compile-time-constant u16 value of an expression, or
|
||||
/// `None` if it's not a plain integer literal. Used by the intrinsic
|
||||
/// call handling to recognize `poke(0x2007, …)` and `peek(0x2002)`
|
||||
/// at codegen time.
|
||||
fn const_u16(expr: &Expr) -> Option<u16> {
|
||||
match expr {
|
||||
Expr::IntLiteral(v, _) => Some(*v),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,6 +190,10 @@ impl LoweringContext {
|
|||
}
|
||||
|
||||
// Lower globals. Initializers can be any constant expression.
|
||||
// Struct-literal initializers are expanded into per-field
|
||||
// globals so each field gets its own `init_value`; the parent
|
||||
// struct itself is still registered (size=0) so any later IR
|
||||
// op referencing it by name still resolves.
|
||||
for var in &program.globals {
|
||||
let var_id = self.get_or_create_var(&var.name);
|
||||
let init = var.init.as_ref().and_then(|e| self.eval_const(e));
|
||||
|
|
@ -199,6 +203,19 @@ impl LoweringContext {
|
|||
size: type_size(&var.var_type),
|
||||
init_value: init,
|
||||
});
|
||||
if let Some(Expr::StructLiteral(_, fields, _)) = &var.init {
|
||||
for (fname, fexpr) in fields {
|
||||
let full = format!("{}.{fname}", var.name);
|
||||
let fvid = self.get_or_create_var(&full);
|
||||
let fval = self.eval_const(fexpr);
|
||||
self.globals.push(IrGlobal {
|
||||
var_id: fvid,
|
||||
name: full,
|
||||
size: 1,
|
||||
init_value: fval,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Lower user functions
|
||||
|
|
@ -278,12 +295,20 @@ impl LoweringContext {
|
|||
fn lower_handler(&mut self, name: &str, block: &Block, state: &StateDecl) {
|
||||
self.next_temp = 0;
|
||||
self.current_blocks = Vec::new();
|
||||
let mut locals = Vec::new();
|
||||
|
||||
// Register state-local variables
|
||||
// Seed `current_locals` with the state's declared locals so any
|
||||
// `VarDecl` inside the handler body — tracked by
|
||||
// `lower_statement` via `current_locals` — is appended alongside
|
||||
// them. Without this, handler-local variables (e.g. a `var i`
|
||||
// inside a `while`) would get orphaned: their `VarId` would be
|
||||
// created by `get_or_create_var`, but the `IrFunction`'s
|
||||
// `locals` list (which the IR codegen uses to allocate RAM
|
||||
// addresses) would never see them. The result would be a
|
||||
// silent `LoadVar`/`StoreVar` emit-nothing bug that leaves the
|
||||
// temp slots uninitialized at runtime.
|
||||
self.current_locals = Vec::new();
|
||||
for var in &state.locals {
|
||||
let var_id = self.get_or_create_var(&var.name);
|
||||
locals.push(IrLocal {
|
||||
self.current_locals.push(IrLocal {
|
||||
var_id,
|
||||
name: var.name.clone(),
|
||||
size: type_size(&var.var_type),
|
||||
|
|
@ -298,7 +323,7 @@ impl LoweringContext {
|
|||
self.functions.push(IrFunction {
|
||||
name: name.to_string(),
|
||||
blocks: std::mem::take(&mut self.current_blocks),
|
||||
locals,
|
||||
locals: std::mem::take(&mut self.current_locals),
|
||||
param_count: 0,
|
||||
has_return: false,
|
||||
source_span: state.span,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue