6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-06-11 05:29:33 +00:00
Code Issues Projects Releases Wiki Activity

move EXPR_NEARADDR to end of enum list to avoid invalidation of existing object binaries?

Browse Source
This commit is contained in:
bbbradsmith 2019-05-01 02:50:16 -04:00 committed by Oliver Schmidt
parent ac2ecb0b2c
commit 10cefdb456
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ca65/studyexpr.c
View File

@ -1447,10 +1447,6 @@ static void StudyExprInternal (ExprNode* Expr, ExprDesc* D)
StudyWord1 (Expr, D); StudyWord1 (Expr, D);
break; break;
case EXPR_NEARADDR:
StudyNearAddr (Expr, D);
break;
case EXPR_FARADDR: case EXPR_FARADDR:
StudyFarAddr (Expr, D); StudyFarAddr (Expr, D);
break; break;
@ -1459,6 +1455,10 @@ static void StudyExprInternal (ExprNode* Expr, ExprDesc* D)
StudyDWord (Expr, D); StudyDWord (Expr, D);
break; break;
case EXPR_NEARADDR:
StudyNearAddr (Expr, D);
break;
default: default:
Internal ("Unknown Op type: %u", Expr->Op); Internal ("Unknown Op type: %u", Expr->Op);
break; break;

8
src/common/exprdefs.c
View File

@ -210,10 +210,6 @@ static void InternalDumpExpr (const ExprNode* Expr, const ExprNode* (*ResolveSym
printf (" WORD1"); printf (" WORD1");
break; break;
case EXPR_NEARADDR:
printf (" NEARADDR");
break;
case EXPR_FARADDR: case EXPR_FARADDR:
printf (" FARADDR"); printf (" FARADDR");
break; break;
@ -222,6 +218,10 @@ static void InternalDumpExpr (const ExprNode* Expr, const ExprNode* (*ResolveSym
printf (" DWORD"); printf (" DWORD");
break; break;
case EXPR_NEARADDR:
printf (" NEARADDR");
break;
default: default:
AbEnd ("Unknown Op type: %u", Expr->Op); AbEnd ("Unknown Op type: %u", Expr->Op);

6
src/common/exprdefs.h
View File

@ -97,9 +97,9 @@
#define EXPR_BYTE3 (EXPR_UNARYNODE | 0x0B) #define EXPR_BYTE3 (EXPR_UNARYNODE | 0x0B)
#define EXPR_WORD0 (EXPR_UNARYNODE | 0x0C) #define EXPR_WORD0 (EXPR_UNARYNODE | 0x0C)
#define EXPR_WORD1 (EXPR_UNARYNODE | 0x0D) #define EXPR_WORD1 (EXPR_UNARYNODE | 0x0D)
#define EXPR_NEARADDR (EXPR_UNARYNODE | 0x0E) #define EXPR_FARADDR (EXPR_UNARYNODE | 0x0E)
#define EXPR_FARADDR (EXPR_UNARYNODE | 0x0F) #define EXPR_DWORD (EXPR_UNARYNODE | 0x0F)
#define EXPR_DWORD (EXPR_UNARYNODE | 0x10) #define EXPR_NEARADDR (EXPR_UNARYNODE | 0x10)

8
src/ld65/expr.c
View File

@ -436,16 +436,16 @@ long GetExprVal (ExprNode* Expr)
case EXPR_WORD1: case EXPR_WORD1:
return (GetExprVal (Expr->Left) >> 16) & 0xFFFF; return (GetExprVal (Expr->Left) >> 16) & 0xFFFF;
case EXPR_NEARADDR:
/* Assembler was expected to validate this truncation. */
return GetExprVal (Expr->Left) & 0xFFFF;
case EXPR_FARADDR: case EXPR_FARADDR:
return GetExprVal (Expr->Left) & 0xFFFFFF; return GetExprVal (Expr->Left) & 0xFFFFFF;
case EXPR_DWORD: case EXPR_DWORD:
return GetExprVal (Expr->Left) & 0xFFFFFFFF; return GetExprVal (Expr->Left) & 0xFFFFFFFF;
case EXPR_NEARADDR:
/* Assembler was expected to validate this truncation. */
return GetExprVal (Expr->Left) & 0xFFFF;
default: default:
Internal ("Unknown expression Op type: %u", Expr->Op); Internal ("Unknown expression Op type: %u", Expr->Op);
/* NOTREACHED */ /* NOTREACHED */