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

Use automatic allocation for fstack nodes' iters/names

Browse Source
This commit is contained in:
Rangi42
2024-02-24 21:58:34 -05:00
committed by Sylvie
parent 5075ac8887
commit 0e19f6c0ae
3 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm/fstack.hpp
View File

@@ -27,12 +27,12 @@ struct FileStackNode {
struct FileStackReptNode { // NODE_REPT struct FileStackReptNode { // NODE_REPT
struct FileStackNode node; struct FileStackNode node;
std::vector<uint32_t> *iters; // REPT iteration counts since last named node, in reverse depth order std::vector<uint32_t> iters; // REPT iteration counts since last named node, in reverse depth order
}; };
struct FileStackNamedNode { // NODE_FILE, NODE_MACRO struct FileStackNamedNode { // NODE_FILE, NODE_MACRO
struct FileStackNode node; struct FileStackNode node;
std::string *name; // File name for files, file::macro name for macros std::string name; // File name for files, file::macro name for macros
}; };
#define DEFAULT_MAX_DEPTH 64 #define DEFAULT_MAX_DEPTH 64

83
src/asm/fstack.cpp
View File

@@ -50,10 +50,10 @@ static const char *dumpNodeAndParents(struct FileStackNode const *node)
name = dumpNodeAndParents(node->parent); name = dumpNodeAndParents(node->parent);
fprintf(stderr, "(%" PRIu32 ") -> %s", node->lineNo, name); fprintf(stderr, "(%" PRIu32 ") -> %s", node->lineNo, name);
for (uint32_t i = reptInfo->iters->size(); i--; ) for (uint32_t i = reptInfo->iters.size(); i--; )
fprintf(stderr, "::REPT~%" PRIu32, (*reptInfo->iters)[i]); fprintf(stderr, "::REPT~%" PRIu32, reptInfo->iters[i]);
} else { } else {
name = ((struct FileStackNamedNode const *)node)->name->c_str(); name = ((struct FileStackNamedNode const *)node)->name.c_str();
if (node->parent) { if (node->parent) {
dumpNodeAndParents(node->parent); dumpNodeAndParents(node->parent);
fprintf(stderr, "(%" PRIu32 ") -> %s", node->lineNo, name); fprintf(stderr, "(%" PRIu32 ") -> %s", node->lineNo, name);
@@ -101,7 +101,7 @@ char const *fstk_GetFileName(void)
while (node->type != NODE_FILE) while (node->type != NODE_FILE)
node = node->parent; node = node->parent;
return ((struct FileStackNamedNode const *)node)->name->c_str(); return ((struct FileStackNamedNode const *)node)->name.c_str();
} }
void fstk_AddIncludePath(char const *path) void fstk_AddIncludePath(char const *path)
@@ -180,16 +180,13 @@ bool yywrap(void)
// If the node is referenced, we can't edit it; duplicate it // If the node is referenced, we can't edit it; duplicate it
if (context.fileInfo->referenced) { if (context.fileInfo->referenced) {
struct FileStackReptNode *copy = (struct FileStackReptNode *)malloc(sizeof(*copy)); struct FileStackReptNode *copy = new(std::nothrow) struct FileStackReptNode();
// Copy all info but the referencing if (!copy)
if (copy) {
memcpy(copy, fileInfo, sizeof(*copy));
copy->iters = new(std::nothrow) std::vector<uint32_t>();
}
if (!copy || !copy->iters)
fatalerror("Failed to duplicate REPT file node: %s\n", strerror(errno)); fatalerror("Failed to duplicate REPT file node: %s\n", strerror(errno));
*copy->iters = *fileInfo->iters; // Copies `fileInfo->iters` // Copy all info but the referencing
memcpy(&copy->node, &fileInfo->node, sizeof(copy->node));
copy->iters = fileInfo->iters; // Copies `fileInfo->iters`
copy->node.referenced = false; copy->node.referenced = false;
fileInfo = copy; fileInfo = copy;
@@ -197,7 +194,7 @@ bool yywrap(void)
} }
// If this is a FOR, update the symbol value // If this is a FOR, update the symbol value
if (context.forName && fileInfo->iters->front() <= context.nbReptIters) { if (context.forName && fileInfo->iters.front() <= context.nbReptIters) {
// Avoid arithmetic overflow runtime error // Avoid arithmetic overflow runtime error
uint32_t forValue = (uint32_t)context.forValue + (uint32_t)context.forStep; uint32_t forValue = (uint32_t)context.forValue + (uint32_t)context.forStep;
context.forValue = forValue <= INT32_MAX ? forValue : -(int32_t)~forValue - 1; context.forValue = forValue <= INT32_MAX ? forValue : -(int32_t)~forValue - 1;
@@ -208,9 +205,9 @@ bool yywrap(void)
fatalerror("Failed to update FOR symbol value\n"); fatalerror("Failed to update FOR symbol value\n");
} }
// Advance to the next iteration // Advance to the next iteration
fileInfo->iters->front()++; fileInfo->iters.front()++;
// If this wasn't the last iteration, wrap instead of popping // If this wasn't the last iteration, wrap instead of popping
if (fileInfo->iters->front() <= context.nbReptIters) { if (fileInfo->iters.front() <= context.nbReptIters) {
lexer_RestartRept(context.fileInfo->lineNo); lexer_RestartRept(context.fileInfo->lineNo);
context.uniqueID = macro_UseNewUniqueID(); context.uniqueID = macro_UseNewUniqueID();
return false; return false;
@@ -232,10 +229,9 @@ bool yywrap(void)
// Free the file stack node // Free the file stack node
if (!oldContext.fileInfo->referenced) { if (!oldContext.fileInfo->referenced) {
if (oldContext.fileInfo->type == NODE_REPT) if (oldContext.fileInfo->type == NODE_REPT)
delete ((struct FileStackReptNode *)oldContext.fileInfo)->iters; delete (struct FileStackReptNode *)oldContext.fileInfo;
else else
delete ((struct FileStackNamedNode *)oldContext.fileInfo)->name; delete (struct FileStackNamedNode *)oldContext.fileInfo;
free(oldContext.fileInfo);
} }
// Free the FOR symbol name // Free the FOR symbol name
free(oldContext.forName); free(oldContext.forName);
@@ -288,19 +284,20 @@ void fstk_RunInclude(char const *path)
return; return;
} }
struct FileStackNamedNode *fileInfo = (struct FileStackNamedNode *)malloc(sizeof(*fileInfo)); struct FileStackNamedNode *fileInfo = new(std::nothrow) struct FileStackNamedNode();
if (!fileInfo) { if (!fileInfo) {
error("Failed to alloc file info for INCLUDE: %s\n", strerror(errno)); error("Failed to alloc file info for INCLUDE: %s\n", strerror(errno));
return; return;
} }
fileInfo->node.type = NODE_FILE; fileInfo->node.type = NODE_FILE;
fileInfo->name = fullPath; // `fullPath` is already `new`-allocated, so just point to it fileInfo->name = *fullPath;
delete fullPath;
uint32_t uniqueID = contextStack.top().uniqueID; uint32_t uniqueID = contextStack.top().uniqueID;
struct Context &context = newContext((struct FileStackNode *)fileInfo); struct Context &context = newContext((struct FileStackNode *)fileInfo);
context.lexerState = lexer_OpenFile(fileInfo->name->c_str()); context.lexerState = lexer_OpenFile(fileInfo->name.c_str());
if (!context.lexerState) if (!context.lexerState)
fatalerror("Failed to set up lexer for file include\n"); fatalerror("Failed to set up lexer for file include\n");
lexer_SetStateAtEOL(context.lexerState); lexer_SetStateAtEOL(context.lexerState);
@@ -324,18 +321,19 @@ static void runPreIncludeFile(void)
return; return;
} }
struct FileStackNamedNode *fileInfo = (struct FileStackNamedNode *)malloc(sizeof(*fileInfo)); struct FileStackNamedNode *fileInfo = new(std::nothrow) struct FileStackNamedNode();
if (!fileInfo) { if (!fileInfo) {
error("Failed to alloc file info for pre-include: %s\n", strerror(errno)); error("Failed to alloc file info for pre-include: %s\n", strerror(errno));
return; return;
} }
fileInfo->node.type = NODE_FILE; fileInfo->node.type = NODE_FILE;
fileInfo->name = fullPath; // `fullPath` is already `new`-allocated, so just point to it fileInfo->name = *fullPath;
delete fullPath;
struct Context &context = newContext((struct FileStackNode *)fileInfo); struct Context &context = newContext((struct FileStackNode *)fileInfo);
context.lexerState = lexer_OpenFile(fileInfo->name->c_str()); context.lexerState = lexer_OpenFile(fileInfo->name.c_str());
if (!context.lexerState) if (!context.lexerState)
fatalerror("Failed to set up lexer for file include\n"); fatalerror("Failed to set up lexer for file include\n");
lexer_SetState(context.lexerState); lexer_SetState(context.lexerState);
@@ -357,11 +355,9 @@ void fstk_RunMacro(char const *macroName, struct MacroArgs *args)
} }
contextStack.top().macroArgs = macro_GetCurrentArgs(); contextStack.top().macroArgs = macro_GetCurrentArgs();
struct FileStackNamedNode *fileInfo = (struct FileStackNamedNode *)malloc(sizeof(*fileInfo)); struct FileStackNamedNode *fileInfo = new(std::nothrow) struct FileStackNamedNode();
if (fileInfo) if (!fileInfo) {
fileInfo->name = new(std::nothrow) std::string();
if (!fileInfo || !fileInfo->name) {
error("Failed to alloc file info for \"%s\": %s\n", macro->name, strerror(errno)); error("Failed to alloc file info for \"%s\": %s\n", macro->name, strerror(errno));
return; return;
} }
@@ -370,24 +366,24 @@ void fstk_RunMacro(char const *macroName, struct MacroArgs *args)
// Print the name... // Print the name...
for (struct FileStackNode const *node = macro->src; node; node = node->parent) { for (struct FileStackNode const *node = macro->src; node; node = node->parent) {
if (node->type != NODE_REPT) { if (node->type != NODE_REPT) {
fileInfo->name->append(*((struct FileStackNamedNode const *)node)->name); fileInfo->name.append(((struct FileStackNamedNode const *)node)->name);
break; break;
} }
} }
if (macro->src->type == NODE_REPT) { if (macro->src->type == NODE_REPT) {
struct FileStackReptNode const *reptNode = (struct FileStackReptNode const *)macro->src; struct FileStackReptNode const *reptNode = (struct FileStackReptNode const *)macro->src;
for (uint32_t i = reptNode->iters->size(); i--; ) { for (uint32_t i = reptNode->iters.size(); i--; ) {
char buf[sizeof("::REPT~4294967295")]; // UINT32_MAX char buf[sizeof("::REPT~4294967295")]; // UINT32_MAX
if (sprintf(buf, "::REPT~%" PRIu32, (*reptNode->iters)[i]) < 0) if (sprintf(buf, "::REPT~%" PRIu32, reptNode->iters[i]) < 0)
fatalerror("Failed to write macro invocation info: %s\n", fatalerror("Failed to write macro invocation info: %s\n",
strerror(errno)); strerror(errno));
fileInfo->name->append(buf); fileInfo->name.append(buf);
} }
} }
fileInfo->name->append("::"); fileInfo->name.append("::");
fileInfo->name->append(macro->name); fileInfo->name.append(macro->name);
struct Context &context = newContext((struct FileStackNode *)fileInfo); struct Context &context = newContext((struct FileStackNode *)fileInfo);
context.lexerState = lexer_OpenFileView("MACRO", macro->macro.value, macro->macro.size, context.lexerState = lexer_OpenFileView("MACRO", macro->macro.value, macro->macro.size,
@@ -402,22 +398,20 @@ void fstk_RunMacro(char const *macroName, struct MacroArgs *args)
static bool newReptContext(int32_t reptLineNo, char *body, size_t size) static bool newReptContext(int32_t reptLineNo, char *body, size_t size)
{ {
uint32_t reptDepth = contextStack.top().fileInfo->type == NODE_REPT uint32_t reptDepth = contextStack.top().fileInfo->type == NODE_REPT
? ((struct FileStackReptNode *)contextStack.top().fileInfo)->iters->size() ? ((struct FileStackReptNode *)contextStack.top().fileInfo)->iters.size()
: 0; : 0;
struct FileStackReptNode *fileInfo = (struct FileStackReptNode *)malloc(sizeof(*fileInfo)); struct FileStackReptNode *fileInfo = new(std::nothrow) struct FileStackReptNode();
if (fileInfo) if (!fileInfo) {
fileInfo->iters = new std::vector<uint32_t>();
if (!fileInfo || !fileInfo->iters) {
error("Failed to alloc file info for REPT: %s\n", strerror(errno)); error("Failed to alloc file info for REPT: %s\n", strerror(errno));
return false; return false;
} }
fileInfo->node.type = NODE_REPT; fileInfo->node.type = NODE_REPT;
if (reptDepth) { if (reptDepth) {
// Copy all parent iter counts // Copy all parent iter counts
*fileInfo->iters = *((struct FileStackReptNode *)contextStack.top().fileInfo)->iters; fileInfo->iters = ((struct FileStackReptNode *)contextStack.top().fileInfo)->iters;
} }
fileInfo->iters->insert(fileInfo->iters->begin(), 1); fileInfo->iters.insert(fileInfo->iters.begin(), 1);
struct Context &context = newContext((struct FileStackNode *)fileInfo); struct Context &context = newContext((struct FileStackNode *)fileInfo);
@@ -511,12 +505,11 @@ void fstk_Init(char const *mainPath, size_t maxDepth)
fatalerror("Failed to open main file\n"); fatalerror("Failed to open main file\n");
lexer_SetState(state); lexer_SetState(state);
char const *fileName = lexer_GetFileName(); char const *fileName = lexer_GetFileName();
struct FileStackNamedNode *fileInfo = (struct FileStackNamedNode *)malloc(sizeof(*fileInfo)); struct FileStackNamedNode *fileInfo = new(std::nothrow) struct FileStackNamedNode();
if (fileInfo) if (!fileInfo)
fileInfo->name = new(std::nothrow) std::string(fileName);
if (!fileInfo || !fileInfo->name)
fatalerror("Failed to allocate memory for main file info: %s\n", strerror(errno)); fatalerror("Failed to allocate memory for main file info: %s\n", strerror(errno));
fileInfo->name = fileName;
struct Context &context = contextStack.emplace(); struct Context &context = contextStack.emplace();

8
src/asm/output.cpp
View File

@@ -336,14 +336,14 @@ static void writeFileStackNode(struct FileStackNode const *node, FILE *f)
putlong(node->lineNo, f); putlong(node->lineNo, f);
putc(node->type, f); putc(node->type, f);
if (node->type != NODE_REPT) { if (node->type != NODE_REPT) {
putstring(((struct FileStackNamedNode const *)node)->name->c_str(), f); putstring(((struct FileStackNamedNode const *)node)->name.c_str(), f);
} else { } else {
struct FileStackReptNode const *reptNode = (struct FileStackReptNode const *)node; struct FileStackReptNode const *reptNode = (struct FileStackReptNode const *)node;
putlong(reptNode->iters->size(), f); putlong(reptNode->iters.size(), f);
// Iters are stored by decreasing depth, so reverse the order for output // Iters are stored by decreasing depth, so reverse the order for output
for (uint32_t i = reptNode->iters->size(); i--; ) for (uint32_t i = reptNode->iters.size(); i--; )
putlong((*reptNode->iters)[i], f); putlong(reptNode->iters[i], f);
} }
} }