gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-12-31 05:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct error message for unconstrained sections with overlay (#1879)

Browse Source
This commit is contained in:
Rangi
2025-12-28 19:21:53 -05:00
committed by GitHub
parent 63a911e657
commit 41fe1d8f25
4 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/link/assign.cpp
View File

@@ -36,19 +36,6 @@ struct FreeSpace {
// Table of free space for each bank
static std::vector<std::deque<FreeSpace>> memory[SECTTYPE_INVALID];
// Init the free space-modelling structs
static void initFreeSpace() {
for (SectionType type : EnumSeq(SECTTYPE_INVALID)) {
memory[type].resize(sectTypeBanks(type));
for (std::deque<FreeSpace> &bankMem : memory[type]) {
bankMem.push_back({
.address = sectionTypeInfo[type].startAddr,
.size = sectionTypeInfo[type].size,
});
}
}
}
// Assigns a section to a given memory location
static void assignSection(Section &section, MemoryLocation const &location) {
// Propagate the assigned location to all UNIONs/FRAGMENTs
@@ -368,36 +355,74 @@ static void categorizeSection(Section &section) {
sections.insert(pos, &section);
}
static std::vector<Section const *> checkOverlayCompat() {
std::vector<Section const *> unfixedSections;
static void checkOverlayCompat() {
auto isFixed = [](uint8_t constraints) {
return (constraints & BANK_CONSTRAINED) && (constraints & ORG_CONSTRAINED);
};
if (!options.overlayFileName) {
return unfixedSections;
std::string unfixedList;
size_t nbUnfixedSections = 0;
for (uint8_t constraints = std::size(unassignedSections); constraints--;) {
if (!isFixed(constraints)) {
nbUnfixedSections += unassignedSections[constraints].size();
}
}
if (nbUnfixedSections == 0) {
return;
}
size_t nbListed = 0;
for (uint8_t constraints = std::size(unassignedSections); constraints--;) {
if (((constraints & BANK_CONSTRAINED) && (constraints & ORG_CONSTRAINED))
|| unassignedSections[constraints].empty()) {
if (isFixed(constraints)) {
continue;
}
for (Section *section : unassignedSections[constraints]) {
unfixedSections.push_back(section);
if (unfixedSections.size() == 10) {
return unfixedSections;
for (Section const *section : unassignedSections[constraints]) {
if (nbListed == 10) {
unfixedList += "\n- and ";
unfixedList += std::to_string(nbUnfixedSections - nbListed);
unfixedList += " more";
break;
}
unfixedList += "\n- \"";
unfixedList += section->name;
unfixedList += "\" (";
if (!(constraints & (BANK_CONSTRAINED | ORG_CONSTRAINED))) {
unfixedList += "bank and address";
} else if (!(constraints & BANK_CONSTRAINED)) {
unfixedList += "bank";
} else {
assume(!(constraints & ORG_CONSTRAINED));
unfixedList += "address";
}
unfixedList += " not specified)";
++nbListed;
}
}
return unfixedSections;
fatal(
"All sections must be fixed when using an overlay file; %zu %s not:%s",
nbUnfixedSections,
nbUnfixedSections == 1 ? "is" : "are",
unfixedList.c_str()
);
}
void assign_AssignSections() {
verbosePrint(VERB_NOTICE, "Beginning assignment...\n");
// Initialize assignment
initFreeSpace();
// Initialize the free space-modelling structs
for (SectionType type : EnumSeq(SECTTYPE_INVALID)) {
memory[type].resize(sectTypeBanks(type));
for (std::deque<FreeSpace> &bankMem : memory[type]) {
bankMem.push_back({
.address = sectionTypeInfo[type].startAddr,
.size = sectionTypeInfo[type].size,
});
}
}
// Generate linked lists of sections to assign
static uint64_t nbSectionsToAssign = 0; // `static` so `sect_ForEach` callback can see it
@@ -407,26 +432,8 @@ void assign_AssignSections() {
});
// Overlaying requires only fully-constrained sections
if (std::vector<Section const *> unfixedSections = checkOverlayCompat();
!unfixedSections.empty()) {
size_t nbUnfixedSections = unfixedSections.size();
std::string unfixedList;
for (Section const *section : unfixedSections) {
unfixedList += "\n- \"";
unfixedList += section->name;
unfixedList += '"';
}
if (nbSectionsToAssign > nbUnfixedSections) {
unfixedList += "\n- and ";
unfixedList += std::to_string(nbSectionsToAssign - nbUnfixedSections);
unfixedList += " more";
}
fatal(
"All sections must be fixed when using an overlay file; %" PRIu64 " %s not:%s",
nbSectionsToAssign,
nbSectionsToAssign == 1 ? "is" : "are",
unfixedList.c_str()
);
if (options.overlayFileName) {
checkOverlayCompat();
}
// Assign sections in decreasing constraint order

11
src/link/symbol.cpp
View File

@@ -80,14 +80,15 @@ void sym_TraceLocalAliasedSymbols(std::string const &name) {
plural ? "are" : "is"
);
int count = 0;
size_t nbListed = 0;
for (Symbol *local : locals) {
assume(local->src);
local->src->printBacktrace(local->lineNo);
if (++count == 3 && locals.size() > 3) {
fprintf(stderr, " ...and %zu more\n", locals.size() - 3);
if (nbListed == 3) {
fprintf(stderr, " ...and %zu more\n", locals.size() - nbListed);
break;
}
assume(local->src);
local->src->printBacktrace(local->lineNo);
++nbListed;
}
}

10
test/link/overlay/unfixed/a.asm
View File

@@ -1,4 +1,10 @@
FOR n, 15
SECTION "test {d:n}", ROM0
FOR n, 1, 5
SECTION "ROMX[$40{02x:n}] BANK[5]", ROMX[$4000 + n], BANK[5]
db n
SECTION "ROMX BANK[{d:n}]", ROMX, BANK[n]
db n
SECTION "ROMX[$40{02x:n}]", ROMX[$4000 + n]
db n
SECTION "ROMX #{d:n}", ROMX
db n
ENDR

24
test/link/overlay/unfixed/out.err
View File

@@ -1,13 +1,13 @@
FATAL: All sections must be fixed when using an overlay file; 15 are not:
- "test 14"
- "test 13"
- "test 12"
- "test 11"
- "test 10"
- "test 9"
- "test 8"
- "test 7"
- "test 6"
- "test 5"
- and 5 more
FATAL: All sections must be fixed when using an overlay file; 12 are not:
- "ROMX BANK[4]" (address not specified)
- "ROMX BANK[3]" (address not specified)
- "ROMX BANK[2]" (address not specified)
- "ROMX BANK[1]" (address not specified)
- "ROMX[$4004]" (bank not specified)
- "ROMX[$4003]" (bank not specified)
- "ROMX[$4002]" (bank not specified)
- "ROMX[$4001]" (bank not specified)
- "ROMX #4" (bank and address not specified)
- "ROMX #3" (bank and address not specified)
- and 2 more
Linking aborted with 1 error