1
0
Fork 0
mirror of https://github.com/imjasonh/nescript synced 2026-07-09 17:28:00 +00:00

codereview: address four residual concerns from the hardware review

- Analyzer: new `W0108` warning when an array's byte size exceeds
  256. The codegen lowers `arr[i]` to `LDA base,X` and the 6502's
  X register is 8 bits, so elements past byte 255 are unreachable.
  The old debug bounds check silently skipped arrays in that range;
  it now clamps the compare to 255 and the analyzer diagnoses the
  declaration up front.

- UxROM `__bank_select`: the routine previously wrote the bank
  number to a fixed `$FFF0`, which works on emulators that don't
  simulate bus conflicts (jsnes, Mesen permissive) but is broken
  on real hardware because a single ROM byte can't match every
  possible bank number. Fixed by `TAX; STA __bank_select_table,X`
  — the store lands at `table + bank_num`, whose ROM byte is
  exactly `bank_num`, so CPU bus = A = ROM = no conflict. New
  `LabelAbsoluteX` addressing-mode variant in the assembler
  resolves the table's base address through the existing fixup
  pass. The two existing UxROM example ROMs shift a few bytes
  but their goldens still match (jsnes is bus-conflict-permissive).

- Source maps: new `source_map_survives_aggressive_peephole_folding`
  regression test. The reviewer was worried peephole could drop
  `__src_<N>` labels and silently leave stale source-map entries.
  Peephole actually treats labels as block boundaries and never
  deletes them — the test pins that down by compiling a program
  tailored to trip every peephole fold and asserting every
  codegen-recorded source marker survives into the final linker
  label table.

- Frame-overrun counter: new `debug_frame_overrun_counter_reads_back_from_user_code`
  end-to-end test that proves the contract works: NMI emits
  `INC $07FF`, user `peek(0x07FF)` lowers to `LDA $07FF`, and the
  RAM allocator doesn't hand out `$07FF` to a user variable.

https://claude.ai/code/session_01MaNVcDmK9gsspRkdxowQAM
This commit is contained in:
Claude 2026-04-14 12:38:49 +00:00
parent 9b54ff83c0
commit c5297567d2
No known key found for this signature in database
11 changed files with 354 additions and 20 deletions

View file

@ -1455,11 +1455,28 @@ pub fn gen_bank_select(mapper: Mapper) -> Vec<Instruction> {
out.push(Instruction::implied(RTS));
}
Mapper::UxROM => {
// UxROM: write bank number to any address in $8000-$FFFF.
// We use $FFF0 so the write lands in the fixed bank's
// tail area where the linker can back it with a matching
// bank-table byte to avoid bus conflicts.
out.push(Instruction::new(STA, AM::Absolute(0xFFF0)));
// UxROM: write the bank number to any address in
// $8000-$FFFF. On boards with bus conflicts the CPU's
// write and the ROM byte at that address are ANDed on
// the data bus, so we must write to an address whose
// ROM byte already equals the bank number. The linker
// splices a 256-byte table (`__bank_select_table`,
// bytes 0..255) into the fixed bank, and we index into
// it with X = bank number: `STA __bank_select_table, X`
// stores A (= bank number) at
// `__bank_select_table + X`, whose ROM byte is exactly
// X, so bus = A = X = ROM — no conflict.
//
// Previously this wrote to a fixed `$FFF0`, which
// happens to work on emulators that don't simulate bus
// conflicts (jsnes, Mesen permissive) but would glitch
// on real hardware because a single ROM byte can't
// match every possible bank number.
out.push(Instruction::implied(TAX));
out.push(Instruction::new(
STA,
AM::LabelAbsoluteX("__bank_select_table".into()),
));
out.push(Instruction::implied(RTS));
}
Mapper::MMC3 => {

View file

@ -674,14 +674,32 @@ fn bank_select_mmc1_serializes_five_bits_to_e000() {
}
#[test]
fn bank_select_uxrom_writes_fff0() {
// UxROM bank-select writes A to $FFF0, which lives in the
// fixed bank's bus-conflict-safe table.
fn bank_select_uxrom_uses_bus_conflict_table() {
// UxROM bank-select has to write to a ROM address whose byte
// already equals the bank being selected. The routine does
// `TAX; STA __bank_select_table, X` so the store goes to
// `table + bank_num`, whose ROM byte is `bank_num` — making
// the bus write match the ROM byte regardless of which bank
// is being requested. We assert both pieces here so a
// regression back to the broken `STA $FFF0` form fails
// loudly.
let sel = gen_bank_select(Mapper::UxROM);
let has_write = sel
let has_tax = sel.iter().any(|i| i.opcode == TAX && i.mode == AM::Implied);
assert!(has_tax, "UxROM bank-select must TAX before the store");
let has_indexed_store = sel.iter().any(|i| {
i.opcode == STA && matches!(&i.mode, AM::LabelAbsoluteX(n) if n == "__bank_select_table")
});
assert!(
has_indexed_store,
"UxROM bank-select must `STA __bank_select_table,X`"
);
let writes_fff0 = sel
.iter()
.any(|i| i.opcode == STA && i.mode == AM::Absolute(0xFFF0));
assert!(has_write, "UxROM bank-select must write to $FFF0");
assert!(
!writes_fff0,
"UxROM bank-select must not fall back to the bus-conflict-unsafe STA $FFF0 form"
);
assert_eq!(sel.last().unwrap().opcode, RTS);
}
@ -723,7 +741,15 @@ fn bank_select_stashes_bank_number_in_zp() {
#[test]
fn bank_select_assembles_for_every_mapper() {
for m in [Mapper::NROM, Mapper::MMC1, Mapper::UxROM, Mapper::MMC3] {
let sel = gen_bank_select(m);
let mut sel = gen_bank_select(m);
// UxROM `gen_bank_select` references `__bank_select_table`
// via `AM::LabelAbsoluteX`; give the assembler something
// to resolve against in this standalone unit test. Real
// linking appends the table in the linker pass, so the
// label always resolves there.
if m == Mapper::UxROM {
sel.extend(super::gen_uxrom_bank_table());
}
let result = asm::assemble(&sel, 0xC000);
assert!(
!result.bytes.is_empty(),