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 #449 from ISSOtm/better_error_msg

Browse Source 
Report overlapping sections whenever possible
This commit is contained in:
Eldred Habert
2019-11-06 09:00:11 +01:00
committed by GitHub
parent 197f1e9b7b 44173dbe8b
commit 648df0dc7d
3 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/link/output.h
View File

@@ -20,6 +20,13 @@
*/
void out_AddSection(struct Section const *section);
/**
* Finds an assigned section overlapping another one.
* @param section The section that is being overlapped
* @return A section overlapping it
*/
struct Section const *out_OverlappingSection(struct Section const *section);
/**
* Writes all output (bin, sym, map) files.
*/

45
src/link/assign.c
View File

@@ -1,6 +1,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include "link/assign.h"
#include "link/section.h"
@@ -284,32 +285,42 @@ static void placeSection(struct Section *section)
return;
}
/* Please adjust depending on longest message below */
char where[64];
if (section->isBankFixed && nbbanks(section->type) != 1) {
if (section->isAddressFixed)
errx(1, "Unable to place \"%s\" (%s section) at $%02x:%04x",
section->name, typeNames[section->type],
section->bank, section->org);
snprintf(where, 64, "at $%02x:%04x",
section->bank, section->org);
else if (section->isAlignFixed)
errx(1, "Unable to place \"%s\" (%s section) in bank %u with align mask %x",
section->name, typeNames[section->type],
section->bank, ~section->alignMask);
snprintf(where, 64, "in bank $%02x with align mask %x",
section->bank, ~section->alignMask);
else
errx(1, "Unable to place \"%s\" (%s section) in bank %u",
section->name, typeNames[section->type],
section->bank);
snprintf(where, 64, "in bank $%02x", section->bank);
} else {
if (section->isAddressFixed)
errx(1, "Unable to place \"%s\" (%s section) at address $%x",
section->name, typeNames[section->type],
section->org);
snprintf(where, 64, "at address $%04x", section->org);
else if (section->isAlignFixed)
errx(1, "Unable to place \"%s\" (%s section) with align mask %x",
section->name, typeNames[section->type],
~section->alignMask);
snprintf(where, 64, "with align mask %x",
~section->alignMask);
else
errx(1, "Unable to place \"%s\" (%s section) anywhere",
section->name, typeNames[section->type]);
strcpy(where, "anywhere");
}
/* If a section failed to go to several places, nothing we can report */
if (!section->isBankFixed || !section->isAddressFixed)
errx(1, "Unable to place \"%s\" (%s section) %s",
section->name, typeNames[section->type], where);
/* If the section just can't fit the bank, report that */
else if (section->org + section->size > endaddr(section->type) + 1)
errx(1, "Unable to place \"%s\" (%s section) %s: section runs past end of region ($%04x > $%04x)",
section->name, typeNames[section->type], where,
section->org + section->size, endaddr(section->type) + 1);
/* Otherwise there is overlap with another section */
else
errx(1, "Unable to place \"%s\" (%s section) %s: section overlaps with \"%s\"",
section->name, typeNames[section->type], where,
out_OverlappingSection(section)->name);
}
struct UnassignedSection {

14
src/link/output.c
View File

@@ -78,6 +78,20 @@ void out_AddSection(struct Section const *section)
*ptr = newSection;
}
struct Section const *out_OverlappingSection(struct Section const *section)
{
struct SortedSection *ptr =
sections[section->type].banks[section->bank].sections;
while (ptr) {
if (ptr->section->org < section->org + section->size
&& section->org < ptr->section->org + ptr->section->size)
return ptr->section;
ptr = ptr->next;
}
return NULL;
}
/**
* Performs sanity checks on the overlay file.
*/