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

Separate errors that shouldn't have been combined in the first place.

Browse Source
This commit is contained in:
Anthony J. Bentley
2014-09-25 20:40:25 -06:00
parent 215d6f0c5b
commit 3992ce2502
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/output.c
View File

@@ -504,9 +504,12 @@ void
checkcodesection(SLONG size) checkcodesection(SLONG size)
{ {
checksection(); checksection();
if ((pCurrentSection->nType == SECT_ROM0 if (pCurrentSection->nType != SECT_ROM0 &&
|| pCurrentSection->nType == SECT_ROMX) pCurrentSection->nType != SECT_ROMX) {
&& (pCurrentSection->nPC + size <= MAXSECTIONSIZE)) { errx(1, "Section '%s' cannot contain code or data (not a "
"ROM0 or ROMX)", pCurrentSection->pzName);
}
if (pCurrentSection->nPC + size <= MAXSECTIONSIZE) {
if (((pCurrentSection->nPC % SECTIONCHUNK) > if (((pCurrentSection->nPC % SECTIONCHUNK) >
((pCurrentSection->nPC + size) % SECTIONCHUNK)) ((pCurrentSection->nPC + size) % SECTIONCHUNK))
&& (pCurrentSection->nType == SECT_ROM0 && (pCurrentSection->nType == SECT_ROM0
@@ -523,8 +526,7 @@ checkcodesection(SLONG size)
} }
return; return;
} else } else
fatalerror errx(1, "Section '%s' is too big", pCurrentSection->pzName);
("Section can't contain initialized data or section limit exceeded");
} }
/* /*
* RGBAsm - OUTPUT.C - Outputs an objectfile * RGBAsm - OUTPUT.C - Outputs an objectfile