gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #472 from ISSOtm/romx-tiny

Browse Source 
Allow ROMX and WRAMX sections in restricted modes
This commit is contained in:
Eldred Habert
2020-01-26 14:48:32 +01:00
committed by GitHub
parent e7eac583da 71fe652556
commit fb81733b2b
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/link/section.c
View File

@@ -118,12 +118,20 @@ static void doSanityChecks(struct Section *section, void *ptr)
if (section->type < 0 || section->type >= SECTTYPE_INVALID) if (section->type < 0 || section->type >= SECTTYPE_INVALID)
fail("Section \"%s\" has an invalid type.", section->name); fail("Section \"%s\" has an invalid type.", section->name);
if (is32kMode && section->type == SECTTYPE_ROMX) if (is32kMode && section->type == SECTTYPE_ROMX) {
fail("%s: ROMX sections cannot be used with option -t.", if (section->isBankFixed && section->bank != 1)
section->name); fail("%s: ROMX sections must be in bank 1 with option -t.",
if (isWRA0Mode && section->type == SECTTYPE_WRAMX) section->name);
fail("%s: WRAMX sections cannot be used with options -w or -d.", else
section->name); section->type = SECTTYPE_ROM0;
}
if (isWRA0Mode && section->type == SECTTYPE_WRAMX) {
if (section->isBankFixed && section->bank != 1)
fail("%s: WRAMX sections must be in bank 1 with options -w or -d.",
section->name);
else
section->type = SECTTYPE_WRAMX;
}
if (isDmgMode && section->type == SECTTYPE_VRAM && section->bank == 1) if (isDmgMode && section->type == SECTTYPE_VRAM && section->bank == 1)
fail("%s: VRAM bank 1 can't be used with option -d.", fail("%s: VRAM bank 1 can't be used with option -d.",
section->name); section->name);

3
test/link/romx-tiny-t.out
View File

@@ -1,2 +1 @@
warning: rx: ROMX sections cannot be used with option -t. error: Unable to place "r0a" (ROM0 section) anywhere
error: Sanity checks failed

2
test/link/wramx-dmg-mode-d.out
View File

@@ -1,2 +0,0 @@
warning: wx: WRAMX sections cannot be used with options -w or -d.
error: Sanity checks failed