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

Make sectionMap not extern

Browse Source
This commit is contained in:
Rangi42
2025-07-21 20:20:04 -04:00
parent c83b87e0a0
commit eea532ded1
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm/section.hpp
View File

@@ -50,7 +50,6 @@ struct SectionSpec {
}; };
extern std::deque<Section> sectionList; extern std::deque<Section> sectionList;
extern std::unordered_map<std::string, size_t> sectionMap; // Indexes into `sectionList`
extern Section *currentSection; extern Section *currentSection;
Section *sect_FindSectionByName(std::string const &name); Section *sect_FindSectionByName(std::string const &name);

4
src/asm/output.cpp
View File

@@ -66,15 +66,13 @@ static uint32_t getSectIDIfAny(Section *sect) {
return UINT32_MAX; return UINT32_MAX;
} }
// Search in `sectionList` instead of `sectionMap`, since section fragments share the // Section fragments share the same name but have different IDs, so search by identity
// same name but have different IDs
if (auto search = if (auto search =
std::find_if(RANGE(sectionList), [&sect](Section const &s) { return &s == sect; }); std::find_if(RANGE(sectionList), [&sect](Section const &s) { return &s == sect; });
search != sectionList.end()) { search != sectionList.end()) {
return static_cast<uint32_t>(std::distance(sectionList.begin(), search)); return static_cast<uint32_t>(std::distance(sectionList.begin(), search));
} }
// Every section that exists should be in `sectionMap`
fatal("Unknown section '%s'", sect->name.c_str()); // LCOV_EXCL_LINE fatal("Unknown section '%s'", sect->name.c_str()); // LCOV_EXCL_LINE
} }

4
src/asm/section.cpp
View File

@@ -38,9 +38,9 @@ struct SectionStackEntry {
std::stack<UnionStackEntry> unionStack; std::stack<UnionStackEntry> unionStack;
}; };
std::deque<Section> sectionList;
std::unordered_map<std::string, size_t> sectionMap; // Indexes into `sectionList`
Section *currentSection = nullptr; Section *currentSection = nullptr;
std::deque<Section> sectionList;
static std::unordered_map<std::string, size_t> sectionMap; // Indexes into `sectionList`
static uint32_t curOffset; // Offset into the current section (see `sect_GetSymbolOffset`) static uint32_t curOffset; // Offset into the current section (see `sect_GetSymbolOffset`)