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

Renamed the Val field to IVal to allow values of other types later.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@3802 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2007-08-30 20:24:16 +00:00
parent 3894b074a6
commit 47860910e0
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ca65/expr.c
View File

@@ -185,7 +185,7 @@ static int IsEasyConst (const ExprNode* E, long* Val)
/* Symbols resolved, check for a literal */
if (E->Op == EXPR_LITERAL) {
if (Val) {
*Val = E->V.Val;
*Val = E->V.IVal;
}
return 1;
}
@@ -1422,7 +1422,7 @@ ExprNode* GenLiteralExpr (long Val)
/* Return an expression tree that encodes the given literal value */
{
ExprNode* Expr = NewExprNode (EXPR_LITERAL);
Expr->V.Val = Val;
Expr->V.IVal = Val;
return Expr;
}
@@ -1567,7 +1567,7 @@ ExprNode* GenULabelExpr (unsigned Num)
/* Return an expression for an unnamed label with the given index */
{
ExprNode* Node = NewExprNode (EXPR_ULABEL);
Node->V.Val = Num;
Node->V.IVal = Num;
/* Return the new node */
return Node;
@@ -1649,11 +1649,11 @@ ExprNode* CloneExpr (ExprNode* Expr)
switch (Expr->Op) {
case EXPR_LITERAL:
Clone = GenLiteralExpr (Expr->V.Val);
Clone = GenLiteralExpr (Expr->V.IVal);
break;
case EXPR_ULABEL:
Clone = GenULabelExpr (Expr->V.Val);
Clone = GenULabelExpr (Expr->V.IVal);
break;
case EXPR_SYMBOL:
@@ -1695,7 +1695,7 @@ void WriteExpr (ExprNode* Expr)
case EXPR_LITERAL:
ObjWrite8 (EXPR_LITERAL);
ObjWrite32 (Expr->V.Val);
ObjWrite32 (Expr->V.IVal);
break;
case EXPR_SYMBOL:
@@ -1713,7 +1713,7 @@ void WriteExpr (ExprNode* Expr)
break;
case EXPR_ULABEL:
WriteExpr (ULabResolve (Expr->V.Val));
WriteExpr (ULabResolve (Expr->V.IVal));
break;
default:

8
src/ca65/studyexpr.c
View File

@@ -6,8 +6,8 @@
/* */
/* */
/* */
/* (C) 2003 Ullrich von Bassewitz */
/* R<EFBFBD>merstra<EFBFBD>e 52 */
/* (C) 2003-2007 Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
@@ -487,7 +487,7 @@ static void StudyLiteral (ExprNode* Expr, ExprDesc* D)
/* Study a literal expression node */
{
/* This one is easy */
D->Val = Expr->V.Val;
D->Val = Expr->V.IVal;
D->AddrSize = GetConstAddrSize (D->Val);
}
@@ -598,7 +598,7 @@ static void StudyULabel (ExprNode* Expr, ExprDesc* D)
*/
if (ULabCanResolve ()) {
/* We can resolve the label */
StudyExprInternal (ULabResolve (Expr->V.Val), D);
StudyExprInternal (ULabResolve (Expr->V.IVal), D);
} else {
ED_Invalidate (D);
}

6
src/ca65/symentry.c
View File

@@ -6,8 +6,8 @@
/* */
/* */
/* */
/* (C) 1998-2006 Ullrich von Bassewitz */
/* R<EFBFBD>merstra<EFBFBD>e 52 */
/* (C) 1998-2007 Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
@@ -202,7 +202,7 @@ static void SymReplaceExprRefs (SymEntry* S)
* Replace it by a literal node.
*/
E->Op = EXPR_LITERAL;
E->V.Val = Val;
E->V.IVal = Val;
}
/* Remove all symbol references from the symbol */