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

Use std::shared_ptr for fstack nodes (#1371)

Browse Source
This commit is contained in:
Sylvie
2024-03-22 13:27:21 -04:00
committed by GitHub
parent dd43723e20
commit 04405fb444
8 changed files with 45 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/asm/output.cpp
View File

@@ -34,7 +34,7 @@ static std::vector<Symbol *> objectSymbols;
static std::deque<Assertion> assertions;
static std::deque<FileStackNode *> fileStackNodes;
static std::deque<std::shared_ptr<FileStackNode>> fileStackNodes;
// Write a long to a file (little-endian)
static void putlong(uint32_t n, FILE *file) {
@@ -53,7 +53,7 @@ static void putstring(std::string const &s, FILE *file) {
putc('\0', file);
}
void out_RegisterNode(FileStackNode *node) {
void out_RegisterNode(std::shared_ptr<FileStackNode> node) {
// If node is not already registered, register it (and parents), and give it a unique ID
for (; node && node->ID == (uint32_t)-1; node = node->parent) {
node->ID = fileStackNodes.size();
@@ -61,21 +61,6 @@ void out_RegisterNode(FileStackNode *node) {
}
}
void out_ReplaceNode(FileStackNode * /* node */) {
#if 0
This is code intended to replace a node, which is pretty useless until ref counting is added...
auto search = std::find(RANGE(fileStackNodes), node);
assert(search != fileStackNodes.end());
// The list is supposed to have decrementing IDs; catch inconsistencies early
assert(search->ID == node->ID);
assert(search + 1 == fileStackNodes.end() || (search + 1)->ID == node->ID - 1);
// TODO: unreference the node
*search = node;
#endif
}
// Return a section's ID, or -1 if the section is not in the list
static uint32_t getSectIDIfAny(Section *sect) {
if (!sect)
@@ -249,12 +234,10 @@ static void writerpn(std::vector<uint8_t> &rpnexpr, std::vector<uint8_t> const &
}
static void initpatch(Patch &patch, uint32_t type, Expression const &expr, uint32_t ofs) {
FileStackNode *node = fstk_GetFileStack();
patch.type = type;
patch.src = node;
patch.src = fstk_GetFileStack();
// All patches are assumed to eventually be written, so the file stack node is registered
out_RegisterNode(node);
out_RegisterNode(patch.src);
patch.lineNo = lexer_GetLineNo();
patch.offset = ofs;
patch.pcSection = sect_GetSymbolSection();
@@ -342,17 +325,17 @@ void out_WriteObject() {
putlong(fileStackNodes.size(), file);
for (auto it = fileStackNodes.begin(); it != fileStackNodes.end(); it++) {
FileStackNode const *node = *it;
FileStackNode const &node = **it;
writeFileStackNode(*node, file);
writeFileStackNode(node, file);
// The list is supposed to have decrementing IDs
if (it + 1 != fileStackNodes.end() && it[1]->ID != node->ID - 1)
if (it + 1 != fileStackNodes.end() && it[1]->ID != node.ID - 1)
fatalerror(
"Internal error: fstack node #%" PRIu32 " follows #%" PRIu32
". Please report this to the developers!\n",
it[1]->ID,
node->ID
node.ID
);
}