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

Fix constant expression detection functions (#1462)

Browse Source
This commit is contained in:
Sylvie
2024-08-09 03:40:53 -04:00
committed by GitHub
parent a9140e6bb4
commit 2d530dbcd6
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/asm/rpn.cpp
View File

@@ -213,8 +213,8 @@ static bool tryConstNonzero(Expression const &lhs, Expression const &rhs) {
static bool tryConstLogNot(Expression const &expr) {
Symbol const *sym = expr.symbolOf();
if (!sym || !sym->getSection())
return -1;
if (!sym || !sym->getSection() || !sym->isDefined())
return false;
assume(sym->isNumeric());
@@ -238,7 +238,7 @@ static bool tryConstLogNot(Expression const &expr) {
*/
static int32_t tryConstLow(Expression const &expr) {
Symbol const *sym = expr.symbolOf();
if (!sym || !sym->getSection())
if (!sym || !sym->getSection() || !sym->isDefined())
return -1;
assume(sym->isNumeric());
@@ -276,10 +276,11 @@ static int32_t tryConstMask(Expression const &lhs, Expression const &rhs) {
Symbol const &sym = lhsIsSymbol ? *lhsSymbol : *rhsSymbol;
Expression const &expr = lhsIsSymbol ? rhs : lhs; // Opposite side of `sym`
if (!sym.isDefined() || !expr.isKnown())
return -1;
assume(sym.isNumeric());
if (!expr.isKnown())
return -1;
// We can now safely use `expr.value()`
int32_t mask = expr.value();