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

Actually rely on createsymbol never returning NULL

Browse Source 
This reduces complexity, basically
This commit is contained in:
ISSOtm
2020-01-21 11:37:30 +01:00
parent a7c0616cd8
commit 3fb5648880
1 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/asm/symbol.c
View File

@@ -493,13 +493,11 @@ void sym_AddEqu(char *tzSym, int32_t value)
{ {
struct sSymbol *nsym = createNonrelocSymbol(tzSym); struct sSymbol *nsym = createNonrelocSymbol(tzSym);
if (nsym) {
nsym->nValue = value; nsym->nValue = value;
nsym->nType |= SYMF_EQU | SYMF_DEFINED | SYMF_CONST; nsym->nType |= SYMF_EQU | SYMF_DEFINED | SYMF_CONST;
nsym->pScope = NULL; nsym->pScope = NULL;
updateSymbolFilename(nsym); updateSymbolFilename(nsym);
} }
}
/* /*
* Add a string equated symbol. * Add a string equated symbol.
@@ -517,7 +515,6 @@ void sym_AddString(char *tzSym, char *tzValue)
{ {
struct sSymbol *nsym = createNonrelocSymbol(tzSym); struct sSymbol *nsym = createNonrelocSymbol(tzSym);
if (nsym) {
nsym->pMacro = malloc(strlen(tzValue) + 1); nsym->pMacro = malloc(strlen(tzValue) + 1);
if (nsym->pMacro != NULL) if (nsym->pMacro != NULL)
@@ -529,7 +526,6 @@ void sym_AddString(char *tzSym, char *tzValue)
nsym->ulMacroSize = strlen(tzValue); nsym->ulMacroSize = strlen(tzValue);
nsym->pScope = NULL; nsym->pScope = NULL;
} }
}
/* /*
* check if symbol is a string equated symbol * check if symbol is a string equated symbol
@@ -570,13 +566,11 @@ void sym_AddSet(char *tzSym, int32_t value)
nsym = createsymbol(tzSym); nsym = createsymbol(tzSym);
} }
if (nsym) {
nsym->nValue = value; nsym->nValue = value;
nsym->nType |= SYMF_SET | SYMF_DEFINED | SYMF_CONST; nsym->nType |= SYMF_SET | SYMF_DEFINED | SYMF_CONST;
nsym->pScope = NULL; nsym->pScope = NULL;
updateSymbolFilename(nsym); updateSymbolFilename(nsym);
} }
}
/* /*
* Add a local (.name) relocatable symbol * Add a local (.name) relocatable symbol
@@ -634,7 +628,6 @@ void sym_AddReloc(char *tzSym)
nsym = createsymbol(tzSym); nsym = createsymbol(tzSym);
} }
if (nsym) {
nsym->nValue = nPC; nsym->nValue = nPC;
nsym->nType |= SYMF_RELOC | SYMF_DEFINED; nsym->nType |= SYMF_RELOC | SYMF_DEFINED;
if (localPtr) if (localPtr)
@@ -651,7 +644,6 @@ void sym_AddReloc(char *tzSym)
tzSym); tzSym);
updateSymbolFilename(nsym); updateSymbolFilename(nsym);
}
pScope = findsymbol(tzSym, scope); pScope = findsymbol(tzSym, scope);
} }
@@ -713,7 +705,6 @@ void sym_Export(char *tzSym)
if (nsym == NULL) if (nsym == NULL)
nsym = createsymbol(tzSym); nsym = createsymbol(tzSym);
if (nsym)
nsym->nType |= SYMF_EXPORT; nsym->nType |= SYMF_EXPORT;
} }
@@ -724,7 +715,6 @@ void sym_AddMacro(char *tzSym, int32_t nDefLineNo)
{ {
struct sSymbol *nsym = createNonrelocSymbol(tzSym); struct sSymbol *nsym = createNonrelocSymbol(tzSym);
if (nsym) {
nsym->nType |= SYMF_MACRO | SYMF_DEFINED; nsym->nType |= SYMF_MACRO | SYMF_DEFINED;
nsym->pScope = NULL; nsym->pScope = NULL;
nsym->ulMacroSize = ulNewMacroSize; nsym->ulMacroSize = ulNewMacroSize;
@@ -736,7 +726,6 @@ void sym_AddMacro(char *tzSym, int32_t nDefLineNo)
*/ */
nsym->nFileLine = nDefLineNo; nsym->nFileLine = nDefLineNo;
} }
}
/* /*
* Flag that a symbol is referenced in an RPN expression * Flag that a symbol is referenced in an RPN expression
@@ -762,11 +751,10 @@ void sym_Ref(char *tzSym)
nsym = createsymbol(tzSym); nsym = createsymbol(tzSym);
if (nsym && isLocal) if (isLocal)
nsym->nType |= SYMF_LOCAL; nsym->nType |= SYMF_LOCAL;
} }
if (nsym)
nsym->nType |= SYMF_REF; nsym->nType |= SYMF_REF;
} }