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

Revamp macro arg system

Browse Source 
This should significantly improve performance: on pokecrystal builds, perf
reported as much CPU time spent on `yyparse` as on `sym_UseNewMacroArgs`
Measurements show ~6 seconds of improvement on that codebase.

This also fixes #321, as a bonus, due to saner management!
This commit is contained in:
ISSOtm
2020-03-14 14:43:09 +01:00
parent 61897d8b52
commit 2f466c2939
15 changed files with 213 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/asm/lexer.c
View File

@@ -583,33 +583,19 @@ struct sLexString *yylex_GetLongestFixed(void)
size_t CopyMacroArg(char *dest, size_t maxLength, char c)
{
size_t i;
char *s;
int32_t argNum;
char const *s;
switch (c) {
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
argNum = c - '0';
break;
case '@':
argNum = -1;
break;
default:
if (c == '@')
s = macro_GetUniqueIDStr();
else if (c >= '1' && c <= '9')
s = macro_GetArg(c - '0');
else
return 0;
}
s = macro_FindArg(argNum);
if (s == NULL)
fatalerror("Macro argument not defined");
fatalerror("Macro argument '\\%c' not defined", c);
// TODO: `strncpy`, nay?
for (i = 0; s[i] != 0; i++) {
if (i >= maxLength)
fatalerror("Macro argument too long to fit buffer");