gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-26 21:12:07 +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

22
src/asm/globlex.c
View File

@@ -192,14 +192,14 @@ uint32_t ParseNumber(char *s, uint32_t size)
* return a pointer to the rest of the macro arg.
* Otherwise, return NULL.
*/
char *AppendMacroArg(char whichArg, char *dest, size_t *destIndex)
char const *AppendMacroArg(char whichArg, char *dest, size_t *destIndex)
{
char *marg;
char const *marg;
if (whichArg == '@')
marg = macro_FindArg(-1);
marg = macro_GetUniqueIDStr();
else if (whichArg >= '1' && whichArg <= '9')
marg = macro_FindArg(whichArg - '0');
marg = macro_GetArg(whichArg - '0');
else
fatalerror("Invalid macro argument '\\%c' in symbol", whichArg);
@@ -236,7 +236,7 @@ uint32_t ParseSymbol(char *src, uint32_t size)
char dest[MAXSYMLEN + 1];
size_t srcIndex = 0;
size_t destIndex = 0;
char *rest = NULL;
char const *rest = NULL;
while (srcIndex < size) {
char ch = src[srcIndex++];
@@ -302,11 +302,11 @@ uint32_t ParseSymbol(char *src, uint32_t size)
uint32_t PutMacroArg(char *src, uint32_t size)
{
char *s;
char const *s;
yyskipbytes(size);
if ((size == 2 && src[1] >= '1' && src[1] <= '9')) {
s = macro_FindArg(src[1] - '0');
s = macro_GetArg(src[1] - '0');
if (s != NULL)
yyunputstr(s);
@@ -318,14 +318,14 @@ uint32_t PutMacroArg(char *src, uint32_t size)
return 0;
}
uint32_t PutUniqueArg(char *src, uint32_t size)
uint32_t PutUniqueID(char *src, uint32_t size)
{
(void)src;
char *s;
char const *s;
yyskipbytes(size);
s = macro_FindArg(-1);
s = macro_GetUniqueIDStr();
if (s != NULL)
yyunputstr(s);
@@ -567,7 +567,7 @@ const struct sLexFloat tMacroArgToken = {
};
const struct sLexFloat tMacroUniqueToken = {
PutUniqueArg,
PutUniqueID,
T_LEX_MACROUNIQUE
};