From: uz Date: Wed, 10 Nov 2010 10:22:55 +0000 (+0000) Subject: SegNum has been renamed to SecNum. X-Git-Tag: V2.13.3~610 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3f24c88355fdc0f811509dbd0e98f291ffe5d45a;p=cc65 SegNum has been renamed to SecNum. git-svn-id: svn://svn.cc65.org/cc65/trunk@4845 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/src/ca65/expr.c b/src/ca65/expr.c index 81465c687..fce0d1579 100644 --- a/src/ca65/expr.c +++ b/src/ca65/expr.c @@ -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 */ { ExprNode* Expr = NewExprNode (EXPR_SECTION); - Expr->V.SegNum = SegNum; + Expr->V.SecNum = SecNum; return Expr; } @@ -1729,7 +1729,7 @@ ExprNode* CloneExpr (ExprNode* Expr) break; case EXPR_SECTION: - Clone = GenSectionExpr (Expr->V.SegNum); + Clone = GenSectionExpr (Expr->V.SecNum); break; default: @@ -1777,7 +1777,7 @@ void WriteExpr (ExprNode* Expr) case EXPR_SECTION: ObjWrite8 (EXPR_SECTION); - ObjWrite8 (Expr->V.SegNum); + ObjWrite8 (Expr->V.SecNum); break; case EXPR_ULABEL: diff --git a/src/ca65/studyexpr.c b/src/ca65/studyexpr.c index 48446e078..33b5c47d0 100644 --- a/src/ca65/studyexpr.c +++ b/src/ca65/studyexpr.c @@ -481,7 +481,7 @@ static void StudyBinaryExpr (ExprNode* Expr, ExprDesc* D) ED_Done (&Right); } - + static void StudyLiteral (ExprNode* Expr, ExprDesc* D) /* Study a literal expression node */ @@ -581,7 +581,7 @@ static void StudySection (ExprNode* Expr, ExprDesc* D) /* Study a section expression node */ { /* 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 */ ++SecRef->Count; @@ -1404,7 +1404,7 @@ void StudyExpr (ExprNode* Expr, ExprDesc* D) */ if (D->AddrSize == ADDR_SIZE_DEFAULT && ED_IsConst (D)) { D->AddrSize = GetConstAddrSize (D->Val); - } + } /* 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