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

Don't remove symbols or otherwise simplify expressions while assembly is

Browse Source 
still in progress. There may be information that is needed, and when
assembly is done it is still time to do so. (Needs more work).
Better expression checks for fragments. Stuff that was detected by the
linker before is now handled by the assembler.


git-svn-id: svn://svn.cc65.org/cc65/trunk@2700 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2003-11-30 21:47:40 +00:00
parent cf7b4e227a
commit 9ebc3d1f01
6 changed files with 109 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/ca65/expr.c
View File

@@ -204,13 +204,8 @@ static ExprNode* Symbol (SymEntry* S)
} else {
/* Mark the symbol as referenced */
SymRef (S);
/* Remove the symbol if possible */
if (SymHasExpr (S)) {
return CloneExpr (GetSymExpr (S));
} else {
/* Create symbol node */
return GenSymExpr (S);
}
/* Create symbol node */
return GenSymExpr (S);
}
}
@@ -1117,16 +1112,7 @@ ExprNode* Expression (void)
* a pointer to the root of the tree.
*/
{
#if 1
return SimplifyExpr (Expr0 ());
#else
/* Test code */
ExprNode* Expr = Expr0 ();
printf ("Before: "); DumpExpr (Expr, SymResolve);
Expr = SimplifyExpr (Expr);
printf ("After: "); DumpExpr (Expr, SymResolve);
return Expr;
#endif
return Expr0 ();
}
@@ -1139,13 +1125,8 @@ long ConstExpression (void)
{
long Val;
#if 1
/* Read the expression */
ExprNode* Expr = Expr0 ();
#else
/* Test code */
ExprNode* Expr = Expression ();
#endif
/* Study the expression */
ExprDesc D;
@@ -1182,27 +1163,13 @@ void FreeExpr (ExprNode* Root)
ExprNode* SimplifyExpr (ExprNode* Expr)
ExprNode* SimplifyExpr (ExprNode* Expr, const ExprDesc* D)
/* Try to simplify the given expression tree */
{
if (Expr && Expr->Op != EXPR_LITERAL) {
/* Create an expression description and initialize it */
ExprDesc D;
ED_Init (&D);
/* Study the expression */
StudyExpr (Expr, &D);
/* Now check if we can generate a literal value */
if (ED_IsConst (&D)) {
/* No external references */
FreeExpr (Expr);
Expr = GenLiteralExpr (D.Val);
}
/* Free allocated memory */
ED_Done (&D);
if (Expr->Op != EXPR_LITERAL && ED_IsConst (D)) {
/* No external references */
FreeExpr (Expr);
Expr = GenLiteralExpr (D->Val);
}
return Expr;
}
@@ -1243,10 +1210,19 @@ static ExprNode* GenSectionExpr (unsigned SegNum)
ExprNode* GenAddExpr (ExprNode* Left, ExprNode* Right)
/* Generate an addition from the two operands */
{
ExprNode* Root = NewExprNode (EXPR_PLUS);
Root->Left = Left;
Root->Right = Right;
return Root;
long Val;
if (IsEasyConst (Left, &Val) && Val == 0) {
FreeExpr (Left);
return Right;
} else if (IsEasyConst (Right, &Val) && Val == 0) {
FreeExpr (Right);
return Left;
} else {
ExprNode* Root = NewExprNode (EXPR_PLUS);
Root->Left = Left;
Root->Right = Right;
return Root;
}
}