6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-25 17:29:50 +00:00
Code Issues Projects Releases Wiki Activity

Also handle the case when the non constant side of the AND expression is

Browse Source 
known to have a smaller size than the constant side of the expression.
This commit is contained in:
mrdudz 2022-04-20 12:53:34 +02:00
parent 6702b3c85e
commit 501da2de2b
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ca65/studyexpr.c
View File

@ -192,6 +192,7 @@ static void ED_MergeAddrSizeAND (ExprNode* Expr, ExprDesc* ED, const ExprDesc* R
/* Merge the address sizes of two expressions into ED, special case for AND operator */ /* Merge the address sizes of two expressions into ED, special case for AND operator */
{ {
int ConstL, ConstR; int ConstL, ConstR;
int Size, ConstSize;
long Val, ValR; long Val, ValR;
if (ED->AddrSize == ADDR_SIZE_DEFAULT) { if (ED->AddrSize == ADDR_SIZE_DEFAULT) {
@ -223,19 +224,33 @@ static void ED_MergeAddrSizeAND (ExprNode* Expr, ExprDesc* ED, const ExprDesc* R
/* If neither part of the expression is constant, the above is all we can do */ /* If neither part of the expression is constant, the above is all we can do */
return; return;
} }
/* Use the constant side of the expression */ /* We start assuming the left side is constant, left value is in Val, right
size in Size */
Size = Right->AddrSize;
/* Now check if the right side is constant, and if so put the right value
into Val and the Left size into Size. */
if (ConstR) { if (ConstR) {
Val = ValR; Val = ValR;
Size = ED->AddrSize;
} }
/* Figure out the size of the constant value and use that as expression size */ /* Figure out the size of the constant value */
if (IsByteRange (Val)) { if (IsByteRange (Val)) {
ED->AddrSize = ADDR_SIZE_ZP; ConstSize = ADDR_SIZE_ZP;
} else if (IsWordRange (Val)) { } else if (IsWordRange (Val)) {
ED->AddrSize = ADDR_SIZE_ABS; ConstSize = ADDR_SIZE_ABS;
} else if (IsFarRange (Val)) { } else if (IsFarRange (Val)) {
ED->AddrSize = ADDR_SIZE_FAR; ConstSize = ADDR_SIZE_FAR;
} else { } else {
ED->AddrSize = ADDR_SIZE_DEFAULT; ConstSize = ADDR_SIZE_DEFAULT;
}
if (Size == ADDR_SIZE_DEFAULT) {
ED->AddrSize = ConstSize;
} else if (ConstSize == ADDR_SIZE_DEFAULT) {
ED->AddrSize = Size;
} else {
/* use the smaller of the two sizes */
ED->AddrSize = (ConstSize < Size) ? ConstSize : Size;
} }
} }