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

Use std::deque for unassigned sections

Browse Source
This commit is contained in:
Rangi42
2024-02-21 17:16:45 -05:00
committed by Sylvie
parent 1afc8554c0
commit 003977a9fb
1 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/link/assign.cpp
View File

@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
#include <algorithm>
#include <deque>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -329,16 +331,10 @@ static void placeSection(struct Section *section)
out_OverlappingSection(section)->name); out_OverlappingSection(section)->name);
} }
struct UnassignedSection {
struct Section *section;
struct UnassignedSection *next;
};
#define BANK_CONSTRAINED (1 << 2) #define BANK_CONSTRAINED (1 << 2)
#define ORG_CONSTRAINED (1 << 1) #define ORG_CONSTRAINED (1 << 1)
#define ALIGN_CONSTRAINED (1 << 0) #define ALIGN_CONSTRAINED (1 << 0)
static struct UnassignedSection *unassignedSections[1 << 3] = {}; static std::deque<struct Section *> unassignedSections[1 << 3];
static struct UnassignedSection *sections;
/* /*
* Categorize a section depending on how constrained it is * Categorize a section depending on how constrained it is
@@ -357,15 +353,13 @@ static void categorizeSection(struct Section *section)
else if (section->isAlignFixed) else if (section->isAlignFixed)
constraints |= ALIGN_CONSTRAINED; constraints |= ALIGN_CONSTRAINED;
struct UnassignedSection **ptr = &unassignedSections[constraints]; std::deque<struct Section *> &sections = unassignedSections[constraints];
auto pos = sections.begin();
// Insert section while keeping the list sorted by decreasing size // Insert section while keeping the list sorted by decreasing size
while (*ptr && (*ptr)->section->size > section->size) while (pos != sections.end() && (*pos)->size > section->size)
ptr = &(*ptr)->next; pos++;
sections.insert(pos, section);
sections[nbSectionsToAssign].section = section;
sections[nbSectionsToAssign].next = *ptr;
*ptr = &sections[nbSectionsToAssign];
nbSectionsToAssign++; nbSectionsToAssign++;
} }
@@ -376,27 +370,18 @@ void assign_AssignSections(void)
// Initialize assignment // Initialize assignment
// Generate linked lists of sections to assign
sections = (struct UnassignedSection *)malloc(sizeof(*sections) * nbSectionsToAssign + 1);
if (!sections)
err("Failed to allocate memory for section assignment");
initFreeSpace(); initFreeSpace();
// Generate linked lists of sections to assign
nbSectionsToAssign = 0; nbSectionsToAssign = 0;
sect_ForEach(categorizeSection); sect_ForEach(categorizeSection);
// Place sections, starting with the most constrained // Place sections, starting with the most constrained
// Specially process fully-constrained sections because of overlaying // Specially process fully-constrained sections because of overlaying
struct UnassignedSection *sectionPtr =
unassignedSections[BANK_CONSTRAINED | ORG_CONSTRAINED];
verbosePrint("Assigning bank+org-constrained...\n"); verbosePrint("Assigning bank+org-constrained...\n");
while (sectionPtr) { for (struct Section *section : unassignedSections[BANK_CONSTRAINED | ORG_CONSTRAINED])
placeSection(sectionPtr->section); placeSection(section);
sectionPtr = sectionPtr->next;
}
// If all sections were fully constrained, we have nothing left to do // If all sections were fully constrained, we have nothing left to do
if (!nbSectionsToAssign) if (!nbSectionsToAssign)
@@ -407,12 +392,11 @@ void assign_AssignSections(void)
if (overlayFileName) { if (overlayFileName) {
fprintf(stderr, "FATAL: All sections must be fixed when using an overlay file"); fprintf(stderr, "FATAL: All sections must be fixed when using an overlay file");
uint8_t nbSections = 0; uint8_t nbSections = 0;
for (int8_t constraints = BANK_CONSTRAINED | ALIGN_CONSTRAINED; constraints >= 0; constraints--) { for (int8_t constraints = BANK_CONSTRAINED | ALIGN_CONSTRAINED;
for (sectionPtr = unassignedSections[constraints]; constraints >= 0; constraints--) {
sectionPtr; for (struct Section *section : unassignedSections[constraints]) {
sectionPtr = sectionPtr->next) { fprintf(stderr, "%c \"%s\"", nbSections == 0 ? ';': ',',
fprintf(stderr, "%c \"%s\"", section->name);
nbSections == 0 ? ';': ',', sectionPtr->section->name);
nbSections++; nbSections++;
if (nbSections == 10) if (nbSections == 10)
goto max_out; goto max_out;
@@ -429,12 +413,8 @@ max_out:
// Assign all remaining sections by decreasing constraint order // Assign all remaining sections by decreasing constraint order
for (int8_t constraints = BANK_CONSTRAINED | ALIGN_CONSTRAINED; for (int8_t constraints = BANK_CONSTRAINED | ALIGN_CONSTRAINED;
constraints >= 0; constraints--) { constraints >= 0; constraints--) {
sectionPtr = unassignedSections[constraints]; for (struct Section *section : unassignedSections[constraints])
placeSection(section);
while (sectionPtr) {
placeSection(sectionPtr->section);
sectionPtr = sectionPtr->next;
}
if (!nbSectionsToAssign) if (!nbSectionsToAssign)
return; return;
@@ -460,6 +440,4 @@ void assign_Cleanup(void)
free(memory[type]); free(memory[type]);
} }
free(sections);
} }