mirror of
https://github.com/cc65/cc65.git
synced 2024-12-23 04:30:10 +00:00
Optimizations, cleanup in codegen
git-svn-id: svn://svn.cc65.org/cc65/trunk@826 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
parent
2dd227534f
commit
1cfec2492e
@ -799,33 +799,18 @@ void g_getind (unsigned flags, unsigned offs)
|
||||
|
||||
case CF_CHAR:
|
||||
/* Character sized */
|
||||
if (offs) {
|
||||
ldyconst (offs);
|
||||
if (flags & CF_UNSIGNED) {
|
||||
AddCodeLine ("jsr ldauidx");
|
||||
} else {
|
||||
AddCodeLine ("jsr ldaidx");
|
||||
}
|
||||
} else {
|
||||
if (flags & CF_UNSIGNED) {
|
||||
if (CodeSizeFactor > 330) {
|
||||
AddCodeLine ("sta ptr1");
|
||||
AddCodeLine ("stx ptr1+1");
|
||||
AddCodeLine ("ldy #$00");
|
||||
AddCodeLine ("ldx #$00");
|
||||
AddCodeLine ("lda (ptr1),y");
|
||||
} else {
|
||||
AddCodeLine ("jsr ldaui");
|
||||
}
|
||||
} else {
|
||||
AddCodeLine ("jsr ldai");
|
||||
}
|
||||
}
|
||||
if (flags & CF_UNSIGNED) {
|
||||
ldyconst (offs);
|
||||
AddCodeLine ("jsr ldauidx");
|
||||
} else {
|
||||
ldyconst (offs);
|
||||
AddCodeLine ("jsr ldaidx");
|
||||
}
|
||||
break;
|
||||
|
||||
case CF_INT:
|
||||
if (flags & CF_TEST) {
|
||||
ldyconst (offs);
|
||||
ldyconst (offs);
|
||||
AddCodeLine ("sta ptr1");
|
||||
AddCodeLine ("stx ptr1+1");
|
||||
AddCodeLine ("lda (ptr1),y");
|
||||
@ -1121,12 +1106,8 @@ void g_putind (unsigned Flags, unsigned Offs)
|
||||
switch (Flags & CF_TYPE) {
|
||||
|
||||
case CF_CHAR:
|
||||
if (Offs) {
|
||||
ldyconst (Offs);
|
||||
AddCodeLine ("jsr staspidx");
|
||||
} else {
|
||||
AddCodeLine ("jsr staspp");
|
||||
}
|
||||
ldyconst (Offs);
|
||||
AddCodeLine ("jsr staspidx");
|
||||
break;
|
||||
|
||||
case CF_INT:
|
||||
|
||||
@ -108,7 +108,7 @@ static const FuncInfo FuncInfoTable[] = {
|
||||
{ "incsp6", REG_NONE, REG_Y },
|
||||
{ "incsp7", REG_NONE, REG_Y },
|
||||
{ "incsp8", REG_NONE, REG_Y },
|
||||
{ "ldaui", REG_AX, REG_AXY },
|
||||
{ "ldaidx", REG_AXY, REG_AX },
|
||||
{ "ldauidx", REG_AXY, REG_AX },
|
||||
{ "ldax0sp", REG_Y, REG_AX },
|
||||
{ "ldaxi", REG_AX, REG_AXY },
|
||||
|
||||
@ -1248,7 +1248,7 @@ static unsigned OptNegAX2 (CodeSeg* S)
|
||||
CS_GetEntries (S, L, I+1, 5) &&
|
||||
L[0]->OPC == OP65_TAX &&
|
||||
L[1]->OPC == OP65_DEY &&
|
||||
L[2]->OPC == OP65_LDA &&
|
||||
L[2]->OPC == OP65_LDA &&
|
||||
L[2]->AM == AM65_ZP_INDY &&
|
||||
strcmp (L[2]->Arg, E->Arg) == 0 &&
|
||||
!CE_HasLabel (L[2]) &&
|
||||
@ -1263,7 +1263,7 @@ static unsigned OptNegAX2 (CodeSeg* S)
|
||||
/* Invert the branch */
|
||||
CE_ReplaceOPC (L[4], GetInverseBranch (L[4]->OPC));
|
||||
|
||||
/* Delete the entries no longer needed. Beware: Deleting entries
|
||||
/* Delete the entries no longer needed. Beware: Deleting entries
|
||||
* will change the indices.
|
||||
*/
|
||||
CS_DelEntry (S, I+4); /* jsr bnegax */
|
||||
@ -1291,7 +1291,7 @@ static unsigned OptNegAX3 (CodeSeg* S)
|
||||
* lda xx
|
||||
* ldx yy
|
||||
* jsr bnegax
|
||||
* jne/jeq ...
|
||||
* jne/jeq ...
|
||||
*
|
||||
* and replace it by
|
||||
*
|
||||
@ -1306,7 +1306,7 @@ static unsigned OptNegAX3 (CodeSeg* S)
|
||||
unsigned I = 0;
|
||||
while (I < CS_GetEntryCount (S)) {
|
||||
|
||||
CodeEntry* L[3];
|
||||
CodeEntry* L[3];
|
||||
|
||||
/* Get next entry */
|
||||
CodeEntry* E = CS_GetEntry (S, I);
|
||||
@ -1349,7 +1349,7 @@ static unsigned OptNegAX3 (CodeSeg* S)
|
||||
static unsigned OptNegAX4 (CodeSeg* S)
|
||||
/* Search for the sequence:
|
||||
*
|
||||
* jsr xxx
|
||||
* jsr xxx
|
||||
* jsr bnega(x)
|
||||
* jeq/jne ...
|
||||
*
|
||||
@ -1392,7 +1392,7 @@ static unsigned OptNegAX4 (CodeSeg* S)
|
||||
} else {
|
||||
/* Test words */
|
||||
X = NewCodeEntry (OP65_STX, AM65_ZP, "tmp1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I+2);
|
||||
CS_InsertEntry (S, X, I+2);
|
||||
X = NewCodeEntry (OP65_ORA, AM65_ZP, "tmp1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I+3);
|
||||
}
|
||||
@ -1419,6 +1419,243 @@ static unsigned OptNegAX4 (CodeSeg* S)
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Optimize stores through pointers */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
static unsigned OptPtrStore1 (CodeSeg* S)
|
||||
/* Search for the sequence:
|
||||
*
|
||||
* jsr pushax
|
||||
* lda xxx
|
||||
* ldy yyy
|
||||
* jsr staspidx
|
||||
*
|
||||
* and replace it by:
|
||||
*
|
||||
* sta ptr1
|
||||
* stx ptr1+1
|
||||
* lda xxx
|
||||
* ldy yyy
|
||||
* sta (ptr1),y
|
||||
*/
|
||||
{
|
||||
unsigned Changes = 0;
|
||||
|
||||
/* Walk over the entries */
|
||||
unsigned I = 0;
|
||||
while (I < CS_GetEntryCount (S)) {
|
||||
|
||||
CodeEntry* L[4];
|
||||
|
||||
/* Get next entry */
|
||||
L[0] = CS_GetEntry (S, I);
|
||||
|
||||
/* Check for the sequence */
|
||||
if (L[0]->OPC == OP65_JSR &&
|
||||
strcmp (L[0]->Arg, "pushax") == 0 &&
|
||||
CS_GetEntries (S, L+1, I+1, 3) &&
|
||||
L[1]->OPC == OP65_LDA &&
|
||||
!CE_HasLabel (L[1]) &&
|
||||
L[2]->OPC == OP65_LDY &&
|
||||
!CE_HasLabel (L[2]) &&
|
||||
L[3]->OPC == OP65_JSR &&
|
||||
strcmp (L[3]->Arg, "staspidx") == 0 &&
|
||||
!CE_HasLabel (L[3])) {
|
||||
|
||||
CodeEntry* X;
|
||||
|
||||
/* Create and insert the stores */
|
||||
X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I);
|
||||
|
||||
X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I+1);
|
||||
|
||||
/* Delete the call to pushax */
|
||||
CS_DelEntry (S, I+2);
|
||||
|
||||
/* Insert the store through ptr1 */
|
||||
X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "ptr1", 0, L[3]->LI);
|
||||
CS_InsertEntry (S, X, I+4);
|
||||
|
||||
/* Delete the call to staspidx */
|
||||
CS_DelEntry (S, I+5);
|
||||
|
||||
/* Remember, we had changes */
|
||||
++Changes;
|
||||
|
||||
}
|
||||
|
||||
/* Next entry */
|
||||
++I;
|
||||
|
||||
}
|
||||
|
||||
/* Return the number of changes made */
|
||||
return Changes;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Optimize loads through pointers */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
static unsigned OptPtrLoad1 (CodeSeg* S)
|
||||
/* Search for the sequence:
|
||||
*
|
||||
* tax
|
||||
* dey
|
||||
* lda (sp),y # May be any destination
|
||||
* ldy ...
|
||||
* jsr ldauidx
|
||||
*
|
||||
* and replace it by:
|
||||
*
|
||||
* sta ptr1+1
|
||||
* dey
|
||||
* lda (sp),y
|
||||
* sta ptr1
|
||||
* ldy ...
|
||||
* ldx #$00
|
||||
* lda (ptr1),y
|
||||
*/
|
||||
{
|
||||
unsigned Changes = 0;
|
||||
|
||||
/* Walk over the entries */
|
||||
unsigned I = 0;
|
||||
while (I < CS_GetEntryCount (S)) {
|
||||
|
||||
CodeEntry* L[5];
|
||||
|
||||
/* Get next entry */
|
||||
L[0] = CS_GetEntry (S, I);
|
||||
|
||||
/* Check for the sequence */
|
||||
if (L[0]->OPC == OP65_TAX &&
|
||||
CS_GetEntries (S, L+1, I+1, 4) &&
|
||||
L[1]->OPC == OP65_DEY &&
|
||||
!CE_HasLabel (L[1]) &&
|
||||
L[2]->OPC == OP65_LDA &&
|
||||
!CE_HasLabel (L[2]) &&
|
||||
L[3]->OPC == OP65_LDY &&
|
||||
!CE_HasLabel (L[3]) &&
|
||||
L[4]->OPC == OP65_JSR &&
|
||||
strcmp (L[4]->Arg, "ldauidx") == 0 &&
|
||||
!CE_HasLabel (L[4])) {
|
||||
|
||||
CodeEntry* X;
|
||||
|
||||
/* Store the high byte and remove the TAX instead */
|
||||
X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1+1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I);
|
||||
CS_DelEntry (S, I+1);
|
||||
|
||||
/* Store the low byte */
|
||||
X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[2]->LI);
|
||||
CS_InsertEntry (S, X, I+3);
|
||||
|
||||
/* Delete the call to ldauidx */
|
||||
CS_DelEntry (S, I+5);
|
||||
|
||||
/* Load high and low byte */
|
||||
X = NewCodeEntry (OP65_LDX, AM65_IMM, "$00", 0, L[3]->LI);
|
||||
CS_InsertEntry (S, X, I+5);
|
||||
X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[3]->LI);
|
||||
CS_InsertEntry (S, X, I+6);
|
||||
|
||||
/* Remember, we had changes */
|
||||
++Changes;
|
||||
|
||||
}
|
||||
|
||||
/* Next entry */
|
||||
++I;
|
||||
|
||||
}
|
||||
|
||||
/* Return the number of changes made */
|
||||
return Changes;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static unsigned OptPtrLoad2 (CodeSeg* S)
|
||||
/* Search for the sequence
|
||||
*
|
||||
* ldy ...
|
||||
* jsr ldauidx
|
||||
*
|
||||
* and replace it by:
|
||||
*
|
||||
* stx ptr1+1
|
||||
* sta ptr1
|
||||
* ldy ...
|
||||
* ldx #$00
|
||||
* lda (ptr1),y
|
||||
*
|
||||
* This step must be execute *after* OptPtrLoad1!
|
||||
*/
|
||||
{
|
||||
unsigned Changes = 0;
|
||||
|
||||
/* Walk over the entries */
|
||||
unsigned I = 0;
|
||||
while (I < CS_GetEntryCount (S)) {
|
||||
|
||||
CodeEntry* L[2];
|
||||
|
||||
/* Get next entry */
|
||||
L[0] = CS_GetEntry (S, I);
|
||||
|
||||
/* Check for the sequence */
|
||||
if (L[0]->OPC == OP65_LDY &&
|
||||
CS_GetEntries (S, L+1, I+1, 1) &&
|
||||
L[1]->OPC == OP65_JSR &&
|
||||
strcmp (L[1]->Arg, "ldauidx") == 0 &&
|
||||
!CE_HasLabel (L[1])) {
|
||||
|
||||
CodeEntry* X;
|
||||
|
||||
/* Store the high byte */
|
||||
X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I);
|
||||
|
||||
/* Store the low byte */
|
||||
X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I+1);
|
||||
|
||||
/* Delete the call to ldauidx */
|
||||
CS_DelEntry (S, I+3);
|
||||
|
||||
/* Load the high and low byte */
|
||||
X = NewCodeEntry (OP65_LDX, AM65_IMM, "$00", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I+3);
|
||||
X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[0]->LI);
|
||||
CS_InsertEntry (S, X, I+4);
|
||||
|
||||
/* Remember, we had changes */
|
||||
++Changes;
|
||||
|
||||
}
|
||||
|
||||
/* Next entry */
|
||||
++I;
|
||||
|
||||
}
|
||||
|
||||
/* Return the number of changes made */
|
||||
return Changes;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
@ -1437,6 +1674,11 @@ struct OptFunc {
|
||||
|
||||
/* Table with optimizer steps - are called in this order */
|
||||
static OptFunc OptFuncs [] = {
|
||||
/* Optimizes stores through pointers */
|
||||
{ OptPtrStore1, "OptPtrStore1", 0 },
|
||||
/* Optimize loads through pointers */
|
||||
{ OptPtrLoad1, "OptPtrLoad1", 0 },
|
||||
{ OptPtrLoad2, "OptPtrLoad2", 0 },
|
||||
/* Optimize subtractions */
|
||||
{ OptSub1, "OptSub1", 0 },
|
||||
{ OptSub2, "OptSub2", 0 },
|
||||
|
||||
Loading…
Reference in New Issue
Block a user