SegNum has been renamed to SecNum.
git-svn-id: svn://svn.cc65.org/cc65/trunk@4845 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -1515,11 +1515,11 @@ ExprNode* GenSymExpr (SymEntry* Sym)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
static ExprNode* GenSectionExpr (unsigned SegNum)
|
static ExprNode* GenSectionExpr (unsigned SecNum)
|
||||||
/* Return an expression node for the given section */
|
/* Return an expression node for the given section */
|
||||||
{
|
{
|
||||||
ExprNode* Expr = NewExprNode (EXPR_SECTION);
|
ExprNode* Expr = NewExprNode (EXPR_SECTION);
|
||||||
Expr->V.SegNum = SegNum;
|
Expr->V.SecNum = SecNum;
|
||||||
return Expr;
|
return Expr;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1729,7 +1729,7 @@ ExprNode* CloneExpr (ExprNode* Expr)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPR_SECTION:
|
case EXPR_SECTION:
|
||||||
Clone = GenSectionExpr (Expr->V.SegNum);
|
Clone = GenSectionExpr (Expr->V.SecNum);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@@ -1777,7 +1777,7 @@ void WriteExpr (ExprNode* Expr)
|
|||||||
|
|
||||||
case EXPR_SECTION:
|
case EXPR_SECTION:
|
||||||
ObjWrite8 (EXPR_SECTION);
|
ObjWrite8 (EXPR_SECTION);
|
||||||
ObjWrite8 (Expr->V.SegNum);
|
ObjWrite8 (Expr->V.SecNum);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPR_ULABEL:
|
case EXPR_ULABEL:
|
||||||
|
|||||||
@@ -481,7 +481,7 @@ static void StudyBinaryExpr (ExprNode* Expr, ExprDesc* D)
|
|||||||
ED_Done (&Right);
|
ED_Done (&Right);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void StudyLiteral (ExprNode* Expr, ExprDesc* D)
|
static void StudyLiteral (ExprNode* Expr, ExprDesc* D)
|
||||||
/* Study a literal expression node */
|
/* Study a literal expression node */
|
||||||
@@ -581,7 +581,7 @@ static void StudySection (ExprNode* Expr, ExprDesc* D)
|
|||||||
/* Study a section expression node */
|
/* Study a section expression node */
|
||||||
{
|
{
|
||||||
/* Get the section reference */
|
/* Get the section reference */
|
||||||
ED_SecRef* SecRef = ED_GetSecRef (D, Expr->V.SegNum);
|
ED_SecRef* SecRef = ED_GetSecRef (D, Expr->V.SecNum);
|
||||||
|
|
||||||
/* Update the data and the address size */
|
/* Update the data and the address size */
|
||||||
++SecRef->Count;
|
++SecRef->Count;
|
||||||
@@ -1404,7 +1404,7 @@ void StudyExpr (ExprNode* Expr, ExprDesc* D)
|
|||||||
*/
|
*/
|
||||||
if (D->AddrSize == ADDR_SIZE_DEFAULT && ED_IsConst (D)) {
|
if (D->AddrSize == ADDR_SIZE_DEFAULT && ED_IsConst (D)) {
|
||||||
D->AddrSize = GetConstAddrSize (D->Val);
|
D->AddrSize = GetConstAddrSize (D->Val);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If the expression is valid, throw away the address size and recalculate
|
/* If the expression is valid, throw away the address size and recalculate
|
||||||
* it using the data we have. This is more exact than the on-the-fly
|
* it using the data we have. This is more exact than the on-the-fly
|
||||||
|
|||||||
Reference in New Issue
Block a user