From 3f643b961cc54aa5b198c7edfc354ffec0b28a67 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Wed, 22 Jan 2025 16:05:24 +0100 Subject: Remove dependency on TOML MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When I introduced this dependency it looked like a good idea to have a better-looking replacement to cl65's cfg format. That being said, the end result wasn't *much* prettier either, and the end result could be even bigger and equally confusing. Since 5f48de69f46d ("Add support for cfg files") there is quite the framework in order to support regular cl65's cfg files. Hence, this commit takes another approach: let's tune this format to a more compressed and simplified one. This is now the current "nasm cfg" format, and it allowed us to re-use a lot of code while also being more to the point for NES/Famicom development than the original cfg format. With this new format, we can now remove the dependency on TOML and all of the inner dependencies which were quite a lot. Signed-off-by: Miquel Sabaté Solà --- lib/xixanta/src/mappings/empty.cfg | 4 +++ lib/xixanta/src/mappings/empty.toml | 12 ------- lib/xixanta/src/mappings/nrom.cfg | 6 ++++ lib/xixanta/src/mappings/nrom.toml | 27 -------------- lib/xixanta/src/mappings/nrom65.cfg | 6 ++++ lib/xixanta/src/mappings/nrom65.toml | 27 -------------- lib/xixanta/src/mappings/unrom.cfg | 12 +++++++ lib/xixanta/src/mappings/unrom.toml | 69 ------------------------------------ 8 files changed, 28 insertions(+), 135 deletions(-) create mode 100644 lib/xixanta/src/mappings/empty.cfg delete mode 100644 lib/xixanta/src/mappings/empty.toml create mode 100644 lib/xixanta/src/mappings/nrom.cfg delete mode 100644 lib/xixanta/src/mappings/nrom.toml create mode 100644 lib/xixanta/src/mappings/nrom65.cfg delete mode 100644 lib/xixanta/src/mappings/nrom65.toml create mode 100644 lib/xixanta/src/mappings/unrom.cfg delete mode 100644 lib/xixanta/src/mappings/unrom.toml (limited to 'lib/xixanta/src/mappings') diff --git a/lib/xixanta/src/mappings/empty.cfg b/lib/xixanta/src/mappings/empty.cfg new file mode 100644 index 0000000..985cf31 --- /dev/null +++ b/lib/xixanta/src/mappings/empty.cfg @@ -0,0 +1,4 @@ +#!nasmcfg + +HEADER: start = $0000, size = $0010, fillval = $00, segments = [HEADER]; +ROM0: start = $8000, size = $8000, segments = [CODE]; diff --git a/lib/xixanta/src/mappings/empty.toml b/lib/xixanta/src/mappings/empty.toml deleted file mode 100644 index ae6312c..0000000 --- a/lib/xixanta/src/mappings/empty.toml +++ /dev/null @@ -1,12 +0,0 @@ -[HEADER] -start = 0x0000 -size = 0x0010 -fill = 0x00 -section_type = "Header" -segments = ["HEADER"] - -[ROM0] -start = 0x8000 -size = 0x8000 -section_type = "PRGROM" -segments = ["CODE"] diff --git a/lib/xixanta/src/mappings/nrom.cfg b/lib/xixanta/src/mappings/nrom.cfg new file mode 100644 index 0000000..920318b --- /dev/null +++ b/lib/xixanta/src/mappings/nrom.cfg @@ -0,0 +1,6 @@ +#!nasmcfg + +HEADER: start = $0000, size = $0010, fillval = $00, segments = [HEADER]; +ROM0: start = $8000, size = $7FFA, fillval = $00, segments = [CODE]; +ROMV: start = $FFFA, size = $0006, fillval = $00, segments = [VECTORS]; +ROM2: start = $0000, size = $2000, fillval = $00, segments = [CHARS]; diff --git a/lib/xixanta/src/mappings/nrom.toml b/lib/xixanta/src/mappings/nrom.toml deleted file mode 100644 index 18711a6..0000000 --- a/lib/xixanta/src/mappings/nrom.toml +++ /dev/null @@ -1,27 +0,0 @@ -[HEADER] -start = 0x0000 -size = 0x0010 -fill = 0x00 -section_type = "Header" -segments = ["HEADER"] - -[ROM0] -start = 0x8000 -size = 0x7FFA -fill = 0x00 -section_type = "PRGROM" -segments = ["CODE"] - -[ROMV] -start = 0xFFFA -size = 0x0006 -fill = 0x00 -section_type = "PRGROM" -segments = ["VECTORS"] - -[ROM2] -start = 0x0000 -size = 0x2000 -fill = 0x00 -section_type = "CHRROM" -segments = ["CHARS"] diff --git a/lib/xixanta/src/mappings/nrom65.cfg b/lib/xixanta/src/mappings/nrom65.cfg new file mode 100644 index 0000000..6a90b2d --- /dev/null +++ b/lib/xixanta/src/mappings/nrom65.cfg @@ -0,0 +1,6 @@ +#!nasmcfg + +HEADER: start = $0000, size = $0010, fillval = $00, segments = [HEADER]; +ROM0: start = $8000, size = $7FFA, fillval = $00, segments = [STARTUP CODE]; +ROMV: start = $FFFA, size = $0006, fillval = $00, segments = [VECTORS]; +ROM2: start = $0000, size = $2000, fillval = $00, segments = [CHARS]; diff --git a/lib/xixanta/src/mappings/nrom65.toml b/lib/xixanta/src/mappings/nrom65.toml deleted file mode 100644 index d4775e4..0000000 --- a/lib/xixanta/src/mappings/nrom65.toml +++ /dev/null @@ -1,27 +0,0 @@ -[HEADER] -start = 0x0000 -size = 0x0010 -fill = 0x00 -section_type = "Header" -segments = ["HEADER"] - -[ROM0] -start = 0x8000 -size = 0x7FFA -fill = 0x00 -section_type = "PRGROM" -segments = ["STARTUP", "CODE"] - -[ROMV] -start = 0xFFFA -size = 0x0006 -fill = 0x00 -section_type = "PRGROM" -segments = ["VECTORS"] - -[ROM2] -start = 0x0000 -size = 0x2000 -fill = 0x00 -section_type = "CHRROM" -segments = ["CHARS"] diff --git a/lib/xixanta/src/mappings/unrom.cfg b/lib/xixanta/src/mappings/unrom.cfg new file mode 100644 index 0000000..91d0382 --- /dev/null +++ b/lib/xixanta/src/mappings/unrom.cfg @@ -0,0 +1,12 @@ +#!nasmcfg + +HEADER: start = $0000, size = $0010, fillval = $00, segments = [HEADER]; +PRG0: start = $8000, size = $4000, fillval = $F8, segments = [BANK0]; +PRG1: start = $8000, size = $4000, fillval = $F9, segments = [BANK1]; +PRG2: start = $8000, size = $4000, fillval = $FA, segments = [BANK2]; +PRG3: start = $8000, size = $4000, fillval = $FB, segments = [BANK3]; +PRG4: start = $8000, size = $4000, fillval = $FC, segments = [BANK4]; +PRG5: start = $8000, size = $4000, fillval = $FD, segments = [BANK5]; +PRG6: start = $8000, size = $4000, fillval = $FE, segments = [BANK6]; +PRG: start = $C000, size = $3FFA, fillval = $FF, segments = [FIXED]; +ROMV: start = $FFFA, size = $0006, fillval = $00, segments = [VECTORS]; diff --git a/lib/xixanta/src/mappings/unrom.toml b/lib/xixanta/src/mappings/unrom.toml deleted file mode 100644 index 070cfd1..0000000 --- a/lib/xixanta/src/mappings/unrom.toml +++ /dev/null @@ -1,69 +0,0 @@ -[HEADER] -start = 0x0000 -size = 0x0010 -fill = 0x00 -section_type = "Header" -segments = ["HEADER"] - -[PRG0] -start = 0x8000 -size = 0x4000 -fill = 0xF8 -section_type = "PRGROM" -segments = ["BANK0"] - -[PRG1] -start = 0x8000 -size = 0x4000 -fill = 0xF9 -section_type = "PRGROM" -segments = ["BANK1"] - -[PRG2] -start = 0x8000 -size = 0x4000 -fill = 0xFA -section_type = "PRGROM" -segments = ["BANK2"] - -[PRG3] -start = 0x8000 -size = 0x4000 -fill = 0xFB -section_type = "PRGROM" -segments = ["BANK3"] - -[PRG4] -start = 0x8000 -size = 0x4000 -fill = 0xFC -section_type = "PRGROM" -segments = ["BANK4"] - -[PRG5] -start = 0x8000 -size = 0x4000 -fill = 0xFD -section_type = "PRGROM" -segments = ["BANK5"] - -[PRG6] -start = 0x8000 -size = 0x4000 -fill = 0xFE -section_type = "PRGROM" -segments = ["BANK6"] - -[PRG] -start = 0xC000 -size = 0x3FFA -fill = 0xFF -section_type = "PRGROM" -segments = ["FIXED"] - -[ROMV] -start = 0xFFFA -size = 0x0006 -fill = 0x00 -section_type = "PRGROM" -segments = ["VECTORS"] -- cgit v1.2.3