the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Did some renaming and cleanup: Renamed EXPR_SEGMENT to EXPR_SECTION, since

Browse Source 
this is what it really is. Added a real EXPR_SECTION which is now used in
the linker to represent the run address of a segment, provided that it is
requested to be defined. Changed some named in use of EXPR_MEMAREA. Added
handling of the new EXPR_SEGMENT to both, the binary and o65 output format.


git-svn-id: svn://svn.cc65.org/cc65/trunk@1769 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2002-12-14 22:57:00 +00:00
parent f47648ecfb
commit 0774fe273a
10 changed files with 236 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ca65/expr.c
View File

@@ -971,7 +971,7 @@ ExprNode* CurrentPC (void)
if (RelocMode) {
/* Create SegmentBase + Offset */
Left = NewExprNode ();
Left->Op = EXPR_SEGMENT;
Left->Op = EXPR_SECTION;
Left->V.SegNum = GetSegNum ();
Root = NewExprNode ();
@@ -1011,7 +1011,7 @@ ExprNode* BranchExpr (unsigned Offs)
/* Create *+Offs */
if (RelocMode) {
Left = NewExprNode ();
Left->Op = EXPR_SEGMENT;
Left->Op = EXPR_SECTION;
Left->V.SegNum = GetSegNum ();
N = NewExprNode ();
@@ -1176,7 +1176,7 @@ static void CheckByteExpr (const ExprNode* N, int* IsByte)
}
break;
case EXPR_SEGMENT:
case EXPR_SECTION:
if (GetSegType (N->V.SegNum) == SEGTYPE_ZP) {
*IsByte = 1;
}
@@ -1416,7 +1416,7 @@ static ExprNode* RemoveSyms (ExprNode* Expr, int MustClone)
Clone->V.Sym = Expr->V.Sym;
break;
case EXPR_SEGMENT:
case EXPR_SECTION:
Clone->V.SegNum = Expr->V.SegNum;
break;
@@ -1477,7 +1477,7 @@ static ExprNode* ConstExtract (ExprNode* Expr, long* Val, int Sign)
return Left;
} else {
/* Check for SEG - SEG which is now possible */
if (Left->Op == EXPR_SEGMENT && Right->Op == EXPR_SEGMENT &&
if (Left->Op == EXPR_SECTION && Right->Op == EXPR_SECTION &&
Left->V.SegNum == Right->V.SegNum) {
/* SEG - SEG, remove it completely */
FreeExprNode (Left);
@@ -1563,7 +1563,7 @@ ExprNode* CloneExpr (ExprNode* Expr)
Clone->V.Sym = Expr->V.Sym;
break;
case EXPR_SEGMENT:
case EXPR_SECTION:
Clone->V.SegNum = Expr->V.SegNum;
break;
@@ -1606,7 +1606,7 @@ void WriteExpr (ExprNode* Expr)
ObjWrite16 (GetSymIndex (Expr->V.Sym));
break;
case EXPR_SEGMENT:
case EXPR_SECTION:
ObjWrite8 (Expr->V.SegNum);
break;