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

Rename macro functions with proper prefix

Browse Source
This commit is contained in:
ISSOtm
2020-03-13 23:20:27 +01:00
parent ffdb1fbfe5
commit a259f53b52
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/asm/macro.h
View File

@@ -13,15 +13,15 @@
#include "helpers.h" #include "helpers.h"
void sym_AddNewMacroArg(char const *s); void macro_AddNewArg(char const *s);
void sym_SaveCurrentMacroArgs(char *save[]); void macro_SaveCurrentArgs(char *save[]);
void sym_RestoreCurrentMacroArgs(char *save[]); void macro_RestoreCurrentArgs(char *save[]);
void sym_UseNewMacroArgs(void); void macro_UseNewArgs(void);
char *sym_FindMacroArg(int32_t i); char *macro_FindArg(int32_t i);
void sym_UseCurrentMacroArgs(void); void macro_UseCurrentArgs(void);
void sym_SetMacroArgID(uint32_t nMacroCount); void macro_SetArgID(uint32_t nMacroCount);
void sym_ShiftCurrentMacroArgs(void); void macro_ShiftCurrentArgs(void);
uint32_t sym_NbMacroArgs(void); uint32_t macro_NbArgs(void);
void macro_Init(void); void macro_Init(void);

6
src/asm/asmy.y
View File

@@ -709,7 +709,7 @@ macroargs : /* empty */
| macroarg ',' macroargs | macroarg ',' macroargs
; ;
macroarg : T_STRING { sym_AddNewMacroArg($1); } macroarg : T_STRING { macro_AddNewArg($1); }
; ;
pseudoop : equ pseudoop : equ
@@ -792,11 +792,11 @@ fail : T_POP_FAIL string { fatalerror("%s", $2); }
warn : T_POP_WARN string { warning(WARNING_USER, "%s", $2); } warn : T_POP_WARN string { warning(WARNING_USER, "%s", $2); }
; ;
shift : T_POP_SHIFT { sym_ShiftCurrentMacroArgs(); } shift : T_POP_SHIFT { macro_ShiftCurrentArgs(); }
| T_POP_SHIFT uconst { | T_POP_SHIFT uconst {
int32_t i = $2; int32_t i = $2;
while (i--) while (i--)
sym_ShiftCurrentMacroArgs(); macro_ShiftCurrentArgs();
} }
; ;

26
src/asm/fstack.c
View File

@@ -85,14 +85,14 @@ static void pushcontext(void)
switch ((*ppFileStack)->nStatus = nCurrentStatus) { switch ((*ppFileStack)->nStatus = nCurrentStatus) {
case STAT_isMacroArg: case STAT_isMacroArg:
case STAT_isMacro: case STAT_isMacro:
sym_SaveCurrentMacroArgs((*ppFileStack)->tzMacroArgs); macro_SaveCurrentArgs((*ppFileStack)->tzMacroArgs);
(*ppFileStack)->pMacro = pCurrentMacro; (*ppFileStack)->pMacro = pCurrentMacro;
break; break;
case STAT_isInclude: case STAT_isInclude:
(*ppFileStack)->pFile = pCurrentFile; (*ppFileStack)->pFile = pCurrentFile;
break; break;
case STAT_isREPTBlock: case STAT_isREPTBlock:
sym_SaveCurrentMacroArgs((*ppFileStack)->tzMacroArgs); macro_SaveCurrentArgs((*ppFileStack)->tzMacroArgs);
(*ppFileStack)->pREPTBlock = pCurrentREPTBlock; (*ppFileStack)->pREPTBlock = pCurrentREPTBlock;
(*ppFileStack)->nREPTBlockSize = nCurrentREPTBlockSize; (*ppFileStack)->nREPTBlockSize = nCurrentREPTBlockSize;
(*ppFileStack)->nREPTBlockCount = nCurrentREPTBlockCount; (*ppFileStack)->nREPTBlockCount = nCurrentREPTBlockCount;
@@ -122,9 +122,9 @@ static int32_t popcontext(void)
yy_scan_bytes(pCurrentREPTBlock, yy_scan_bytes(pCurrentREPTBlock,
nCurrentREPTBlockSize); nCurrentREPTBlockSize);
yy_switch_to_buffer(CurrentFlexHandle); yy_switch_to_buffer(CurrentFlexHandle);
sym_UseCurrentMacroArgs(); macro_UseCurrentArgs();
sym_SetMacroArgID(nMacroCount++); macro_SetArgID(nMacroCount++);
sym_UseNewMacroArgs(); macro_UseNewArgs();
/* Increment REPT count in file path */ /* Increment REPT count in file path */
pREPTIterationWritePtr = pREPTIterationWritePtr =
@@ -179,14 +179,14 @@ static int32_t popcontext(void)
switch (nCurrentStatus = pLastFile->nStatus) { switch (nCurrentStatus = pLastFile->nStatus) {
case STAT_isMacroArg: case STAT_isMacroArg:
case STAT_isMacro: case STAT_isMacro:
sym_RestoreCurrentMacroArgs(pLastFile->tzMacroArgs); macro_RestoreCurrentArgs(pLastFile->tzMacroArgs);
pCurrentMacro = pLastFile->pMacro; pCurrentMacro = pLastFile->pMacro;
break; break;
case STAT_isInclude: case STAT_isInclude:
pCurrentFile = pLastFile->pFile; pCurrentFile = pLastFile->pFile;
break; break;
case STAT_isREPTBlock: case STAT_isREPTBlock:
sym_RestoreCurrentMacroArgs(pLastFile->tzMacroArgs); macro_RestoreCurrentArgs(pLastFile->tzMacroArgs);
pCurrentREPTBlock = pLastFile->pREPTBlock; pCurrentREPTBlock = pLastFile->pREPTBlock;
nCurrentREPTBlockSize = pLastFile->nREPTBlockSize; nCurrentREPTBlockSize = pLastFile->nREPTBlockSize;
nCurrentREPTBlockCount = pLastFile->nREPTBlockCount; nCurrentREPTBlockCount = pLastFile->nREPTBlockCount;
@@ -431,10 +431,10 @@ uint32_t fstk_RunMacro(char *s)
return 0; return 0;
pushcontext(); pushcontext();
sym_SetMacroArgID(nMacroCount++); macro_SetArgID(nMacroCount++);
/* Minus 1 because there is a newline at the beginning of the buffer */ /* Minus 1 because there is a newline at the beginning of the buffer */
nLineNo = sym->nFileLine - 1; nLineNo = sym->nFileLine - 1;
sym_UseNewMacroArgs(); macro_UseNewArgs();
nCurrentStatus = STAT_isMacro; nCurrentStatus = STAT_isMacro;
nPrintedChars = snprintf(tzCurrentFileName, _MAX_PATH + 1, nPrintedChars = snprintf(tzCurrentFileName, _MAX_PATH + 1,
"%s::%s", sym->tzFileName, s); "%s::%s", sym->tzFileName, s);
@@ -463,7 +463,7 @@ void fstk_RunMacroArg(int32_t s)
else else
s -= '0'; s -= '0';
sym = sym_FindMacroArg(s); sym = macro_FindArg(s);
if (sym == NULL) if (sym == NULL)
fatalerror("No such macroargument"); fatalerror("No such macroargument");
@@ -505,10 +505,10 @@ void fstk_RunRept(uint32_t count, int32_t nReptLineNo)
/* For error printing to make sense, fake nLineNo */ /* For error printing to make sense, fake nLineNo */
nCurrentREPTBodyLastLine = nLineNo; nCurrentREPTBodyLastLine = nLineNo;
nLineNo = nReptLineNo; nLineNo = nReptLineNo;
sym_UseCurrentMacroArgs(); macro_UseCurrentArgs();
pushcontext(); pushcontext();
sym_SetMacroArgID(nMacroCount++); macro_SetArgID(nMacroCount++);
sym_UseNewMacroArgs(); macro_UseNewArgs();
nCurrentREPTBlockCount = count; nCurrentREPTBlockCount = count;
nCurrentStatus = STAT_isREPTBlock; nCurrentStatus = STAT_isREPTBlock;
nCurrentREPTBlockSize = ulNewMacroSize; nCurrentREPTBlockSize = ulNewMacroSize;

8
src/asm/globlex.c
View File

@@ -197,9 +197,9 @@ char *AppendMacroArg(char whichArg, char *dest, size_t *destIndex)
char *marg; char *marg;
if (whichArg == '@') if (whichArg == '@')
marg = sym_FindMacroArg(-1); marg = macro_FindArg(-1);
else if (whichArg >= '1' && whichArg <= '9') else if (whichArg >= '1' && whichArg <= '9')
marg = sym_FindMacroArg(whichArg - '0'); marg = macro_FindArg(whichArg - '0');
else else
fatalerror("Invalid macro argument '\\%c' in symbol", whichArg); fatalerror("Invalid macro argument '\\%c' in symbol", whichArg);
@@ -306,7 +306,7 @@ uint32_t PutMacroArg(char *src, uint32_t size)
yyskipbytes(size); yyskipbytes(size);
if ((size == 2 && src[1] >= '1' && src[1] <= '9')) { if ((size == 2 && src[1] >= '1' && src[1] <= '9')) {
s = sym_FindMacroArg(src[1] - '0'); s = macro_FindArg(src[1] - '0');
if (s != NULL) if (s != NULL)
yyunputstr(s); yyunputstr(s);
@@ -325,7 +325,7 @@ uint32_t PutUniqueArg(char *src, uint32_t size)
yyskipbytes(size); yyskipbytes(size);
s = sym_FindMacroArg(-1); s = macro_FindArg(-1);
if (s != NULL) if (s != NULL)
yyunputstr(s); yyunputstr(s);

2
src/asm/lexer.c
View File

@@ -605,7 +605,7 @@ size_t CopyMacroArg(char *dest, size_t maxLength, char c)
return 0; return 0;
} }
s = sym_FindMacroArg(argNum); s = macro_FindArg(argNum);
if (s == NULL) if (s == NULL)
fatalerror("Macro argument not defined"); fatalerror("Macro argument not defined");

20
src/asm/macro.c
View File

@@ -11,7 +11,7 @@
static char *currentmacroargs[MAXMACROARGS + 1]; static char *currentmacroargs[MAXMACROARGS + 1];
static char *newmacroargs[MAXMACROARGS + 1]; static char *newmacroargs[MAXMACROARGS + 1];
void sym_AddNewMacroArg(char const *s) void macro_AddNewArg(char const *s)
{ {
int32_t i = 0; int32_t i = 0;
@@ -28,7 +28,7 @@ void sym_AddNewMacroArg(char const *s)
} }
} }
void sym_SaveCurrentMacroArgs(char *save[]) void macro_SaveCurrentArgs(char *save[])
{ {
int32_t i; int32_t i;
@@ -38,7 +38,7 @@ void sym_SaveCurrentMacroArgs(char *save[])
} }
} }
void sym_RestoreCurrentMacroArgs(char *save[]) void macro_RestoreCurrentArgs(char *save[])
{ {
int32_t i; int32_t i;
@@ -48,7 +48,7 @@ void sym_RestoreCurrentMacroArgs(char *save[])
} }
} }
void sym_UseNewMacroArgs(void) void macro_UseNewArgs(void)
{ {
int32_t i; int32_t i;
@@ -59,7 +59,7 @@ void sym_UseNewMacroArgs(void)
} }
} }
char *sym_FindMacroArg(int32_t i) char *macro_FindArg(int32_t i)
{ {
if (i == -1) if (i == -1)
i = MAXMACROARGS + 1; i = MAXMACROARGS + 1;
@@ -72,15 +72,15 @@ char *sym_FindMacroArg(int32_t i)
return currentmacroargs[i - 1]; return currentmacroargs[i - 1];
} }
void sym_UseCurrentMacroArgs(void) void macro_UseCurrentArgs(void)
{ {
int32_t i; int32_t i;
for (i = 1; i <= MAXMACROARGS; i++) for (i = 1; i <= MAXMACROARGS; i++)
sym_AddNewMacroArg(sym_FindMacroArg(i)); macro_AddNewArg(macro_FindArg(i));
} }
void sym_SetMacroArgID(uint32_t nMacroCount) void macro_SetArgID(uint32_t nMacroCount)
{ {
char s[256]; char s[256];
@@ -88,7 +88,7 @@ void sym_SetMacroArgID(uint32_t nMacroCount)
newmacroargs[MAXMACROARGS] = strdup(s); newmacroargs[MAXMACROARGS] = strdup(s);
} }
void sym_ShiftCurrentMacroArgs(void) void macro_ShiftCurrentArgs(void)
{ {
int32_t i; int32_t i;
@@ -99,7 +99,7 @@ void sym_ShiftCurrentMacroArgs(void)
currentmacroargs[MAXMACROARGS - 1] = NULL; currentmacroargs[MAXMACROARGS - 1] = NULL;
} }
uint32_t sym_NbMacroArgs(void) uint32_t macro_NbArgs(void)
{ {
uint32_t i = 0; uint32_t i = 0;

2
src/asm/symbol.c
View File

@@ -51,7 +51,7 @@ static bool exportall;
static int32_t Callback_NARG(struct sSymbol const *self) static int32_t Callback_NARG(struct sSymbol const *self)
{ {
(void)self; (void)self;
return sym_NbMacroArgs(); return macro_NbArgs();
} }
static int32_t Callback__LINE__(struct sSymbol const *self) static int32_t Callback__LINE__(struct sSymbol const *self)