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

Merge pull request #605 from NieDzejkob/invalid-labels

Browse Source 
Don't consider difference of invalid labels constant
This commit is contained in:
Eldred Habert
2020-10-13 10:42:05 +02:00
committed by GitHub
parent e4f5df1306 4c5d5c7085
commit 73396166aa
6 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asm/rpn.c
View File

@@ -309,7 +309,9 @@ bool rpn_IsDiffConstant(struct Expression const *src, struct Symbol const *sym)
if (!sym1 || !sym || sym1->type != SYM_LABEL || sym->type != SYM_LABEL)
return false;
return sym_GetSection(sym1) == sym_GetSection(sym);
struct Section const *section1 = sym_GetSection(sym1);
struct Section const *section2 = sym_GetSection(sym);
return section1 && (section1 == section2);
}
static bool isDiffConstant(struct Expression const *src1,

17
src/asm/symbol.c
View File

@@ -322,23 +322,6 @@ uint32_t sym_GetConstantValue(char const *s)
return 0;
}
/*
* Return a defined symbols value... aborts if not defined yet
*/
uint32_t sym_GetDefinedValue(char const *s)
{
struct Symbol const *sym = sym_FindSymbol(s);
if (sym == NULL || !sym_IsDefined(sym))
error("'%s' not defined\n", s);
else if (!sym_IsNumeric(sym))
error("'%s' is a macro or string symbol\n", s);
else
return sym_GetValue(sym);
return 0;
}
char const *sym_GetCurrentSymbolScope(void)
{
return labelScope;