Working on optimizations

[cc65] / src / cc65 / coptadd.c

diff --git a/src/cc65/coptadd.c b/src/cc65/coptadd.c
index fd30a41cf2a7f48a1882b991bc98bb775e2d1591..ebda0fb5db070548b6afb665db15b1c48169e8da 100644 (file)
--- a/src/cc65/coptadd.c
+++ b/src/cc65/coptadd.c
@@ -146,25 +146,25 @@ unsigned OptAdd1 (CodeSeg* S)
 unsigned OptAdd2 (CodeSeg* S)
 /* Search for the sequence
  *
- *             ldy     #xx
+ *             ldy     #yy
  *      lda     (sp),y
  *     tax
- *      dey
+ *      ldy     #xx
  *      lda     (sp),y
- *      ldy     #$yy
+ *      ldy     #zz
  *      jsr     addeqysp
  *
  * and replace it by:
  *
- *      ldy     #xx-1
+ *      ldy     #xx
  *      lda     (sp),y
- *      ldy     #yy
+ *      ldy     #zz
  *      clc
  *      adc     (sp),y
  *      sta     (sp),y
- *      ldy     #xx
+ *      ldy     #yy
  *      lda     (sp),y
- *      ldy     #yy+1
+ *      ldy     #zz+1
  *      adc     (sp),y
  *      sta     (sp),y
  *
@@ -191,7 +191,8 @@ unsigned OptAdd2 (CodeSeg* S)
            !CE_HasLabel (L[1])                 &&
            L[2]->OPC == OP65_TAX               &&
            !CE_HasLabel (L[2])                 &&
-           L[3]->OPC == OP65_DEY               &&
+           L[3]->OPC == OP65_LDY               &&
+           CE_KnownImm (L[3])                  &&
                    !CE_HasLabel (L[3])                 &&
            L[4]->OPC == OP65_LDA               &&
            L[4]->AM == AM65_ZP_INDY            &&
@@ -207,44 +208,43 @@ unsigned OptAdd2 (CodeSeg* S)
            CodeEntry* X;
 
 
-           /* Adjust the operand of the first LDY */
-           CE_SetNumArg (L[0], L[0]->Num - 1);
+           /* Insert new code behind the addeqysp */
+           X = NewCodeEntry (OP65_LDY, AM65_IMM, L[3]->Arg, 0, L[3]->LI);
+           CS_InsertEntry (S, X, I+7);
 
-           /* Load Y with the low offset of the target variable */
-           X = NewCodeEntry (OP65_LDY, AM65_IMM, L[5]->Arg, 0, L[1]->LI);
-           CS_InsertEntry (S, X, I+2);
+           X = NewCodeEntry (OP65_LDA, L[4]->AM, L[4]->Arg, 0, L[4]->LI);
+           CS_InsertEntry (S, X, I+8);
 
-           /* Add the CLC */
-           X = NewCodeEntry (OP65_CLC, AM65_IMP, 0, 0, L[1]->LI);
-           CS_InsertEntry (S, X, I+3);
+           X = NewCodeEntry (OP65_LDY, AM65_IMM, L[5]->Arg, 0, L[5]->LI);
+           CS_InsertEntry (S, X, I+9);
 
-           /* Remove the TAX/DEY sequence */
-           CS_DelEntry (S, I+5);      /* dey */
-           CS_DelEntry (S, I+4);      /* tax */
+           X = NewCodeEntry (OP65_CLC, AM65_IMP, 0, 0, L[6]->LI);
+           CS_InsertEntry (S, X, I+10);
 
-           /* Addition of the low byte */
-           X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[4]->LI);
-           CS_InsertEntry (S, X, I+4);
-           X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "sp", 0, L[4]->LI);
-           CS_InsertEntry (S, X, I+5);
+           X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[6]->LI);
+           CS_InsertEntry (S, X, I+11);
+
+           X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "sp", 0, L[6]->LI);
+           CS_InsertEntry (S, X, I+12);
 
-           /* LDY */
-           xsprintf (Buf, sizeof (Buf), "$%02X", (int) (L[0]->Num+1));
-           X = NewCodeEntry (OP65_LDY, AM65_IMM, Buf, 0, L[4]->LI);
-           CS_InsertEntry (S, X, I+6);
+           X = NewCodeEntry (OP65_LDY, AM65_IMM, L[0]->Arg, 0, L[0]->LI);
+           CS_InsertEntry (S, X, I+13);
+
+           X = NewCodeEntry (OP65_LDA, L[1]->AM, L[1]->Arg, 0, L[1]->LI);
+           CS_InsertEntry (S, X, I+14);
 
-           /* Addition of the high byte */
            xsprintf (Buf, sizeof (Buf), "$%02X", (int)(L[5]->Num+1));
            X = NewCodeEntry (OP65_LDY, AM65_IMM, Buf, 0, L[5]->LI);
-           CS_InsertEntry (S, X, I+8);
+           CS_InsertEntry (S, X, I+15);
+
            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[6]->LI);
-           CS_InsertEntry (S, X, I+9);
+           CS_InsertEntry (S, X, I+16);
+
            X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "sp", 0, L[6]->LI);
-           CS_InsertEntry (S, X, I+10);
+           CS_InsertEntry (S, X, I+17);
 
-           /* Delete the remaining stuff */
-           CS_DelEntry (S, I+12);
-           CS_DelEntry (S, I+11);
+           /* Delete the old code */
+           CS_DelEntries (S, I, 7);
 
            /* Remember, we had changes */
            ++Changes;
@@ -314,3 +314,4 @@ unsigned OptAdd3 (CodeSeg* S)
 
 
 
+