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

Avoid hard-coding a redundant "FATAL:" in RGBLINK

Browse Source
This commit is contained in:
Rangi42
2025-07-27 20:07:53 -04:00
parent 8b1a5244f7
commit d16751f56a
5 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/link/assign.cpp
View File

@@ -379,15 +379,15 @@ static void categorizeSection(Section &section) {
sections.insert(pos, &section);
}
static std::vector<Section *> checkOverlayCompat() {
std::vector<Section *> unfixedSections;
static std::vector<Section const *> checkOverlayCompat() {
std::vector<Section const *> unfixedSections;
if (!options.overlayFileName) {
return unfixedSections;
}
for (uint8_t constraints = std::size(unassignedSections); constraints--;) {
if ((constraints & (BANK_CONSTRAINED | ORG_CONSTRAINED))
if (((constraints & BANK_CONSTRAINED) && (constraints & ORG_CONSTRAINED))
|| unassignedSections[constraints].empty()) {
continue;
}
@@ -418,17 +418,26 @@ void assign_AssignSections() {
});
// Overlaying requires only fully-constrained sections
if (std::vector<Section *> unfixedSections = checkOverlayCompat(); !unfixedSections.empty()) {
if (std::vector<Section const *> unfixedSections = checkOverlayCompat();
!unfixedSections.empty()) {
size_t nbUnfixedSections = unfixedSections.size();
fputs("FATAL: All sections must be fixed when using an overlay file", stderr);
for (size_t i = 0; i < nbUnfixedSections; ++i) {
fprintf(stderr, "%c \"%s\"", i == 0 ? ';' : ',', unfixedSections[i]->name.c_str());
std::string unfixedList;
for (Section const *section : unfixedSections) {
unfixedList += "\n- \"";
unfixedList += section->name;
unfixedList += '"';
}
if (nbSectionsToAssign != nbUnfixedSections) {
fprintf(stderr, " and %" PRIu64 " more", nbSectionsToAssign - nbUnfixedSections);
if (nbSectionsToAssign > nbUnfixedSections) {
unfixedList += "\n- and ";
unfixedList += std::to_string(nbSectionsToAssign - nbUnfixedSections);
unfixedList += " more";
}
fprintf(stderr, " %s not\n", nbSectionsToAssign == 1 ? "is" : "are");
exit(1);
fatal(
"All sections must be fixed when using an overlay file; %" PRIu64 " %s not:%s",
nbSectionsToAssign,
nbSectionsToAssign == 1 ? "is" : "are",
unfixedList.c_str()
);
}
// Assign sections in decreasing constraint order