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

Added optimizer fix originating from Ullrich von Bassewitz prepared by Greg King.

Browse Source
This commit is contained in:
Oliver Schmidt
2013-10-09 21:55:44 +02:00
parent c22c6f28ff
commit f3d74cd166
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/cc65/coptstop.c
View File

@@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2001-2009 Ullrich von Bassewitz */ /* (C) 2001-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@@ -58,7 +58,8 @@ typedef enum {
LI_DIRECT = 0x01, /* Direct op may be used */ LI_DIRECT = 0x01, /* Direct op may be used */
LI_RELOAD_Y = 0x02, /* Reload index register Y */ LI_RELOAD_Y = 0x02, /* Reload index register Y */
LI_REMOVE = 0x04, /* Load may be removed */ LI_REMOVE = 0x04, /* Load may be removed */
LI_DUP_LOAD = 0x08, /* Duplicate load */ LI_DONT_REMOVE = 0x08, /* Load may not be removed */
LI_DUP_LOAD = 0x10, /* Duplicate load */
} LI_FLAGS; } LI_FLAGS;
/* Structure that tells us how to load the lhs values */ /* Structure that tells us how to load the lhs values */
@@ -245,6 +246,18 @@ static void AdjustLoadInfo (LoadInfo* LI, int Index, int Change)
static void HonourUseAndChg (LoadRegInfo* RI, unsigned Reg, const CodeEntry* E)
/* Honour use and change flags for an instruction */
{
if (E->Chg & Reg) {
ClearLoadRegInfo (RI);
} else if ((E->Use & Reg) && RI->LoadIndex >= 0) {
RI->Flags |= LI_DONT_REMOVE;
}
}
static void TrackLoads (LoadInfo* LI, CodeEntry* E, int I) static void TrackLoads (LoadInfo* LI, CodeEntry* E, int I)
/* Track loads for a code entry */ /* Track loads for a code entry */
{ {
@@ -349,15 +362,9 @@ static void TrackLoads (LoadInfo* LI, CodeEntry* E, int I)
ClearLoadRegInfo (&LI->Y); ClearLoadRegInfo (&LI->Y);
} else { } else {
if (E->Chg & REG_A) { HonourUseAndChg (&LI->A, REG_A, E);
ClearLoadRegInfo (&LI->A); HonourUseAndChg (&LI->X, REG_X, E);
} HonourUseAndChg (&LI->Y, REG_Y, E);
if (E->Chg & REG_X) {
ClearLoadRegInfo (&LI->X);
}
if (E->Chg & REG_Y) {
ClearLoadRegInfo (&LI->Y);
}
} }
} }
@@ -646,7 +653,7 @@ static void RemoveRegLoads (StackOpData* D, LoadInfo* LI)
/* Both registers may be loaded with one insn, but DelEntry will in this /* Both registers may be loaded with one insn, but DelEntry will in this
* case clear the other one. * case clear the other one.
*/ */
if (LI->A.Flags & LI_REMOVE) { if ((LI->A.Flags & (LI_REMOVE | LI_DONT_REMOVE)) == LI_REMOVE) {
if (LI->A.LoadIndex >= 0) { if (LI->A.LoadIndex >= 0) {
DelEntry (D, LI->A.LoadIndex); DelEntry (D, LI->A.LoadIndex);
} }
@@ -654,7 +661,7 @@ static void RemoveRegLoads (StackOpData* D, LoadInfo* LI)
DelEntry (D, LI->A.XferIndex); DelEntry (D, LI->A.XferIndex);
} }
} }
if (LI->X.Flags & LI_REMOVE) { if ((LI->X.Flags & (LI_REMOVE | LI_DONT_REMOVE)) == LI_REMOVE) {
if (LI->X.LoadIndex >= 0) { if (LI->X.LoadIndex >= 0) {
DelEntry (D, LI->X.LoadIndex); DelEntry (D, LI->X.LoadIndex);
} }