6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-26 08:32:00 +00:00
Code Issues Projects Releases Wiki Activity

o65.c: missed a link time resolution of EXPR_NEARADDR

Browse Source
This commit is contained in:
bbbradsmith 2019-05-01 03:21:14 -04:00 committed by Oliver Schmidt
parent 10cefdb456
commit 7d14cff6bb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ld65/o65.c
View File

@ -633,7 +633,8 @@ static unsigned O65WriteExpr (ExprNode* E, int Signed, unsigned Size,
if (E->Op == EXPR_BYTE0 || E->Op == EXPR_BYTE1 || if (E->Op == EXPR_BYTE0 || E->Op == EXPR_BYTE1 ||
E->Op == EXPR_BYTE2 || E->Op == EXPR_BYTE3 || E->Op == EXPR_BYTE2 || E->Op == EXPR_BYTE3 ||
E->Op == EXPR_WORD0 || E->Op == EXPR_WORD1 || E->Op == EXPR_WORD0 || E->Op == EXPR_WORD1 ||
E->Op == EXPR_FARADDR || E->Op == EXPR_DWORD) { E->Op == EXPR_FARADDR || E->Op == EXPR_DWORD ||
E->Op == EXPR_NEARADDR) {
/* Use the real expression */ /* Use the real expression */
Expr = E->Left; Expr = E->Left;
} }
@ -678,6 +679,7 @@ static unsigned O65WriteExpr (ExprNode* E, int Signed, unsigned Size,
case EXPR_WORD1: BinVal = (BinVal >> 16) & 0xFFFF; break; case EXPR_WORD1: BinVal = (BinVal >> 16) & 0xFFFF; break;
case EXPR_FARADDR: BinVal &= 0xFFFFFFUL; break; case EXPR_FARADDR: BinVal &= 0xFFFFFFUL; break;
case EXPR_DWORD: BinVal &= 0xFFFFFFFFUL; break; case EXPR_DWORD: BinVal &= 0xFFFFFFFFUL; break;
case EXPR_NEARADDR: BinVal &= 0xFFFF; break;
} }
WriteVal (D->F, BinVal, Size); WriteVal (D->F, BinVal, Size);