- Apply symbols.inc hardware register names to Defender 2 (U) (51 operands)
- Apply symbols.inc hardware register names to Donkey Kong 3 (JUE) (36 operands)
- Add APU register symbols (-) to Defender 2 (U) and Donkey Kong 3 (JUE) symbols.inc
- Apply symbols to Donkey Kong Jr. Math (U) (80 operands: 11 single + 69 hardware)
- Apply symbols to Excitebike (JU) (786 operands: 785 single + 1 hardware)
- Add promotion criteria to PROMPTS.md: symbol/local substitution,
ROM-specific semantic naming, and verification checklist
Add branch/jump target naming requirement to PROMPTS.md
All branches and jumps must target symbolic labels with descriptive names
derived from program flow role (e.g., _Loop, _Next, _Done, _Store, _Return),
never raw address literals. Adds criterion 8 to verification checklist.
Rename all OVERVIEW.md to README.md; add root README content to top-level
- Rename all OVERVIEW.md files to README.md throughout the repo (47 files)
- Prepend README.md content to top-level OVERVIEW.md before rename
- Fix apply_symbols.py NAME_RE regex to handle spaced assignments
- Apply symbols.inc to Defender 2 (U) (51 hardware operands)
- Apply symbols.inc to Donkey Kong 3 (JUE) (36 hardware operands)
- Apply symbols.inc to Donkey Kong Jr. Math (U) (80 operands: 11 single + 69 hardware)
- Apply symbols.inc to Excitebike (JU) (786 operands: 785 single + 1 hardware)
- Add missing Zp18/FrameCounter aliases to Excitebike prg.s
- Build all 27 top-level projects: byte-identical
Promote Donkey Kong Jr. Math back to _wip tier
Moves code from `copilot` folder and verifies each builds after
Add pre-commit hook for byte-identical verification
Add .git/hooks/pre-commit that runs 'make' then 'make clean' in each
project directory before committing. This ensures every project builds
byte-identical before any commit is accepted.
Also includes all file moves from the Donkey Kong Jr. Math (U) demotion
and other file restructuring from the session.
moves code out of copilot folder, its all AI generated.
Moves NROM games into NROM folder
removes copilot folder from Lunar Pool
Adds makefile to build all projects recursively
Updates docs to reflect changes in layout
Repromotes Donkey Kong Jr Math
Repromotes Excitebike
Promotes Popeye (JU) (PRG 1)
Updates Makefile to provide summary of build failure/success
Promote Raid on Bungeling Bay (U): Pass 2/3 partial, whole-ROM byte-identical
Move _wip/NROM/Raid on Bungeling Bay (U) to NROM/ and switch the build
from a PRG-only compare to a whole-ROM one:
- header.s/chr.s added (one-line .incbin of header.bin / chr.bin)
- linker.cfg gains HEADER ($0000, $0010) and CHR ($0000, $2000)
areas ahead of PRG ($C000, $4000)
- rom.nes symlink to the space-containing original ROM name
- Makefile builds header.o/prg.o/chr.o into reconstructed.nes and
compares it against rom.nes ('Byte-identical ROM verified.')
- one leftover neutral indirect operand jmp (Zp01) at $E2EC becomes
jmp (IndDispatch01); apply_symbols.py reports 0 substitutions pending
README.md / TODO.md / AGENTS.md updated: 29 promoted, 7 in _wip/.
Pac-Man (U): Pass 2 complete (label renaming) + Pass 3 partial (ZP aliases, table names)
Pass 2 — fresh map derived from the committed split, not from any drafted
map (the drafted maps in other projects were audited and found not
applicable):
- all 194 address-derived Label_XXXX definitions renamed to semantic
routine-entry names plus <Routine>_<Role>_<addr> internal branch
targets; zero Label_ remains
- all 49 jsr/jmp call sites resolved from raw $XXXX to labels; zero
raw $XXXX call operands remain
- routinemap.tsv / derived_names.tsv record the derivation
Pass 3 (partial):
- 15 proven semantic zero-page aliases added to locals.inc
(GameState, NmiFlag, ScrollX/Y, PpuCtrlShadow, OamDmaPage,
CocktailModeFlag, ActivePlayerFlag, GameplaySuspended, FrameCounter,
StateTimer, Player1/2Input, ActiveInput, CopyrightVerified)
- 112 operands substituted into prg.s (11 single + 101 hardware)
- key data tables named: ProgrammerSig ($C0EB), GameStateDispatchTable
($C253), TitleScreenData ($C2FD), EntityPtrTable ($D912),
AudioCommandTable ($EFDD)
Also corrects the README's claim that the RESET vector points at padding:
$FF00 holds real boot code (sei/cld, PPU off, double vblank wait, then
jmp ColdStart at $C042).
.gitignore: ignore reconstructed_prg.bin (build artifact of the _wip
Makefiles; '**/reconstructed.*' does not match the underscore form).
Promote Pac-Man (U): Pass 2/3 complete, whole-ROM byte-identical
Move _wip/NROM/Pac-Man (U) to NROM/ and switch the build from a PRG-only
compare to a whole-ROM one:
- header.s/chr.s added (one-line .incbin of header.bin / chr.bin)
- linker.cfg gains HEADER ($0000, $0010) and CHR ($0000, $2000)
areas ahead of PRG ($C000, $4000)
- rom.nes symlink to 'Pac-Man (U) [!].nes' (the original ROM name
contains a space and brackets)
- Makefile builds header.o/prg.o/chr.o into reconstructed.nes and
compares it against rom.nes
- reconstructed.nes is 24,592 bytes, MD5 a69d310f8cae9397fbd39f204672b5c7
- equal to the original ROM; the header/prg/chr splits were checked
against the original before promotion and are byte-exact
Pass 3 residue closed. The last 7 multi-alias zero-page operands are
resolved per site through a new sites.tsv, each proven from context
rather than guessed:
- jmp ($0010) at $C250/$D3CA/$D90F/$D9B6 -> (DispatchPtrLo); each
is immediately preceded by sta DispatchPtrLo/sta DispatchPtrHi
- jmp ($00FE) at $EFDA -> (AudioHandlerPtrLo); preceded by
sta AudioHandlerPtrLo/sta AudioHandlerPtrHi
- sta a:$0000,y at $C048/$C089 -> a:Zp00,y; the literal zero-page
base in the two ZP clear loops, so the neutral name is used rather
than the semantic WorkPtrLo. The 'a:' prefix survives the
substitution, so the bytes stay 99 00 00 (sta abs,Y)
apply_symbols.py now reports 119 operands substituted (101 hardware,
11 single-name, 7 site) and 0 residue.
New tool _tools/align_audit_comments.py: re-aligns the audit comment to
column 35 after a substitution lengthens an operand (nesdis.py pads each
instruction to 31 characters). Whitespace-only, so the byte identity
cannot change. 405 lines re-aligned in this project; all 2,387 audit
comments still match prg.bin at the stated PRG offset, 0 mismatches.
Docs: root README.md / TODO.md / AGENTS.md updated - 30 promoted, 6 in
_wip/; a per-project detail entry for Pac-Man (U) added; the stale
'Donkey Kong 3 (JUE) has no README.md' claim corrected (it has a
318-line one).
Promote Raid on Bungeling Bay (U) [a2]: Pass 3 complete, whole-ROM byte-identical
Move _wip/NROM/Raid on Bungeling Bay (U) [a2] to NROM/ and switch the build
from a PRG-only compare to a whole-ROM one:
- header.s/chr.s added (one-line .incbin of header.bin / chr.bin)
- linker.cfg gains HEADER ($0000, $0010) and CHR ($0000, $2000)
areas ahead of PRG ($C000, $4000)
- rom.nes symlink to 'Raid on Bungeling Bay (U) [a2].nes' (the original
ROM name contains spaces and brackets)
- reconstructed.nes is 24,592 bytes, MD5 659d340a1e9d420eee28df13319b0094
- equal to the original ROM; the header/prg/chr splits were checked
against the original before promotion and are byte-exact
Pass 3 - 15 semantic zero-page aliases, each applied only at the sites
where its role is proven:
- PpuCtrlShadow ($C2), 15 sites: the reset entry primes it right after
'sta PPUCTRL', and every other use is an ora/and/eor followed by
'sta PPUCTRL'
- NmiPathSelector ($C4), 5 sites: written 1 at $C3E9 and 0 at $C962
- GameState ($D6), 6 sites: 'cmp #$02' and used as an index at $C4C7
- FrameSubCounter ($55), 6 sites: set to $0A at $C520, decremented per
NMI at $C07B
- PrngPeriodCounter ($EA) / PrngSeedB ($EB) / PrngState ($EC), 13 sites:
the PRNG state
- PtrLo ($00) / PtrHi ($01), 8 sites: the 16-bit pair $1C13 and $1610
compared at $E785/$E791
- IndDispatch01 ($01) / IndDispatch02 ($02), 3 sites: the computed
dispatch at $E2EC
- IndDispatch1B ($1B) / IndDispatch1C ($1C), 6 sites: the dispatch at
$E7A3
- IndDispatch17 ($17) / IndDispatch19 ($19): the dispatches at $E79D
and $E7A0
Addresses that carry two names keep the neutral ZpXX name where the other
role applies - $01 is PtrHi at the 16-bit compare and IndDispatch01 at the
dispatch; $17 is IndDispatch17 at the dispatch and Zp17 for the absolute
RAM $0017 store in the copy loop at $E895/$E8D0.
New tool _tools/apply_zp_aliases.py does the per-site substitution:
apply_symbols.py only rewrites *numeric* operands, so it cannot rename an
operand that is already written as a neutral ZpXX name. The tool keeps the
ca65 'a:' prefix (dropping it would turn 'sta a:Zp17,y' into a zero-page
store and change the bytes) and rewrites only the operand token, so the
audit comment survives byte for byte.
Naming correction in the promoted sibling. Finishing this dump showed that
$EA was misnamed 'VBlankWaitCounter': the routine at $C412 is the game's
pseudo-random generator (the classic eor/asl/php/lsr/plp/rol scrambler,
called from thirteen gameplay sites, twice in a row at $CDF4/$CDF9 with the
second result masked #$07), so $EA is the scrambler's phase counter.
Renamed PrngPeriodCounter in both dumps and named $EB/$EC PrngSeedB /
PrngState. The sibling's two 'sta a:IndDispatch17,y' operands were also
wrong - they are absolute stores to RAM $0017, not the dispatch pointer -
and are now 'a:Zp17,y', matching the file's 'a:' = absolute convention.
Audit-comment alignment re-done with _tools/align_audit_comments.py (1,040
lines here, 1,080 in the sibling). Both files still match prg.bin at every
stated PRG offset: 5,467 and 5,483 audit comments, 0 mismatches.
Docs: root README.md / TODO.md / AGENTS.md updated - 31 promoted, 5 in
_wip/; per-project detail entries added for both Raid dumps.
Promote Pac-Man (Tengen) (U): Pass 2/3 from scratch, whole-ROM byte-identical
Move _wip/NROM/Pac-Man (Tengen) (U) to NROM/ and switch the build from a
PRG-only compare to a whole-ROM one:
- header.s/chr.s added (one-line .incbin of header.bin / chr.bin)
- linker.cfg gains HEADER ($0000, $0010) and CHR ($0000, $2000)
areas ahead of PRG ($C000, $4000)
- rom.nes symlink to 'Pac-Man (Tengen) (U) [!].nes'
- reconstructed.nes is 24,592 bytes, MD5 d34e7a74d8d2c231b6cc601210e28ad0
- equal to the original ROM; the header/prg/chr splits were checked
against the original before promotion and are byte-exact
Disassembled from scratch. No name, map or file was carried over from the
sibling 'Pac-Man (U)' dump; the map was derived from this dump's own
committed split and the two were only compared afterwards.
Pass 2 (new tool _tools/apply_pass2_map.py):
- all 194 Label_XXXX definitions renamed to semantic routine entries plus
<Routine>_<Role> branch targets; zero Label_ remains
- all 48 raw $XXXX jsr/jmp operands resolved to labels; zero raw $XXXX
call or branch operands remain
- the map is in routinemap.tsv
Pass 3:
- 30 semantic zero-page aliases, each applied only at the sites where its
role is proven (per-site choice in sites.tsv; the addresses that carry
two roles keep the neutral ZpXX name elsewhere). _tools/
derive_zp_aliases.py records how the set was derived, and locals.inc
records the reason for every remaining neutral slot
- 28 data tables named (new tool _tools/name_data_region.py), including
CharacterDataTable ($C66A) and CharacterNameStrings ($C67E), where the
ROM itself names Blinky, Pinky, Inky and Clyde - which is why the four
indexed entities are called ghosts and not 'actors'
- apply_symbols.py reports 0 substitutions pending and 0 residue
- audit-comment alignment re-done with _tools/align_audit_comments.py;
all 2,479 audit comments still match prg.bin at the stated PRG offset
Pass 1 correction - six command handlers recovered (new tool
_tools/recode_region.py). ScriptCommandTable ($EFDD) is read by the traced
instruction at $EFCC, and six of its entries point at $F00A, $F022, $F03A,
$F052, $F062 and $F072 - all of which the tracer had left as data, and two
of which it had mis-split across the 'jmp $EF61' at $F01F and $F04F.
Those 120 bytes are code here, decoded straight from the ROM; the six
handlers tile $F00A-$F081 exactly. The same gap exists in the promoted
'Pac-Man (U)' dump, which has not been corrected - recorded in both READMEs.
Residue (documented, not guessed): the unreached main game logic at
$C45A-$C55F is still .byte data. It is code - the tracer's own decoder
walks it cleanly and the dispatch table at $C511 points into it - but
nothing reaches it, so it cannot be entered without a guess. The same gap
exists in the promoted 'Pac-Man (U)' dump. Re-deriving it is a Pass 1 job;
a Mesen Code Data Logger capture is the tool the repo uses for it.
Docs: root README.md / TODO.md / AGENTS.md updated - 32 promoted, 4 in
_wip/; a per-project detail entry added for the Tengen dump.
Promote Pyramid (U): Pass 1 corrected, Pass 2/3 complete, whole-ROM byte-identical
Move _wip/NROM/Pyramid (U) to NROM/ and switch the build from a PRG-only
compare to a whole-ROM one:
- header.s/chr.s added (one-line .incbin of header.bin / chr.bin)
- linker.cfg gains HEADER ($0000, $0010) and CHR ($0000, $2000)
areas ahead of PRG ($C000, $4000)
- rom.nes symlink to 'Pyramid (U) (Sachen).nes'
- reconstructed.nes is 24,592 bytes, MD5 aa285ff17f25dd05da5996b7466c59e2
- equal to the original ROM; the header/prg/chr splits were checked
against the original before promotion and are byte-exact
Pass 1 correction - the committed split was a strict subset of the correct
one. This game dispatches through 'jmp' trampoline tables that live
*inside* the data regions, and the tracer cannot follow a jmp there, so
828 bytes of code were still marked as data. Four such tables were found
($C01E 3 entries, $C02A 6, $C042 2, $C054 5) plus ten more entries at
$C000-$C01B; all sixteen targets decode as valid instructions. Seeding
them, the $C800 boot mainline and six further code starts recovers the
whole lot, plus a five-byte stub at $DF89 (lda $33 / jmp $DECB) that sat
in a hole between two routines. The re-trace loses NO committed code byte
and takes the split from 34.5% to 39.6% (3,130 instructions / 6,493 code
bytes). 'make regen' reproduces it, so the split stays verifiable.
Pass 2 - a fresh map derived from this dump's own committed split:
- 428 Label_XXXX definitions renamed; zero Label_ residue
- 320 raw $XXXX jsr/jmp operands resolved; zero raw $XXXX branch
operands remain
- 431 routine entries and the 32 data blocks named from the code
- the internal branch-target names are derived mechanically from the
branch that reaches them by the new _tools/derive_branch_names.py
(beq -> OnZero, bne -> OnNonzero, bcc/bcs -> the carry cases, a
backwards branch -> Loop)
- recorded in routinemap.tsv
Pass 3:
- 24 semantic zero-page aliases, each applied only where its role is
proven; the 57 slots that stay neutral are each listed with the reason
in locals.inc (the neutral set lives in zp_aliases.inc so that
'make regen' can rebuild locals.inc from prg.bin)
- 32 data tables named - TaskVectorTable1/2, LevelScriptData,
MusicPeriodTable, SoundEnvelopeTable, the actor tables - recorded in
data_region_names.tsv
- apply_symbols.py reports 0 substitutions pending and 0 residue; no
hardware register is left as a raw literal
- the audit comments are now canonical on every line, data included
(the old file carried only 'PRG:$xxxx' on its 1,358 data lines);
all 3,762 audit comments match prg.bin at their stated PRG offset
Kept as-is, not 'cleaned up':
- sta $4100 stays a raw operand. The iNES header claims mapper 0 but
the boot code writes past the NES register space; the ROM does not
explain it, so it is recorded rather than guessed
- the 'A'/'V' check on RAM $0120/$0121 and its seed/clear routines
are named for what they do, not for what they are for
- the ninth entry of the $C3A6 task vector table ($D820) is a junk
slot and stays data
Docs: root README.md / TODO.md / AGENTS.md updated - 33 promoted, 3 in
_wip/; a per-project detail entry added.
Hogan's Alley (JU): Pass 1 correction, Pass 2, Pass 3, promoted to NROM/
The light-gun game whose engine dispatches through *inline* tables:
`IndirectCall` at $C34D pops the return address of the `jsr` that called
it and reads a 16-bit handler pointer from the word that follows, so all
six handler tables ($C124 19 entries, $C219 4, $C89C 14, $CDD1 1, $D234 2,
$D3D6 14) live inside the code stream and the static tracer cannot follow
them.
Pass 1 correction. The committed split was a strict subset of the correct
one -- 41.8% of the PRG was classified as code. A fresh Mesen Code Data
Logger capture was merged with the four captures already in the folder
(hogans_merged.cdl, the OR of five per-byte flag arrays, 6,544 code bytes)
and _tools/cdl_reclass.py rewrote the split to match what the CPU actually
fetched: 1,216 bytes moved from data to code, five the other way, 59 labels
emitted. The split is now 49.1% code (3,950 instructions, 8,041 bytes).
The four branch targets the reclassifier could not prove were turned into
labels by the new _tools/resolve_raw_branches.py.
Pass 2. 206 routine entries hand-named from this dump's own code and 413
internal branch targets derived mechanically by _tools/derive_branch_names.py:
630 Label_XXXX definitions gone, 484 raw $XXXX call operands resolved, 15
call targets the tracer had never labelled given a label. Recorded in
routinemap.tsv. No SubC<addr> residue was needed -- every entry the engine
reaches is named after what it does.
Pass 3. 60 semantic zero-page aliases, each applied only where its role is
proven (zp_aliases.inc, zp_alias_sites.tsv); the slots that stay neutral are
each listed with the reason. All 34 data blocks named
(data_region_names.tsv). apply_symbols.py reports 1 residue: `sta a:$00B4,y`
at $C203, the same address as Zp40/ActorPalette but forced to absolute
addressing, so it must stay numeric.
Promotion. header.s, chr.s and a HEADER/PRG/CHR linker.cfg added, rom.nes
symlinked to the original ROM; the whole-ROM cmp passes on the first
promoted build. There is deliberately no `make regen` target: the Pass 1
split here is the static trace corrected by a CDL capture, and the base the
correction was applied to is not what the current _tools/nesdis.py
produces, so prg.s is the maintained source of truth.
Tools changed:
nesdis.py --split/--note/--provenance options, so a data
region can carry its own name and explanation;
a forced-data address is no longer reported as a
recovered routine entry
apply_pass2_map.py can create the label for a call target the tracer
left unlabelled; no longer double-labels it
apply_zp_aliases.py --at-file, an address-based per-site list
derive_branch_names.py keeps the map's own header instead of writing a
fixed one
resolve_raw_branches.py new: turns `bXX *+$NN` operands into labels
build_hogans_map.py new: the hand-written Pass 2 map builder
The existing regen pipelines (MUSCLE (U), Urban Champion (JU)) still
reproduce prg.s byte for byte.
Apply the symbols.inc register names at Pass 1; fix a dropped byte in cdl_reclass
nesdis.py now names the hardware registers as it renders the operands, so a
project's Pass 1 output already reads `lda PPUSTATUS` instead of `lda $2002`
and the Pass 3 apply_symbols.py step has nothing left to do for them.
* nesdis.py --symbols FILE reads a symbols.inc-style file and substitutes
the register names. Only unambiguous entries in the $2000-$4017 window
are used: $4017 is both JOY2 and APUFRAMECOUNTER, so it stays numeric
and apply_symbols.py reports it as multi-alias residue, exactly as
before. The default is the symbols.inc next to --out, so a new project
gets the names without asking; --no-symbols opts out.
* The renderer records the operand's numeric value on the Insn, because
operand_value() used to re-parse the operand text and could no longer
read a name.
* The controller bit masks in symbols.inc (PAD_A and friends) are
constants, not addresses, and are still never substituted.
MUSCLE (U) and Urban Champion (JU) keep --no-symbols: their committed
prg.s was produced with the registers named by the Pass 3 apply_symbols.py
step, and the columns in those files reflect the in-place substitution.
Adding the missing apply_symbols.py step to both regen pipelines makes
them reproduce their committed prg.s byte for byte again - neither did
before this change (MUSCLE was 440 lines out, Urban Champion 772).
cdl_reclass.py had a bug that cost a byte: a region whose last source row
straddled the region's end was replaced by a regeneration of the region
only, so the tail of that row was dropped. Mario Bros (JU) hit it at
$C595, where the rebuild came out one byte short and every label after it
shifted. A region now covers the whole rows it replaces.
pass2.py reflow takes an optional column argument; the default is
unchanged (the ';' lands on the same column as before).
Mario Bros (JU): Pass 1 correction, Pass 2, Pass 3, promoted to NROM/
A two-player platformer whose handler tables are *inline*: the pointers sit
in the middle of the code stream, right after the `jsr` that reads them, so
the static tracer could never follow them.
Pass 1 correction. The committed split was a strict subset of the correct
one -- only 72.0% of the PRG was classified as code. A Mesen Code Data
Logger capture of this ROM (mario_mesen.cdl, 10,915 code bytes) showed
1,010 bytes the tracer had left as data were code; two branch targets the
capture never reached ($E4CB and $E639) were forced with --override for 57
more, so 1,067 bytes moved from data to code and 22 moved the other way.
The split is now 78.4% code (6,210 instructions, 12,847 bytes). The three
branch targets the reclassifier could not prove were turned into labels by
_resolve_raw_branches.py, which now refuses to put a label on a `.byte` row.
Pass 2. 206 routine entries and 519 internal branch targets: 931
Label_XXXX definitions gone, 51 raw $XXXX call operands resolved and 12 call
targets the tracer had never labelled given a label. Zero SubC residue --
the 185 entries a previous session had left as address-derived residue were
all named from this dump's own code. Recorded in routinemap.tsv.
Pass 3. 25 semantic zero-page aliases, each applied only where its role is
proven (zp_aliases.inc); the slots that stay neutral are each listed with the
reason. 35 data tables named -- GameStateHandlerTable, EnemyBehaviourTable,
EnemyScriptTable, EnemyTypePointerTable, SoundRoutineTable,
NoteFrequencyTable and the rest -- and recorded in
data_region_names.tsv. apply_symbols.py reports 0 residue.
Promotion. header.s, chr.s and a HEADER/PRG/CHR linker.cfg added, rom.nes
symlinked to the original ROM; the whole-ROM cmp passes on the first
promoted build. There is deliberately no `make regen` target: the Pass 1
split here is the static trace corrected by a CDL capture, and the base the
correction was applied to is not what the current _tools/nesdis.py
produces, so prg.s is the maintained source of truth.
Tools:
apply_pass2_map.py renames a label of any spelling -- SubC<addr> is
the honest residue form -- and its references
follow it; one combined pattern, so a 16,000-line
file does not need a substitution per label
resolve_raw_branches.py refuses to label a data row
build_mario_map.py new: the hand-written Pass 2 map builder
Remove the old _wip/NROM/Mario Bros (JU) folder (promoted to NROM/)
Mario Bros (JU): add the promoted-tier header, CHR, rom.nes symlink and zero-page aliases
Moves _ROMS/<ROM> into _wip/<MAPPER>/<ROM>
Sync the docs and the skeleton tool with the 857-project _wip tier
The _wip/ tier now holds 857 projects across 30 mapper folders, all
building byte-identical for the whole ROM. README.md, TODO.md and
AGENTS.md still described the old 39-project tier, so bring them in line
with WIP.md, which carries the tier's index.
The tier is no longer 39 projects of NROM-256 with a 16/32 KB PRG:
only two projects have a 16 KB PRG, 151 have 32 KB, 523 have 128 KB and
one has 1.5 MB, so most of it is a banked mapper whose image does not fit
the 6502's address space. Those projects link their MEMORY areas at .nes
file offsets rather than CPU addresses, which is the only option and the
honest model; the 39 older projects keep the CPU-address layout because
their PRG really is one contiguous window.
make_skeleton.py gains the two layouts (--layout flat|cpu), the board
name for the mapper, and a fix for find_rom() mistaking the build
output reconstructed.nes for the source ROM.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
511 lines
23 KiB
Python
511 lines
23 KiB
Python
#!/usr/bin/env python3
|
|
"""Reclassify a NES disassembly's code/data split using a Mesen Code Data Logger file.
|
|
|
|
Why this exists
|
|
---------------
|
|
A static trace cannot see code reached through computed dispatch, and it cannot tell
|
|
inline string data from an instruction that happens to decode from the same bytes. Both
|
|
failure modes are common (see TODO.md "Gotchas that will bite you"), and both leave the
|
|
`.byte`/instruction split wrong even though the rebuild is still byte-identical.
|
|
|
|
Mesen's Code Data Logger is the oracle: it marks every PRG byte the CPU *fetched as an
|
|
opcode* (bit 0 = Code) and every byte it *read as data* (bit 1 = Data), plus bit 2
|
|
JumpTarget and bit 3 SubEntryPoint. This tool rewrites prg.s so its split matches the CDL
|
|
wherever the CDL has an opinion, and leaves bytes the CDL never observed exactly as they
|
|
were. Only the *representation* changes (instructions <-> .byte/.word); every ROM byte is
|
|
preserved, so `make` must still print BYTE-IDENTICAL afterwards -- run it.
|
|
|
|
Capture a CDL from the Mesen MCP:
|
|
mesen_cdl_file(action='save', memoryType='NesPrgRom', filepath='game.cdl')
|
|
|
|
You can also drive the routines the CDL never reached by setting the PC in the debugger --
|
|
but note that a routine that returns through a popped address (a `jsr` + `pla`/`rts`
|
|
dispatcher, very common) will run away when entered that way, marking garbage as Code.
|
|
Check the newly-marked ranges before trusting such a run; treat a PC-forced capture as
|
|
unverified and discard it if the CPU ends up somewhere nonsensical.
|
|
|
|
Inputs and defaults
|
|
-------------------
|
|
--dir DIR project directory (default: cwd)
|
|
--cdl FILE the CDL file (required)
|
|
--prg FILE PRG image, default <dir>/prg.bin (byte-identity oracle, read only)
|
|
--src FILE assembly, default <dir>/prg.s (or main.s where used)
|
|
--locals FILE zero-page alias file, default <dir>/locals.inc; optional
|
|
--base 0xC000 CPU address the PRG is mapped at
|
|
--label-template 'Label_{addr:04X}'
|
|
name given to a *new* label the tool has to define. Labels already
|
|
defined in the source keep their exact spelling, whatever it is
|
|
(`SubCxxxx`, semantic names, ...).
|
|
--override LO-HI:C|D
|
|
force a range's classification. Use for structure the CDL is silent
|
|
about but that is provable another way; record the justification in
|
|
the project's OVERVIEW.md. Repeatable.
|
|
--apply write the result; without it the tool only reports
|
|
|
|
What it needs from the source format
|
|
------------------------------------
|
|
* per-emission audit comments `; CPU:$AAAA PRG:AAAA BB BB ...` (the addressing key)
|
|
* data emitted as `.byte` / `.word` (`.incbin` blocks are left untouched, since they
|
|
carry no per-byte provenance)
|
|
* the data-block header `; ---- data $AAAA-$BBBB (N bytes) ----` -- if absent, block
|
|
expansion is quietly skipped
|
|
* optionally the routine header `; Routine: <label>` followed by the label, so a new
|
|
label can be emitted with the file's own header template
|
|
|
|
Safety
|
|
------
|
|
Refuses to write if it finds a label it must define but cannot place on an instruction
|
|
boundary, or a code path that would branch to an address it cannot resolve. Branch
|
|
targets it cannot label are emitted as explicit PC-relative offsets (`beq *+$05`), the
|
|
convention already used elsewhere in this repo, because ca65 cannot resolve a bare
|
|
absolute address in a relocatable segment.
|
|
"""
|
|
|
|
import argparse
|
|
import re
|
|
import sys
|
|
|
|
# ------------------------------------------------------------------ opcode table
|
|
# 151 official + 105 undocumented. Third element is True for undocumented ones
|
|
# (ca65 V2.19 cannot encode those, so they are emitted as .byte with the disassembly
|
|
# in the audit comment -- keeping them inside the code region).
|
|
T = {}
|
|
|
|
|
|
def _op(op, mn, mode, undoc=False):
|
|
T[op] = (mn, mode, undoc)
|
|
|
|
|
|
for op, mn, mode in [
|
|
(0x00, 'brk', 'imp'), (0x01, 'ora', 'indx'), (0x05, 'ora', 'zp'), (0x06, 'asl', 'zp'), (0x08, 'php', 'imp'),
|
|
(0x09, 'ora', 'imm'), (0x0A, 'asl', 'acc'), (0x0D, 'ora', 'abs'), (0x0E, 'asl', 'abs'), (0x10, 'bpl', 'rel'),
|
|
(0x11, 'ora', 'indy'), (0x15, 'ora', 'zpx'), (0x16, 'asl', 'zpx'), (0x18, 'clc', 'imp'), (0x19, 'ora', 'absy'),
|
|
(0x1D, 'ora', 'absx'), (0x1E, 'asl', 'absx'), (0x20, 'jsr', 'abs'), (0x21, 'and', 'indx'), (0x24, 'bit', 'zp'),
|
|
(0x25, 'and', 'zp'), (0x26, 'rol', 'zp'), (0x28, 'plp', 'imp'), (0x29, 'and', 'imm'), (0x2A, 'rol', 'acc'),
|
|
(0x2C, 'bit', 'abs'), (0x2D, 'and', 'abs'), (0x2E, 'rol', 'abs'), (0x30, 'bmi', 'rel'), (0x31, 'and', 'indy'),
|
|
(0x35, 'and', 'zpx'), (0x36, 'rol', 'zpx'), (0x38, 'sec', 'imp'), (0x39, 'and', 'absy'), (0x3D, 'and', 'absx'),
|
|
(0x3E, 'rol', 'absx'), (0x40, 'rti', 'imp'), (0x41, 'eor', 'indx'), (0x45, 'eor', 'zp'), (0x46, 'lsr', 'zp'),
|
|
(0x48, 'pha', 'imp'), (0x49, 'eor', 'imm'), (0x4A, 'lsr', 'acc'), (0x4C, 'jmp', 'abs'), (0x4D, 'eor', 'abs'),
|
|
(0x4E, 'lsr', 'abs'), (0x50, 'bvc', 'rel'), (0x51, 'eor', 'indy'), (0x55, 'eor', 'zpx'), (0x56, 'lsr', 'zpx'),
|
|
(0x58, 'cli', 'imp'), (0x59, 'eor', 'absy'), (0x5D, 'eor', 'absx'), (0x5E, 'lsr', 'absx'), (0x60, 'rts', 'imp'),
|
|
(0x61, 'adc', 'indx'), (0x65, 'adc', 'zp'), (0x66, 'ror', 'zp'), (0x68, 'pla', 'imp'), (0x69, 'adc', 'imm'),
|
|
(0x6A, 'ror', 'acc'), (0x6C, 'jmp', 'ind'), (0x6D, 'adc', 'abs'), (0x6E, 'ror', 'abs'), (0x70, 'bvs', 'rel'),
|
|
(0x71, 'adc', 'indy'), (0x75, 'adc', 'zpx'), (0x76, 'ror', 'zpx'), (0x78, 'sei', 'imp'), (0x79, 'adc', 'absy'),
|
|
(0x7D, 'adc', 'absx'), (0x7E, 'ror', 'absx'), (0x81, 'sta', 'indx'), (0x84, 'sty', 'zp'), (0x85, 'sta', 'zp'),
|
|
(0x86, 'stx', 'zp'), (0x88, 'dey', 'imp'), (0x8A, 'txa', 'imp'), (0x8C, 'sty', 'abs'), (0x8D, 'sta', 'abs'),
|
|
(0x8E, 'stx', 'abs'), (0x90, 'bcc', 'rel'), (0x91, 'sta', 'indy'), (0x94, 'sty', 'zpx'), (0x95, 'sta', 'zpx'),
|
|
(0x96, 'stx', 'zpy'), (0x98, 'tya', 'imp'), (0x99, 'sta', 'absy'), (0x9A, 'txs', 'imp'), (0x9D, 'sta', 'absx'),
|
|
(0xA0, 'ldy', 'imm'), (0xA1, 'lda', 'indx'), (0xA2, 'ldx', 'imm'), (0xA4, 'ldy', 'zp'), (0xA5, 'lda', 'zp'),
|
|
(0xA6, 'ldx', 'zp'), (0xA8, 'tay', 'imp'), (0xA9, 'lda', 'imm'), (0xAA, 'tax', 'imp'), (0xAC, 'ldy', 'abs'),
|
|
(0xAD, 'lda', 'abs'), (0xAE, 'ldx', 'abs'), (0xB0, 'bcs', 'rel'), (0xB1, 'lda', 'indy'), (0xB4, 'ldy', 'zpx'),
|
|
(0xB5, 'lda', 'zpx'), (0xB6, 'ldx', 'zpy'), (0xB8, 'clv', 'imp'), (0xB9, 'lda', 'absy'), (0xBA, 'tsx', 'imp'),
|
|
(0xBC, 'ldy', 'absx'), (0xBD, 'lda', 'absx'), (0xBE, 'ldx', 'absy'), (0xC0, 'cpy', 'imm'), (0xC1, 'cmp', 'indx'),
|
|
(0xC4, 'cpy', 'zp'), (0xC5, 'cmp', 'zp'), (0xC6, 'dec', 'zp'), (0xC8, 'iny', 'imp'), (0xC9, 'cmp', 'imm'),
|
|
(0xCA, 'dex', 'imp'), (0xCC, 'cpy', 'abs'), (0xCD, 'cmp', 'abs'), (0xCE, 'dec', 'abs'), (0xD0, 'bne', 'rel'),
|
|
(0xD1, 'cmp', 'indy'), (0xD5, 'cmp', 'zpx'), (0xD6, 'dec', 'zpx'), (0xD8, 'cld', 'imp'), (0xD9, 'cmp', 'absy'),
|
|
(0xDD, 'cmp', 'absx'), (0xDE, 'dec', 'absx'), (0xE0, 'cpx', 'imm'), (0xE1, 'sbc', 'indx'), (0xE4, 'cpx', 'zp'),
|
|
(0xE5, 'sbc', 'zp'), (0xE6, 'inc', 'zp'), (0xE8, 'inx', 'imp'), (0xE9, 'sbc', 'imm'), (0xEA, 'nop', 'imp'),
|
|
(0xEC, 'cpx', 'abs'), (0xED, 'sbc', 'abs'), (0xEE, 'inc', 'abs'), (0xF0, 'beq', 'rel'), (0xF1, 'sbc', 'indy'),
|
|
(0xF5, 'sbc', 'zpx'), (0xF6, 'inc', 'zpx'), (0xF8, 'sed', 'imp'), (0xF9, 'sbc', 'absy'), (0xFD, 'sbc', 'absx'),
|
|
(0xFE, 'inc', 'absx')]:
|
|
_op(op, mn, mode)
|
|
for op, mn, mode in [
|
|
(0x03, 'slo', 'indx'), (0x07, 'slo', 'zp'), (0x0B, 'anc', 'imm'), (0x0C, 'nop', 'abs'), (0x0F, 'slo', 'abs'),
|
|
(0x13, 'slo', 'indy'), (0x17, 'slo', 'zpx'), (0x1A, 'nop', 'imp'), (0x1B, 'slo', 'absy'), (0x1C, 'nop', 'absx'),
|
|
(0x1F, 'slo', 'absx'), (0x23, 'rla', 'indx'), (0x27, 'rla', 'zp'), (0x2B, 'anc', 'imm'), (0x2F, 'rla', 'abs'),
|
|
(0x33, 'rla', 'indy'), (0x37, 'rla', 'zpx'), (0x3A, 'nop', 'imp'), (0x3B, 'rla', 'absy'), (0x3C, 'nop', 'absx'),
|
|
(0x3F, 'rla', 'absx'), (0x43, 'sre', 'indx'), (0x47, 'sre', 'zp'), (0x4B, 'alr', 'imm'), (0x4F, 'sre', 'abs'),
|
|
(0x53, 'sre', 'indy'), (0x57, 'sre', 'zpx'), (0x5A, 'nop', 'imp'), (0x5B, 'sre', 'absy'), (0x5C, 'nop', 'absx'),
|
|
(0x5F, 'sre', 'absx'), (0x63, 'rra', 'indx'), (0x67, 'rra', 'zp'), (0x6B, 'arr', 'imm'), (0x6F, 'rra', 'abs'),
|
|
(0x73, 'rra', 'indy'), (0x77, 'rra', 'zpx'), (0x7A, 'nop', 'imp'), (0x7B, 'rra', 'absy'), (0x7C, 'nop', 'absx'),
|
|
(0x7F, 'rra', 'absx'), (0x80, 'nop', 'imm'), (0x82, 'nop', 'imm'), (0x83, 'sax', 'indx'), (0x87, 'sax', 'zp'),
|
|
(0x89, 'nop', 'imm'), (0x8B, 'xaa', 'imm'), (0x8F, 'sax', 'abs'), (0x93, 'ahx', 'indy'), (0x97, 'sax', 'zpy'),
|
|
(0x9B, 'tas', 'absy'), (0x9C, 'shy', 'absx'), (0x9E, 'shx', 'absy'), (0x9F, 'ahx', 'absy'), (0xA3, 'lax', 'indx'),
|
|
(0xA7, 'lax', 'zp'), (0xAB, 'lax', 'imm'), (0xAF, 'lax', 'abs'), (0xB3, 'lax', 'indy'), (0xB7, 'lax', 'zpy'),
|
|
(0xBB, 'las', 'absy'), (0xBF, 'lax', 'absy'), (0xC2, 'nop', 'imm'), (0xC3, 'dcp', 'indx'), (0xC7, 'dcp', 'zp'),
|
|
(0xCB, 'axs', 'imm'), (0xCF, 'dcp', 'abs'), (0xD3, 'dcp', 'indy'), (0xD7, 'dcp', 'zpx'), (0xDA, 'nop', 'imp'),
|
|
(0xDB, 'dcp', 'absy'), (0xDC, 'nop', 'absx'), (0xDF, 'dcp', 'absx'), (0xE2, 'nop', 'imm'), (0xE3, 'isc', 'indx'),
|
|
(0xE7, 'isc', 'zp'), (0xEB, 'sbc', 'imm'), (0xEF, 'isc', 'abs'), (0xF3, 'isc', 'indy'), (0xF7, 'isc', 'zpx'),
|
|
(0xFA, 'nop', 'imp'), (0xFB, 'isc', 'absy'), (0xFC, 'nop', 'absx'), (0xFF, 'isc', 'absx')]:
|
|
_op(op, mn, mode, True)
|
|
for op in (0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72, 0x92, 0xB2, 0xD2, 0xF2):
|
|
_op(op, 'nop', 'imm', True)
|
|
for op in (0x04, 0x44, 0x64):
|
|
_op(op, 'nop', 'zp', True)
|
|
for op in (0x14, 0x34, 0x54, 0x74, 0xD4, 0xF4):
|
|
_op(op, 'nop', 'zpx', True)
|
|
|
|
assert len(T) == 256 and sum(1 for v in T.values() if not v[2]) == 151
|
|
|
|
SIZE = {'imp': 1, 'acc': 1, 'imm': 2, 'zp': 2, 'zpx': 2, 'zpy': 2, 'abs': 3, 'absx': 3,
|
|
'absy': 3, 'ind': 3, 'indx': 2, 'indy': 2, 'rel': 2}
|
|
|
|
EMIT = re.compile(r'; CPU:\$([0-9A-F]{4}) PRG:([0-9A-F]{4}) ((?:[0-9A-F]{2} ?)+)')
|
|
|
|
|
|
def main():
|
|
ap = argparse.ArgumentParser(description=__doc__,
|
|
formatter_class=argparse.RawDescriptionHelpFormatter)
|
|
ap.add_argument('--dir', default='.')
|
|
ap.add_argument('--cdl', required=True)
|
|
ap.add_argument('--prg')
|
|
ap.add_argument('--src')
|
|
ap.add_argument('--locals')
|
|
ap.add_argument('--base', default='0xC000')
|
|
ap.add_argument('--label-template', default='Label_{addr:04X}')
|
|
ap.add_argument('--override', action='append', default=[],
|
|
help='LO-HI:C|D, e.g. 0xC0C0-0xC0E5:D')
|
|
ap.add_argument('--apply', action='store_true')
|
|
a = ap.parse_args()
|
|
|
|
d = a.dir.rstrip('/')
|
|
BASE = int(a.base, 0)
|
|
prg_path = a.prg or f'{d}/prg.bin'
|
|
src_path = a.src or f'{d}/prg.s'
|
|
loc_path = a.locals or f'{d}/locals.inc'
|
|
|
|
PRG = open(prg_path, 'rb').read()
|
|
N = len(PRG)
|
|
lo_ok = BASE <= 0x10000 - N
|
|
if not lo_ok:
|
|
sys.exit(f'{prg_path}: {N} bytes does not fit at ${BASE:04X}')
|
|
|
|
# ---- zero-page names (optional) ----
|
|
ZP = {}
|
|
try:
|
|
for ln in open(loc_path):
|
|
m = re.match(r'^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*\$([0-9A-Fa-f]{2})\b', ln)
|
|
if not m:
|
|
continue
|
|
name, val = m.group(1), int(m.group(2), 16)
|
|
if val not in ZP or (re.match(r'^Zp[0-9A-F]{2}$', ZP[val]) and
|
|
not re.match(r'^Zp[0-9A-F]{2}$', name)):
|
|
ZP[val] = name
|
|
except FileNotFoundError:
|
|
pass
|
|
|
|
def zpn(v):
|
|
return ZP.get(v, '$%02X' % v)
|
|
|
|
# ---- parse the source ----
|
|
LINES = open(src_path).read().split('\n')
|
|
SRC_ALL = '\n'.join(LINES)
|
|
units = []
|
|
for i, ln in enumerate(LINES):
|
|
m = EMIT.search(ln)
|
|
if not m:
|
|
continue
|
|
off = int(m.group(2), 16)
|
|
n = len(re.findall(r'[0-9A-F]{2}', m.group(3)))
|
|
kind = 'D' if ln.lstrip().startswith(('.byte', '.word', '.incbin')) else 'C'
|
|
units.append((i, off, n, kind))
|
|
cur = [None] * N
|
|
unit_of = [None] * N
|
|
for i, off, n, kind in units:
|
|
for k in range(n):
|
|
if off + k < N:
|
|
cur[off + k] = kind
|
|
unit_of[off + k] = (i, off, n)
|
|
|
|
# label definitions: `Name:` on the line(s) immediately above an emission.
|
|
# Consecutive labels are aliases of the same address, so they all map to it.
|
|
unit_line = {u[0]: u[1] for u in units}
|
|
label_at = {}
|
|
pending = []
|
|
for i, ln in enumerate(LINES):
|
|
s = ln.strip()
|
|
if re.match(r'^[A-Za-z_][A-Za-z0-9_]*:$', s):
|
|
pending.append(s[:-1])
|
|
continue
|
|
if s and not s.startswith(';'):
|
|
if pending and i in unit_line:
|
|
off = unit_line[i]
|
|
for name in pending:
|
|
label_at.setdefault(off, name)
|
|
pending = []
|
|
defined = set(re.findall(r'^([A-Za-z_][A-Za-z0-9_]*):', SRC_ALL, re.M))
|
|
assert set(label_at.values()) <= defined, 'label mapping disagrees with the file'
|
|
|
|
def is_ref(nm):
|
|
"""True if nm appears in operand position on an instruction line."""
|
|
return bool(re.search(r'^\s+\w[^\n]*\b' + re.escape(nm) + r'\b', SRC_ALL, re.M))
|
|
|
|
def name_at(off):
|
|
return label_at.get(off) or a.label_template.format(addr=BASE + off)
|
|
|
|
blocks = []
|
|
for ln in LINES:
|
|
m = re.match(r'^; ---- data \$([0-9A-F]{4})-\$([0-9A-F]{4}) ', ln)
|
|
if m:
|
|
blocks.append((int(m.group(1), 16) - BASE, int(m.group(2), 16) - BASE))
|
|
|
|
# ---- CDL -> target classification ----
|
|
raw = open(a.cdl, 'rb').read()
|
|
if raw[:5] == b'CDLv2':
|
|
# "CDLv2" + 4 header bytes, then one flags byte per PRG byte
|
|
body = raw[9:9 + N]
|
|
else:
|
|
body = raw[-N:]
|
|
if len(body) < N:
|
|
sys.exit(f'{a.cdl}: expected at least {N} CDL bytes, got {len(body)}')
|
|
tgt = [('C' if (body[i] & 1) else ('D' if (body[i] & 2) else cur[i])) for i in range(N)]
|
|
|
|
conflicts = []
|
|
for spec in a.override:
|
|
m = re.match(r'^\$?([0-9A-Fa-fx]+)-\$?([0-9A-Fa-fx]+):([CD])$', spec)
|
|
if not m:
|
|
sys.exit(f'--override {spec!r}: expected LO-HI:C|D')
|
|
lo, hi, k = int(m.group(1), 0) - BASE, int(m.group(2), 0) - BASE, m.group(3)
|
|
for i in range(max(lo, 0), min(hi, N - 1) + 1):
|
|
if not (body[i] & 3) or tgt[i] == k:
|
|
tgt[i] = k
|
|
else:
|
|
conflicts.append(f'${BASE+i:04X}: CDL says {tgt[i]}, override says {k} (override wins)')
|
|
tgt[i] = k # override always wins when explicitly specified
|
|
|
|
# ---- region derivation ----
|
|
def merge(iv):
|
|
out = []
|
|
for r in sorted(iv):
|
|
if out and r[0] <= out[-1][1] + 1:
|
|
out[-1][1] = max(out[-1][1], r[1])
|
|
else:
|
|
out.append([r[0], r[1]])
|
|
return out
|
|
|
|
def walk(s, e):
|
|
"""Decode [s,e]; return (branch targets, overrun end or None)."""
|
|
p, labels = s, set()
|
|
while p <= e:
|
|
if tgt[p] == 'C':
|
|
n = SIZE[T[PRG[p]][1]]
|
|
if p + n - 1 > e:
|
|
return labels, p + n - 1
|
|
if T[PRG[p]][1] == 'rel':
|
|
dd = PRG[p + 1]
|
|
dd = dd - 256 if dd > 127 else dd
|
|
labels.add(BASE + ((p + 2 + dd) % N))
|
|
p += n
|
|
else:
|
|
p += 1
|
|
return labels, None
|
|
|
|
affected = [i for i in range(N) if cur[i] and cur[i] != tgt[i]]
|
|
iv = []
|
|
for o in affected:
|
|
if iv and o <= iv[-1][1] + 1:
|
|
iv[-1][1] = o
|
|
else:
|
|
iv.append([o, o])
|
|
for r in iv: # to whole emission units
|
|
_, o0, n0 = unit_of[r[0]]
|
|
_, o1, n1 = unit_of[r[1]]
|
|
r[0], r[1] = o0, o1 + n1 - 1
|
|
iv = merge(iv)
|
|
_iv = [] # across small gaps, so stray
|
|
for r in iv: # mis-decode comments get cleaned
|
|
if _iv and r[0] - _iv[-1][1] <= 5:
|
|
_iv[-1][1] = r[1]
|
|
else:
|
|
_iv.append(r)
|
|
iv = _iv
|
|
for r in iv: # to whole data blocks
|
|
for bs, be in blocks:
|
|
if r[0] <= be and r[1] >= bs:
|
|
r[0] = min(r[0], bs)
|
|
r[1] = max(r[1], be)
|
|
regions = merge(iv)
|
|
for _ in range(8): # fix decodes that overrun a region
|
|
ext = []
|
|
for s, e in regions:
|
|
_, over = walk(s, e)
|
|
e2 = over if over is not None else e
|
|
# The splice below replaces whole source rows, so a region has to
|
|
# cover the rows it replaces. Without this the tail of a row that
|
|
# straddles the region's end is dropped and the rebuild loses a
|
|
# byte.
|
|
u0 = unit_of[s]
|
|
u1 = unit_of[e2]
|
|
if u0:
|
|
s = min(s, u0[1])
|
|
if u1:
|
|
e2 = max(e2, u1[1] + u1[2] - 1)
|
|
ext.append([s, e2])
|
|
m = merge(ext)
|
|
if m == regions:
|
|
break
|
|
regions = m
|
|
|
|
# ---- which labels must be (re)defined ----
|
|
must_branch, must_ref, nice = set(), set(), set()
|
|
for s, e in regions:
|
|
must_branch |= walk(s, e)[0]
|
|
for s, e in regions:
|
|
for t in range(s, e + 1):
|
|
if t in label_at:
|
|
nice.add(BASE + t)
|
|
if is_ref(label_at[t]):
|
|
must_ref.add(BASE + t)
|
|
|
|
region_of = [None] * N
|
|
for idx, (s, e) in enumerate(regions):
|
|
for t in range(s, e + 1):
|
|
region_of[t] = idx
|
|
starts = set()
|
|
for s, e in regions:
|
|
p = s
|
|
while p <= e:
|
|
starts.add(BASE + p)
|
|
p += SIZE[T[PRG[p]][1]] if tgt[p] == 'C' else 1
|
|
|
|
need = {c: name_at(c - BASE) for c in (must_branch | must_ref | nice)
|
|
if 0 <= c - BASE < N and region_of[c - BASE] is not None
|
|
and tgt[c - BASE] == 'C' and c in starts}
|
|
|
|
problems, warnings = [], []
|
|
for c in sorted(must_ref):
|
|
if c not in need:
|
|
problems.append(f'${c:04X} is referenced by surviving code but cannot be labelled')
|
|
for c in sorted(must_branch):
|
|
if c not in need and (c - BASE) not in label_at:
|
|
warnings.append(f'branch target ${c:04X} is not an instruction boundary; '
|
|
f'emitted as a raw relative offset')
|
|
dropped = sorted(label_at[t] for s, e in regions for t in range(s, e + 1)
|
|
if t in label_at and BASE + t not in need)
|
|
|
|
# ---- generation ----
|
|
TEMPLATE = None
|
|
for i, ln in enumerate(LINES):
|
|
m = re.match(r'^; Routine: (\S+)$', ln)
|
|
if m and i + 8 < len(LINES) and LINES[i + 8] == m.group(1) + ':':
|
|
TEMPLATE = LINES[i - 1:i + 9]
|
|
break
|
|
|
|
def hdr(name):
|
|
if not TEMPLATE:
|
|
return [name + ':']
|
|
b = list(TEMPLATE)
|
|
b[1] = '; Routine: ' + name
|
|
b[-1] = name + ':'
|
|
return b
|
|
|
|
unresolved = []
|
|
|
|
def fmt(mn, mode, ob, p):
|
|
if mode == 'imp':
|
|
return mn
|
|
if mode == 'acc':
|
|
return mn + ' a'
|
|
if mode == 'imm':
|
|
return f'{mn} #${ob[0]:02X}'
|
|
if mode == 'zp':
|
|
return f'{mn} {zpn(ob[0])}'
|
|
if mode == 'zpx':
|
|
return f'{mn} {zpn(ob[0])},x'
|
|
if mode == 'zpy':
|
|
return f'{mn} {zpn(ob[0])},y'
|
|
if mode == 'abs':
|
|
return f'{mn} ${ob[0] | (ob[1] << 8):04X}'
|
|
if mode == 'absx':
|
|
return f'{mn} ${ob[0] | (ob[1] << 8):04X},x'
|
|
if mode == 'absy':
|
|
return f'{mn} ${ob[0] | (ob[1] << 8):04X},y'
|
|
if mode == 'ind':
|
|
return f'{mn} (${ob[0] | (ob[1] << 8):04X})'
|
|
if mode == 'indx':
|
|
return f'{mn} ({zpn(ob[0])},x)'
|
|
if mode == 'indy':
|
|
return f'{mn} ({zpn(ob[0])}),y'
|
|
if mode == 'rel':
|
|
dd = ob[0] - 256 if ob[0] > 127 else ob[0]
|
|
cpu = BASE + ((p + 2 + dd) % N)
|
|
if cpu in need or (cpu - BASE) in label_at:
|
|
return f'{mn} {need.get(cpu) or name_at(cpu - BASE)}'
|
|
unresolved.append(cpu)
|
|
k = cpu - (BASE + p)
|
|
return f'{mn} *{"+" if k >= 0 else "-"}${abs(k):02X}'
|
|
|
|
def gen(s, e):
|
|
out, p = [], s
|
|
while p <= e:
|
|
if tgt[p] == 'D':
|
|
q = p
|
|
while q <= e and tgt[q] == 'D':
|
|
q += 1
|
|
out.append(f"; ---- data ${BASE+p:04X}-${BASE+q-1:04X} ({q-p} bytes) ----")
|
|
for i in range(p, q, 16):
|
|
ch = PRG[i:min(q, i + 16)]
|
|
out.append(" .byte %s ; CPU:$%04X PRG:%04X %s"
|
|
% (', '.join('$%02X' % b for b in ch), BASE + i, i,
|
|
' '.join('%02X' % b for b in ch)))
|
|
p = q
|
|
else:
|
|
mn, mode, undoc = T[PRG[p]]
|
|
n = SIZE[mode]
|
|
cpu = BASE + p
|
|
if cpu in need:
|
|
out.extend(hdr(need[cpu]))
|
|
text = fmt(mn, mode, PRG[p + 1:p + n], p)
|
|
bstr = ' '.join('%02X' % b for b in PRG[p:p + n])
|
|
if undoc:
|
|
out.append(" .byte %s ; CPU:$%04X PRG:%04X %s -- %s "
|
|
"(undocumented; ca65 cannot encode)"
|
|
% (', '.join('$%02X' % b for b in PRG[p:p + n]),
|
|
cpu, p, bstr, text))
|
|
else:
|
|
out.append(f" {text:<31}; CPU:${cpu:04X} PRG:{p:04X} {bstr}")
|
|
p += n
|
|
return out
|
|
|
|
# ---- splice ----
|
|
new_lines, cursor, report = [], 0, []
|
|
for s, e in regions:
|
|
first = next(i for i, off, n, k in units if off <= s < off + n)
|
|
last = next(i for i, off, n, k in units if off <= e < off + n)
|
|
lo, hi = first, last
|
|
if re.match(r'^[A-Za-z_][A-Za-z0-9_]*:$', LINES[lo - 1]):
|
|
lo -= 1
|
|
while lo > 0 and LINES[lo - 1].startswith('; ') \
|
|
and not LINES[lo - 1].startswith('; ---- data'):
|
|
lo -= 1
|
|
elif LINES[lo - 1].startswith('; ---- data '):
|
|
lo -= 1
|
|
new_lines.extend(LINES[cursor:lo])
|
|
genl = gen(s, e)
|
|
new_lines.extend(genl)
|
|
cursor = hi + 1
|
|
report.append(f" ${BASE+s:04X}-${BASE+e:04X} {e-s+1:5d} B "
|
|
f"lines {lo+1}-{hi+1} -> {len(genl)}")
|
|
new_lines.extend(LINES[cursor:])
|
|
print(f"{src_path}: {N} bytes, {len(units)} emissions, {len(regions)} region(s)")
|
|
for r in report:
|
|
print(r)
|
|
print(f"data->code {sum(1 for i in range(N) if cur[i]=='D' and tgt[i]=='C')} "
|
|
f"code->data {sum(1 for i in range(N) if cur[i]=='C' and tgt[i]=='D')} "
|
|
f"labels emitted {len(need)} dropped {len(dropped)}")
|
|
if dropped:
|
|
print(" dropped:", ' '.join(dropped))
|
|
if unresolved:
|
|
print(" raw relative branches:", ' '.join(f'${c:04X}' for c in sorted(set(unresolved))))
|
|
for c in conflicts:
|
|
print(" CONFLICT " + c)
|
|
if problems:
|
|
print("PROBLEMS:")
|
|
for p in problems:
|
|
print(' ' + p)
|
|
for w in warnings:
|
|
print(" warning: " + w)
|
|
|
|
if not a.apply:
|
|
print("\ndry run: nothing written (pass --apply)")
|
|
return
|
|
if problems:
|
|
print("\nrefusing to apply while problems remain")
|
|
sys.exit(1)
|
|
open(src_path, 'w').write('\n'.join(new_lines) + ('' if new_lines and new_lines[-1] == '' else '\n'))
|
|
print(f"\nAPPLIED to {src_path} -- now rebuild and check for BYTE-IDENTICAL")
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|