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

Use sym_FindSymbol() where possible

Browse Source
This commit is contained in:
dbrotz
2019-05-05 18:10:05 -07:00
parent 23f5e9dacc
commit 8da4feb83c
1 changed files with 8 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/asm/symbol.c
View File

@@ -207,7 +207,7 @@ struct sSymbol *findsymbol(char *s, struct sSymbol *scope)
} }
/* /*
* Find a symbol by name and scope * Find a symbol by name, with automatically determined scope
*/ */
struct sSymbol *sym_FindSymbol(char *tzName) struct sSymbol *sym_FindSymbol(char *tzName)
{ {
@@ -256,14 +256,7 @@ void sym_Purge(char *tzName)
*/ */
uint32_t sym_isConstDefined(char *tzName) uint32_t sym_isConstDefined(char *tzName)
{ {
struct sSymbol *psym, *pscope; struct sSymbol *psym = sym_FindSymbol(tzName);
if (*tzName == '.')
pscope = pScope;
else
pscope = NULL;
psym = findsymbol(tzName, pscope);
if (psym && (psym->nType & SYMF_DEFINED)) { if (psym && (psym->nType & SYMF_DEFINED)) {
uint32_t mask = SYMF_EQU | SYMF_SET | SYMF_MACRO | SYMF_STRING; uint32_t mask = SYMF_EQU | SYMF_SET | SYMF_MACRO | SYMF_STRING;
@@ -280,19 +273,9 @@ uint32_t sym_isConstDefined(char *tzName)
uint32_t sym_isDefined(char *tzName) uint32_t sym_isDefined(char *tzName)
{ {
struct sSymbol *psym, *pscope; struct sSymbol *psym = sym_FindSymbol(tzName);
if (*tzName == '.') return (psym && (psym->nType & SYMF_DEFINED));
pscope = pScope;
else
pscope = NULL;
psym = findsymbol(tzName, pscope);
if (psym && (psym->nType & SYMF_DEFINED))
return 1;
else
return 0;
} }
/* /*
@@ -300,21 +283,9 @@ uint32_t sym_isDefined(char *tzName)
*/ */
uint32_t sym_isConstant(char *s) uint32_t sym_isConstant(char *s)
{ {
struct sSymbol *psym, *pscope; struct sSymbol *psym = sym_FindSymbol(s);
if (*s == '.') return (psym && (psym->nType & SYMF_CONST));
pscope = pScope;
else
pscope = NULL;
psym = findsymbol(s, pscope);
if (psym != NULL) {
if (psym->nType & SYMF_CONST)
return 1;
}
return 0;
} }
/* /*
@@ -337,14 +308,7 @@ char *sym_GetStringValue(char *tzSym)
*/ */
uint32_t sym_GetConstantValue(char *s) uint32_t sym_GetConstantValue(char *s)
{ {
struct sSymbol *psym, *pscope; struct sSymbol *psym = sym_FindSymbol(s);
if (*s == '.')
pscope = pScope;
else
pscope = NULL;
psym = findsymbol(s, pscope);
if (psym != NULL) { if (psym != NULL) {
if (psym->nType & SYMF_CONST) if (psym->nType & SYMF_CONST)
@@ -363,14 +327,7 @@ uint32_t sym_GetConstantValue(char *s)
*/ */
uint32_t sym_GetDefinedValue(char *s) uint32_t sym_GetDefinedValue(char *s)
{ {
struct sSymbol *psym, *pscope; struct sSymbol *psym = sym_FindSymbol(s);
if (*s == '.')
pscope = pScope;
else
pscope = NULL;
psym = findsymbol(s, pscope);
if (psym != NULL) { if (psym != NULL) {
if ((psym->nType & SYMF_DEFINED)) { if ((psym->nType & SYMF_DEFINED)) {