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

Refactor getSectionDescription in src/link/assign.cpp

Browse Source
This commit is contained in:
Rangi
2025-11-16 17:37:01 -05:00
parent 0f266d1c66
commit 5c2c893ced
1 changed files with 22 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/link/assign.cpp
View File

@@ -208,50 +208,37 @@ static std::optional<size_t> getPlacement(Section const &section, MemoryLocation
} }
static std::string getSectionDescription(Section const &section) { static std::string getSectionDescription(Section const &section) {
std::string where; std::string description =
"\"" + section.name + "\" (" + sectionTypeInfo[section.type].name + " section) ";
char bank[8], addr[8], mask[8], offset[8];
if (section.isBankFixed && sectTypeBanks(section.type) != 1) { if (section.isBankFixed && sectTypeBanks(section.type) != 1) {
char bank[8];
snprintf(bank, sizeof(bank), "%02" PRIx32, section.bank); snprintf(bank, sizeof(bank), "%02" PRIx32, section.bank);
}
if (section.isAddressFixed) { if (section.isAddressFixed) {
char addr[8];
snprintf(addr, sizeof(addr), "%04" PRIx16, section.org); snprintf(addr, sizeof(addr), "%04" PRIx16, section.org);
description = description + "at $" + bank + ":" + addr;
} else if (section.isAlignFixed) {
char mask[8];
snprintf(mask, sizeof(mask), "%" PRIx16, static_cast<uint16_t>(~section.alignMask));
description = description + "in bank $" + bank + " with align mask $" + mask;
} else {
description = description + "in bank $" + bank;
} }
if (section.isAlignFixed) { } else {
if (section.isAddressFixed) {
char addr[8];
snprintf(addr, sizeof(addr), "%04" PRIx16, section.org);
description = description + "at address $" + addr;
} else if (section.isAlignFixed) {
char mask[8], offset[8];
snprintf(mask, sizeof(mask), "%" PRIx16, static_cast<uint16_t>(~section.alignMask)); snprintf(mask, sizeof(mask), "%" PRIx16, static_cast<uint16_t>(~section.alignMask));
snprintf(offset, sizeof(offset), "%" PRIx16, section.alignOfs); snprintf(offset, sizeof(offset), "%" PRIx16, section.alignOfs);
} description = description + "with align mask $" + mask + " and offset $" + offset;
if (section.isBankFixed && sectTypeBanks(section.type) != 1) {
if (section.isAddressFixed) {
where = "at $";
where += bank;
where += ":";
where += addr;
} else if (section.isAlignFixed) {
where = "in bank $";
where += bank;
where += " with align mask $";
where += mask;
} else { } else {
where = "in bank $"; description = description + "anywhere";
where += bank;
}
} else {
if (section.isAddressFixed) {
where = "at address $";
where += addr;
} else if (section.isAlignFixed) {
where = "with align mask $";
where += mask;
where += " and offset $";
where += offset;
} else {
where = "anywhere";
} }
} }
return description;
return where;
} }
// Places a section in a suitable location, or error out if it fails to. // Places a section in a suitable location, or error out if it fails to.
@@ -310,19 +297,11 @@ static void placeSection(Section &section) {
if (!section.isBankFixed || !section.isAddressFixed) { if (!section.isBankFixed || !section.isAddressFixed) {
// If a section failed to go to several places, nothing we can report // If a section failed to go to several places, nothing we can report
fatal( fatal("Unable to place %s", getSectionDescription(section).c_str());
"Unable to place \"%s\" (%s section) %s",
section.name.c_str(),
sectionTypeInfo[section.type].name.c_str(),
getSectionDescription(section).c_str()
);
} else if (section.org + section.size > sectTypeEndAddr(section.type) + 1) { } else if (section.org + section.size > sectTypeEndAddr(section.type) + 1) {
// If the section just can't fit the bank, report that // If the section just can't fit the bank, report that
fatal( fatal(
"Unable to place \"%s\" (%s section) %s: section runs past end of region ($%04x > " "Unable to place %s: section runs past end of region ($%04x > $%04x)",
"$%04x)",
section.name.c_str(),
sectionTypeInfo[section.type].name.c_str(),
getSectionDescription(section).c_str(), getSectionDescription(section).c_str(),
section.org + section.size, section.org + section.size,
sectTypeEndAddr(section.type) + 1 sectTypeEndAddr(section.type) + 1
@@ -330,9 +309,7 @@ static void placeSection(Section &section) {
} else { } else {
// Otherwise there is overlap with another section // Otherwise there is overlap with another section
fatal( fatal(
"Unable to place \"%s\" (%s section) %s: section overlaps with \"%s\"", "Unable to place %s: section overlaps with \"%s\"",
section.name.c_str(),
sectionTypeInfo[section.type].name.c_str(),
getSectionDescription(section).c_str(), getSectionDescription(section).c_str(),
out_OverlappingSection(section)->name.c_str() out_OverlappingSection(section)->name.c_str()
); );