From 47860910e02d36ee8a970e05199847b20915505f Mon Sep 17 00:00:00 2001 From: cuz Date: Thu, 30 Aug 2007 20:24:16 +0000 Subject: [PATCH] Renamed the Val field to IVal to allow values of other types later. git-svn-id: svn://svn.cc65.org/cc65/trunk@3802 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/ca65/expr.c | 14 +++++++------- src/ca65/studyexpr.c | 8 ++++---- src/ca65/symentry.c | 6 +++--- src/common/exprdefs.c | 2 +- src/common/exprdefs.h | 6 +++--- src/ld65/expr.c | 14 +++++++------- src/ld65/o65.c | 6 +++--- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/ca65/expr.c b/src/ca65/expr.c index bf80ac540..7aa936cd4 100644 --- a/src/ca65/expr.c +++ b/src/ca65/expr.c @@ -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: diff --git a/src/ca65/studyexpr.c b/src/ca65/studyexpr.c index f16f3b199..7d2049820 100644 --- a/src/ca65/studyexpr.c +++ b/src/ca65/studyexpr.c @@ -6,8 +6,8 @@ /* */ /* */ /* */ -/* (C) 2003 Ullrich von Bassewitz */ -/* Römerstraß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); } diff --git a/src/ca65/symentry.c b/src/ca65/symentry.c index 077ddd0d3..5d77696d1 100644 --- a/src/ca65/symentry.c +++ b/src/ca65/symentry.c @@ -6,8 +6,8 @@ /* */ /* */ /* */ -/* (C) 1998-2006 Ullrich von Bassewitz */ -/* Römerstraß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 */ diff --git a/src/common/exprdefs.c b/src/common/exprdefs.c index 9c959f32e..cb8ee518e 100644 --- a/src/common/exprdefs.c +++ b/src/common/exprdefs.c @@ -59,7 +59,7 @@ static void InternalDumpExpr (const ExprNode* Expr, const ExprNode* (*ResolveSym case EXPR_LITERAL: case EXPR_ULABEL: - printf (" $%04lX", Expr->V.Val); + printf (" $%04lX", Expr->V.IVal); break; case EXPR_SYMBOL: diff --git a/src/common/exprdefs.h b/src/common/exprdefs.h index af7f6c052..165c60fda 100644 --- a/src/common/exprdefs.h +++ b/src/common/exprdefs.h @@ -6,8 +6,8 @@ /* */ /* */ /* */ -/* (C) 1998-2003 Ullrich von Bassewitz */ -/* Römerstraße 52 */ +/* (C) 1998-2007 Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ /* */ @@ -105,7 +105,7 @@ struct ExprNode { ExprNode* Right; /* Right leaf */ struct ObjData* Obj; /* Object file reference (linker) */ union { - long Val; /* If this is a value */ + long IVal; /* If this is a int value */ struct SymEntry* Sym; /* If this is a symbol */ unsigned SegNum; /* If this is a segment */ unsigned ImpNum; /* If this is an import */ diff --git a/src/ld65/expr.c b/src/ld65/expr.c index 29c61207a..a58aaf9bf 100644 --- a/src/ld65/expr.c +++ b/src/ld65/expr.c @@ -6,8 +6,8 @@ /* */ /* */ /* */ -/* (C) 1998-2003 Ullrich von Bassewitz */ -/* Römerstraße 52 */ +/* (C) 1998-2007 Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ /* */ @@ -62,7 +62,7 @@ static ExprNode* NewExprNode (ObjData* O) N->Left = 0; N->Right = 0; N->Obj = O; - N->V.Val = 0; + N->V.IVal = 0; return N; } @@ -248,7 +248,7 @@ long GetExprVal (ExprNode* Expr) switch (Expr->Op) { case EXPR_LITERAL: - return Expr->V.Val; + return Expr->V.IVal; case EXPR_SYMBOL: /* Get the referenced export */ @@ -389,7 +389,7 @@ ExprNode* LiteralExpr (long Val, ObjData* O) { ExprNode* Expr = NewExprNode (O); Expr->Op = EXPR_LITERAL; - Expr->V.Val = Val; + Expr->V.IVal = Val; return Expr; } @@ -484,7 +484,7 @@ ExprNode* ReadExpr (FILE* F, ObjData* O) switch (Op) { case EXPR_LITERAL: - Expr->V.Val = Read32Signed (F); + Expr->V.IVal = Read32Signed (F); break; case EXPR_SYMBOL: @@ -537,7 +537,7 @@ int EqualExpr (ExprNode* E1, ExprNode* E2) case EXPR_LITERAL: /* Value must be identical */ - return (E1->V.Val == E2->V.Val); + return (E1->V.IVal == E2->V.IVal); case EXPR_SYMBOL: /* Import number must be identical */ diff --git a/src/ld65/o65.c b/src/ld65/o65.c index 714931308..3fd610357 100644 --- a/src/ld65/o65.c +++ b/src/ld65/o65.c @@ -6,8 +6,8 @@ /* */ /* */ /* */ -/* (C) 1999-2005 Ullrich von Bassewitz */ -/* Römerstraße 52 */ +/* (C) 1999-2007 Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ /* */ @@ -353,7 +353,7 @@ static void O65ParseExpr (ExprNode* Expr, ExprDesc* D, int Sign) switch (Expr->Op) { case EXPR_LITERAL: - D->Val += (Sign * Expr->V.Val); + D->Val += (Sign * Expr->V.IVal); break; case EXPR_SYMBOL: