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

fixed optimization bug where array index is 16-bit, e.g. arr16[i & 0x7f7f]

Browse Source
This commit is contained in:
Steven Hugg
2019-03-15 15:10:58 -04:00
committed by greg-king5
parent dca99d59e5
commit a71f764c33
2 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/cc65/coptptrload.c
View File

@@ -1557,6 +1557,7 @@ unsigned OptPtrLoad18 (CodeSeg* S)
unsigned OptPtrLoad19 (CodeSeg* S) unsigned OptPtrLoad19 (CodeSeg* S)
/* Search for the sequence: /* Search for the sequence:
** **
** ldx #0
** and #mask (any value < 128) ** and #mask (any value < 128)
** jsr aslax1/shlax1 ** jsr aslax1/shlax1
** clc ** clc
@@ -1571,6 +1572,7 @@ unsigned OptPtrLoad19 (CodeSeg* S)
** **
** and replace it by: ** and replace it by:
** **
** ldx #0
** and #mask (remove if == 127) ** and #mask (remove if == 127)
** asl ** asl
** tay ** tay
@@ -1585,71 +1587,75 @@ unsigned OptPtrLoad19 (CodeSeg* S)
I = 0; I = 0;
while (I < CS_GetEntryCount (S)) { while (I < CS_GetEntryCount (S)) {
CodeEntry* L[11]; CodeEntry* L[12];
/* Get next entry */ /* Get next entry */
L[0] = CS_GetEntry (S, I); L[0] = CS_GetEntry (S, I);
/* Check for the sequence */ /* Check for the sequence */
if (L[0]->OPC == OP65_AND && if (L[0]->OPC == OP65_LDX &&
L[0]->AM == AM65_IMM && CE_IsKnownImm(L[0], 0) &&
CE_HasNumArg (L[0]) && L[0]->Num <= 127 && CS_GetEntries (S, L+1, I+1, 11) &&
CS_GetEntries (S, L+1, I+1, 10) && L[1]->OPC == OP65_AND &&
L[1]->OPC == OP65_JSR && L[1]->AM == AM65_IMM &&
(strcmp (L[1]->Arg, "aslax1") == 0 || CE_HasNumArg (L[1]) && L[1]->Num <= 127 &&
strcmp (L[1]->Arg, "shlax1") == 0) && L[2]->OPC == OP65_JSR &&
L[2]->OPC == OP65_CLC && (strcmp (L[2]->Arg, "aslax1") == 0 ||
L[3]->OPC == OP65_ADC && strcmp (L[2]->Arg, "shlax1") == 0) &&
L[4]->OPC == OP65_TAY && L[3]->OPC == OP65_CLC &&
L[5]->OPC == OP65_TXA && L[4]->OPC == OP65_ADC &&
L[6]->OPC == OP65_ADC && L[5]->OPC == OP65_TAY &&
L[7]->OPC == OP65_TAX && L[6]->OPC == OP65_TXA &&
L[8]->OPC == OP65_TYA && L[7]->OPC == OP65_ADC &&
L[9]->OPC == OP65_LDY && L[8]->OPC == OP65_TAX &&
CE_IsKnownImm(L[9], 1) && L[9]->OPC == OP65_TYA &&
strlen(L[3]->Arg) >= 3 && L[10]->OPC == OP65_LDY &&
L[3]->Arg[0] == '<' && CE_IsKnownImm(L[10], 1) &&
strlen(L[6]->Arg) >= 3 && strlen(L[4]->Arg) >= 3 &&
L[6]->Arg[0] == '>' && L[4]->Arg[0] == '<' &&
!strcmp(L[3]->Arg+1, L[6]->Arg+1) && strlen(L[7]->Arg) >= 3 &&
CE_IsCallTo (L[10], "ldaxidx") && L[7]->Arg[0] == '>' &&
!CS_RangeHasLabel (S, I+1, 10)) { !strcmp(L[4]->Arg+1, L[7]->Arg+1) &&
CE_IsCallTo (L[11], "ldaxidx") &&
!CS_RangeHasLabel (S, I+1, 11)) {
CodeEntry* X; CodeEntry* X;
char* Label; char* Label;
int Len = strlen(L[3]->Arg); int Len = strlen(L[4]->Arg);
/* Track the insertion point */ /* Track the insertion point */
unsigned IP = I + 11; unsigned IP = I + 12;
/* asl a */ /* asl a */
X = NewCodeEntry (OP65_ASL, AM65_ACC, "a", 0, L[1]->LI); X = NewCodeEntry (OP65_ASL, AM65_ACC, "a", 0, L[2]->LI);
CS_InsertEntry (S, X, IP++); CS_InsertEntry (S, X, IP++);
/* tay */ /* tay */
X = NewCodeEntry (OP65_TAY, AM65_IMP, 0, 0, L[1]->LI); X = NewCodeEntry (OP65_TAY, AM65_IMP, 0, 0, L[2]->LI);
CS_InsertEntry (S, X, IP++); CS_InsertEntry (S, X, IP++);
/* lda label,y */ /* lda label,y */
Label = memcpy (xmalloc (Len-2), L[3]->Arg+2, Len-3); Label = memcpy (xmalloc (Len-2), L[4]->Arg+2, Len-3);
Label[Len-3] = '\0'; Label[Len-3] = '\0';
X = NewCodeEntry (OP65_LDA, AM65_ABSY, Label, 0, L[9]->LI); X = NewCodeEntry (OP65_LDA, AM65_ABSY, Label, 0, L[10]->LI);
CS_InsertEntry (S, X, IP++); CS_InsertEntry (S, X, IP++);
xfree (Label); xfree (Label);
/* lda label+1,y */ /* lda label+1,y */
Label = memcpy (xmalloc (Len), L[3]->Arg+2, Len-3); Label = memcpy (xmalloc (Len), L[4]->Arg+2, Len-3);
strcpy(&Label[Len-3], "+1"); strcpy(&Label[Len-3], "+1");
X = NewCodeEntry (OP65_LDX, AM65_ABSY, Label, 0, L[9]->LI); X = NewCodeEntry (OP65_LDX, AM65_ABSY, Label, 0, L[10]->LI);
CS_InsertEntry (S, X, IP++); CS_InsertEntry (S, X, IP++);
xfree (Label); xfree (Label);
/* Remove the old code */ /* Remove the old code */
/* Remove the AND only if it's == 127, since ASL erases high bit */ /* Remove the AND only if it's == 127, since ASL erases high bit */
if (L[0]->Num == 127) if (L[1]->Num == 127)
CS_DelEntries (S, I, 11); CS_DelEntries (S, I+1, 11);
else else
CS_DelEntries (S, I+1, 10); CS_DelEntries (S, I+2, 10);
/* Remove the ldx #0 */
CS_DelEntry(S, I);
/* Remember, we had changes */ /* Remember, we had changes */
++Changes; ++Changes;

2
src/cc65/coptptrload.h
View File

@@ -382,6 +382,7 @@ unsigned OptPtrLoad18 (CodeSeg* S);
unsigned OptPtrLoad19 (CodeSeg* S); unsigned OptPtrLoad19 (CodeSeg* S);
/* Search for the sequence: /* Search for the sequence:
** **
** ldx #0
** and #mask (any value < 128) ** and #mask (any value < 128)
** jsr aslax1/shlax1 ** jsr aslax1/shlax1
** clc ** clc
@@ -396,6 +397,7 @@ unsigned OptPtrLoad19 (CodeSeg* S);
** **
** and replace it by: ** and replace it by:
** **
** ldx #0
** and #mask (remove if == 127) ** and #mask (remove if == 127)
** asl ** asl
** tay ** tay