gbdk-2020 | GameBoy Development Kit |
| download: https://git.y1.nz/archives/gbdk.tar.gz | |
| README | Files | Log | Refs | LICENSE |
commit 632f66f4ce8949bcbc6da6c363960d9ec916300b parent 5963e5ae19085d11827389d84a8eac391169acb2 Author: bbbbbr <bbbbbr@users.noreply.github.com> Date: Sun, 15 Dec 2024 01:35:40 -0800 romusage: upgrade from 1.3.0 to 1.3.1 (#733) # Version 1.3.1 - Experimental support for GBDK's flavor of NES (`-p:NES1"`) .noi/.map files Diffstat:
| M | gbdk-support/romusage/src/bank_templates.c | 57 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- |
| M | gbdk-support/romusage/src/common.h | 3 | ++- |
| M | gbdk-support/romusage/src/map_file.c | 10 | +++++++--- |
| M | gbdk-support/romusage/src/noi_file.c | 9 | ++++----- |
| M | gbdk-support/romusage/src/romusage.c | 8 | +++++--- |
5 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/gbdk-support/romusage/src/bank_templates.c b/gbdk-support/romusage/src/bank_templates.c @@ -1,6 +1,6 @@ // This is free and unencumbered software released into the public domain. // For more information, please refer to <https://unlicense.org> -// bbbbbr 2020 +// bbbbbr 2024 #include <stdio.h> #include <stdlib.h> @@ -58,7 +58,7 @@ const bank_item WRAM_nonbanked = {"WRAM", 0xC000, 0xDFFF, BANKED_YES, 0xDFFF, const bank_item HRAM = {"HRAM", 0xFF80, 0xFFFE, BANKED_NO, 0xFFFE, 0,0,0, BANK_MEM_TYPE_HRAM, BANK_STARTNUM_0, BANK_MERGED_NO, HIDDEN_NO}; -// ===== Game Gear ===== +// ===== Game Gear / SMS (GBDK specific) ===== // https://www.smspower.org/Development/MemoryMap @@ -66,17 +66,58 @@ const bank_item HRAM = {"HRAM", 0xFF80, 0xFFFE, BANKED_NO, 0xFFFE, // _LIT_<N> is at base address 0x8000 (assets) // _DATA_N is also at base address 0x8000 (RAM) +// ROM const bank_item smsgg_ROM_0 = {"ROM_0", 0x0000, 0x3FFF, BANKED_NO, 0x7FFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_0, BANK_MERGED_NO, HIDDEN_NO}; const bank_item smsgg_ROM_X_banked = {"ROM_", 0x4000, 0x7FFF, BANKED_YES, 0x7FFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_1, BANK_MERGED_NO, HIDDEN_NO}; // Merged version const bank_item smsgg_ROM_nonbanked = {"ROM", 0x0000, 0x7FFF, BANKED_YES, 0x7FFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_0, BANK_MERGED_YES, HIDDEN_NO}; +// ROM Data const bank_item smsgg_LIT_X_banked = {"LIT_", 0x8000, 0xBFFF, BANKED_YES, 0xBFFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_1, BANK_MERGED_NO, HIDDEN_NO}; + +// RAM // Data can also be in the 0x8000 region.. requires some special handling in banks_check() const bank_item smsgg_DATA_X_banked = {"DATA_", 0x8000, 0xBFFF, BANKED_YES, 0xBFFF, 0,0,0, BANK_MEM_TYPE_SRAM, BANK_STARTNUM_1, BANK_MERGED_NO, HIDDEN_NO}; const bank_item smsgg_RAM_nonbanked = {"RAM", 0xC000, 0xDFFF, BANKED_YES, 0xDFFF, 0,0,0, BANK_MEM_TYPE_WRAM, BANK_STARTNUM_0, BANK_MERGED_YES, HIDDEN_NO}; +// ===== NES (GBDK specific) ===== + +// https://en.wikibooks.org/wiki/NES_Programming/Memory_Map +// https://www.nesdev.org/wiki/CPU_memory_map +// +// Michel: +// - One fixed 16kB bank at 0xC000 - 0xFFFF +// - Sometimes uses segment _HOME, sometimes _CODE +// - _XINIT I believe (to initialize data segment) +// - Switchable bank at 0x8000-0xBFFF +// - Will use segments named _CODE_n, where n is a bank number +// - _DATA / _BSS usually start at 0x300, and go up to 0x7FF +// - _ZP uses (part of) 0x00-0FF +// - Overlay segments OSEG / GBDKOVR also use part of 0x00-0xFF, for parameter passing +// - 0x100-0x1FF is stack, which you can probably ignore for your purposes +// - 0x200-02FF is currently hardcoded as OAM page +// +// zero_page_ram: 0x0000 - 0x00FF +// ram: 0x0100 - 0x07FF +// rom_x_banked: 0x8000 - 0xBFFF +// rom_0: 0xC000 - 0xFFFF + +// Name Start End Is Banked? Oflow End (statsx3) Bank Type Base Bank Num Merged version Hidden +// RAM +const bank_item nes1_RAM_ZP = {"ZPAGE", 0x0000, 0x00FF, BANKED_NO, 0x00FF, 0,0,0, BANK_MEM_TYPE_HRAM, BANK_STARTNUM_0, BANK_MERGED_NO, HIDDEN_NO}; +const bank_item nes1_RAM = {"RAM", 0x0100, 0x07FF, BANKED_NO, 0x07FF, 0,0,0, BANK_MEM_TYPE_WRAM, BANK_STARTNUM_0, BANK_MERGED_NO, HIDDEN_NO}; + +// SRAM +const bank_item nes1_SRAM = {"SRAM", 0x6000, 0x7FFF, BANKED_NO, 0x7FFF, 0,0,0, BANK_MEM_TYPE_SRAM, BANK_STARTNUM_0, BANK_MERGED_NO, HIDDEN_NO}; + +// ROM +const bank_item nes1_ROM_X_banked = {"ROM_", 0x8000, 0xBFFF, BANKED_YES, 0xFFFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_1, BANK_MERGED_NO, HIDDEN_NO}; +const bank_item nes1_ROM_0 = {"ROM_0", 0xC000, 0xFFFF, BANKED_NO, 0xFFFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_0, BANK_MERGED_NO, HIDDEN_NO}; +// Merged version +const bank_item nes1_ROM_nonbanked = {"ROM", 0x8000, 0xFFFF, BANKED_YES, 0xFFFF, 0,0,0, BANK_MEM_TYPE_ROM, BANK_STARTNUM_0, BANK_MERGED_YES, HIDDEN_NO}; + + static int bank_template_add(int idx, bank_item * p_bank_templates, const bank_item * p_bank) { if (idx >= BANK_TEMPLATES_MAX) { @@ -109,6 +150,18 @@ int bank_templates_load(bank_item * p_bank_templates) { idx = bank_template_add(idx, p_bank_templates, &smsgg_RAM_nonbanked); } + else if (get_option_platform() == OPT_PLAT_NES_GBDK_1) { + if (option_merged_banks & OPT_MERGED_BANKS_ROM) { + idx = bank_template_add(idx, p_bank_templates, &nes1_ROM_nonbanked); + } else { + idx = bank_template_add(idx, p_bank_templates, &nes1_ROM_X_banked); + idx = bank_template_add(idx, p_bank_templates, &nes1_ROM_0); + } + idx = bank_template_add(idx, p_bank_templates, &nes1_RAM_ZP); + idx = bank_template_add(idx, p_bank_templates, &nes1_RAM); + idx = bank_template_add(idx, p_bank_templates, &nes1_SRAM); + + } else { // implied: if (get_option_platform() == OPT_PLAT_GAMEBOY) { if (option_merged_banks & OPT_MERGED_BANKS_ROM) { diff --git a/gbdk-support/romusage/src/common.h b/gbdk-support/romusage/src/common.h @@ -36,7 +36,8 @@ #define OPT_MERGED_BANKS_ROM 2u #define OPT_PLAT_GAMEBOY 0u -#define OPT_PLAT_SMS_GG_GBDK 1u // GBDK specific layout of sms/gg +#define OPT_PLAT_SMS_GG_GBDK 1u // GBDK specific layout for SMS/GG +#define OPT_PLAT_NES_GBDK_1 2u // GBDK specific layout for NES #define BANKS_HIDE_SZ 30 // How many hide substrings to support #define BANKS_HIDE_MAX (BANKS_HIDE_SZ - 1) diff --git a/gbdk-support/romusage/src/map_file.c b/gbdk-support/romusage/src/map_file.c @@ -131,10 +131,14 @@ int map_file_process_areas(char * filename_in) { } } - // GBDK Areas: Only parse lines that start with '_' character (Area summary lines) - else if (strline_in[0] == '_') { - if (str_split(strline_in, p_words, " =.") == GBDK_AREA_SPLIT_WORDS) + // Previous filtering now discontinued, areas with no leading "_" are allowed : GBDK Areas: Only parse lines that start with '_' character (Area summary lines) + // else if (strline_in[0] == '_') { + // } + else if (str_split(strline_in, p_words, " =.") == GBDK_AREA_SPLIT_WORDS) { + // Require a secondary match on a known column value ("bytes") to filter matches better + if (strstr(p_words[4], "bytes")) { add_area_gbdk(p_words); + } } } // end: while still lines to process diff --git a/gbdk-support/romusage/src/noi_file.c b/gbdk-support/romusage/src/noi_file.c @@ -134,12 +134,11 @@ int noi_file_process_areas(char * filename_in) { while ( fgets(strline_in, sizeof(strline_in), noi_file) != NULL) { // Require minimum length to match - if (strlen(strline_in) >= NOI_REC_START_LEN) { + if (strlen(strline_in) >= strlen("DEF l_")) { // Match either _S_egment or _L_ength records - if ( (strncmp(strline_in, "DEF l__", NOI_REC_START_LEN) == 0) || - (strncmp(strline_in, "DEF s__", NOI_REC_START_LEN) == 0)) { - + if ( (strncmp(strline_in, "DEF l_", strlen("DEF l_") ) == 0) || + (strncmp(strline_in, "DEF s_", strlen("DEF s_") ) == 0)) { // Split string into words separated by spaces cols = 0; @@ -157,7 +156,7 @@ int noi_file_process_areas(char * filename_in) { if (cols == NOI_REC_COUNT_MATCH) { if ( !(strstr(p_words[2], "SFR")) && // Exclude SFR areas (not actually located at addresses in area listing) - !(strstr(p_words[2], "HRAM")) ) { // Exclude HRAM area + !(strstr(p_words[2], "HRAM")) ) { // Exclude HRAM area // TODO: remove the HRAM discard? (now that there is an HRAM section) noi_arealist_add(p_words[1], p_words[2], p_words[3]); } diff --git a/gbdk-support/romusage/src/romusage.c b/gbdk-support/romusage/src/romusage.c @@ -1,6 +1,6 @@ // This is free and unencumbered software released into the public domain. // For more information, please refer to <https://unlicense.org> -// bbbbbr 2020 +// bbbbbr 2024 #include <stdio.h> #include <string.h> @@ -19,7 +19,7 @@ #include "cdb_file.h" #include "rom_file.h" -#define VERSION "version 1.3.0" +#define VERSION "version 1.3.1" enum { HELP_FULL = 0, @@ -54,7 +54,7 @@ static void display_help(int mode) { "\n" "Options\n" "-h : Show this help\n" - "-p:SMS_GG : Set platform to GBDK SMS/Game Gear (changes memory map templates)\n" + "-p : Set platform (GBDK specific), \"-p:SMS_GG\" for SMS/Game Gear, \"-p:NES1\" for NES\n" "\n" "-a : Show Areas in each Bank. Optional sort by, address:\"-aA\" or size:\"-aS\" \n" "-g : Show a small usage graph per bank (-gA for ascii style)\n" @@ -173,6 +173,8 @@ int handle_args(int argc, char * argv[]) { } else if (strstr(argv[i], "-p:SMS_GG") == argv[i]) { set_option_platform(OPT_PLAT_SMS_GG_GBDK); + } else if (strstr(argv[i], "-p:NES1") == argv[i]) { + set_option_platform(OPT_PLAT_NES_GBDK_1); } else if (strstr(argv[i], "-g") == argv[i]) { banks_output_show_minigraph(true);
This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.