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::deque for assertions

Browse Source 
Also fix a memory leak
This commit is contained in:
Rangi42
2024-02-21 15:57:44 -05:00
committed by Sylvie
parent 2df4fff6c9
commit 26a93a530b
3 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/link/object.cpp
View File

@@ -34,7 +34,7 @@ static struct FileStackNodes {
struct FileStackNode *nodes;
uint32_t nbNodes;
} *nodes;
static struct Assertion *assertions;
static std::deque<struct Assertion> assertions;
// Helper functions for reading object files
@@ -617,15 +617,11 @@ void obj_ReadFile(char const *fileName, unsigned int fileID)
tryReadlong(nbAsserts, file, "%s: Cannot read number of assertions: %s", fileName);
verbosePrint("Reading %" PRIu32 " assertions...\n", nbAsserts);
for (uint32_t i = 0; i < nbAsserts; i++) {
struct Assertion *assertion = (struct Assertion *)malloc(sizeof(*assertion));
struct Assertion &assertion = assertions.emplace_front();
if (!assertion)
err("%s: Failed to create new assertion", fileName);
readAssertion(file, assertion, fileName, i, nodes[fileID].nodes);
linkPatchToPCSect(&assertion->patch, fileSections);
assertion->fileSymbols = fileSymbols;
assertion->next = assertions;
assertions = assertion;
readAssertion(file, &assertion, fileName, i, nodes[fileID].nodes);
linkPatchToPCSect(&assertion.patch, fileSections);
assertion.fileSymbols = fileSymbols;
}
free(fileSections);
@@ -706,4 +702,9 @@ void obj_Cleanup(void)
freeSymbol(list.symbolList[i]);
free(list.symbolList);
}
for (struct Assertion &assert : assertions) {
free(assert.patch.rpnExpression);
free(assert.message);
}
}