6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-02-28 05:30:23 +00:00
Code Issues Projects Releases Wiki Activity

No need to simplify an expression in SegDone() if it is replaced by a constant

Browse Source 
anyway.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5372 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2012-01-03 19:40:00 +00:00
parent b16a12d260
commit be77192bcf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ca65/segment.c
View File

@ -295,7 +295,7 @@ void SegAlign (unsigned long Alignment, int FillVal)
Error ("Combined alignment for active segment is %lu which exceeds %lu", Error ("Combined alignment for active segment is %lu which exceeds %lu",
CombinedAlignment, MAX_ALIGNMENT); CombinedAlignment, MAX_ALIGNMENT);
/* Avoid creating large fills for an object file that is thrown away /* Avoid creating large fills for an object file that is thrown away
* later. * later.
*/ */
Count = 1; Count = 1;
@ -372,9 +372,6 @@ void SegDone (void)
ED_Init (&ED); ED_Init (&ED);
StudyExpr (F->V.Expr, &ED); StudyExpr (F->V.Expr, &ED);
/* Try to simplify it before looking further */
F->V.Expr = SimplifyExpr (F->V.Expr, &ED);
/* Check if the expression is constant */ /* Check if the expression is constant */
if (ED_IsConst (&ED)) { if (ED_IsConst (&ED)) {
@ -408,7 +405,10 @@ void SegDone (void)
} }
F->Type = FRAG_LITERAL; F->Type = FRAG_LITERAL;
} else if (ED.AddrSize != ADDR_SIZE_DEFAULT) { } else {
/* Simplify the expression */
F->V.Expr = SimplifyExpr (F->V.Expr, &ED);
/* We cannot evaluate the expression now, leave the job for /* We cannot evaluate the expression now, leave the job for
* the linker. However, we can check if the address size * the linker. However, we can check if the address size