Fix the check for constant static local data, which was wrong when the data

[cc65] / src / cc65 / coptptrload.c

diff --git a/src/cc65/coptptrload.c b/src/cc65/coptptrload.c
index 39b69e7d35db070feb2aa4bd89e36892b4bd4813..3a496a1def99eb87c376622ecde9afad7191c0d1 100644 (file)
--- a/src/cc65/coptptrload.c
+++ b/src/cc65/coptptrload.c
@@ -108,7 +108,7 @@ unsigned OptPtrLoad1 (CodeSeg* S)
            CodeEntry* P;
 
             /* Track the insertion point */
-            unsigned IP = I;
+            unsigned IP = I+9;
 
             /* sta ptr1 */
             X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[2]->LI);
@@ -127,8 +127,9 @@ unsigned OptPtrLoad1 (CodeSeg* S)
             }
             CS_InsertEntry (S, X, IP++);
 
-            /* clc is now in the right place */
-            ++IP;
+            /* clc */
+            X = NewCodeEntry (OP65_CLC, AM65_IMP, 0, 0, L[0]->LI);
+            CS_InsertEntry (S, X, IP++);
 
             /* adc yyy */
             X = NewCodeEntry (OP65_ADC, L[4]->AM, L[4]->Arg, 0, L[4]->LI);
@@ -151,7 +152,7 @@ unsigned OptPtrLoad1 (CodeSeg* S)
            CS_InsertEntry (S, X, IP++);
 
             /* Remove the old instructions */
-            CS_DelEntries (S, IP, 8);
+            CS_DelEntries (S, I, 9);
 
            /* Remember, we had changes */
            ++Changes;
@@ -550,7 +551,7 @@ unsigned OptPtrLoad6 (CodeSeg* S)
 /* Search for the sequence:
  *
  *      jsr     pushax
- *      ldy     xxx
+ *      ldy     #xxx
  *      ldx     #$00
  *      lda     (sp),y
  *      jsr     tosaddax
@@ -561,7 +562,7 @@ unsigned OptPtrLoad6 (CodeSeg* S)
  *
  *      sta     ptr1
  *      stx     ptr1+1
- *      ldy     xxx
+ *      ldy     #xxx-2
  *      lda     (sp),y
  *      tay
  *      ldx     #$00
@@ -583,6 +584,8 @@ unsigned OptPtrLoad6 (CodeSeg* S)
                if (CE_IsCallTo (L[0], "pushax")                &&
                    CS_GetEntries (S, L+1, I+1, 6)              &&
             L[1]->OPC == OP65_LDY                       &&
+            CE_IsConstImm (L[1])                        &&
+            L[1]->Num >= 2                              &&
                    L[2]->OPC == OP65_LDX                       &&
             CE_IsKnownImm (L[2], 0)                     &&
             L[3]->OPC == OP65_LDA                       &&
@@ -591,9 +594,11 @@ unsigned OptPtrLoad6 (CodeSeg* S)
             L[5]->OPC == OP65_LDY                       &&
             CE_IsKnownImm (L[5], 0)                     &&
             CE_IsCallTo (L[6], "ldauidx")               &&
-                   !CS_RangeHasLabel (S, I+1, 6)) {
+                   !CS_RangeHasLabel (S, I+1, 6)               &&
+            !RegYUsed (S, I+7)) {
 
-           CodeEntry* X;
+           CodeEntry*  X;
+            const char* Arg;
 
             /* sta ptr1 */
             X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
@@ -603,8 +608,9 @@ unsigned OptPtrLoad6 (CodeSeg* S)
             X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[0]->LI);
             CS_InsertEntry (S, X, I+8);
 
-            /* ldy yyy */
-            X = NewCodeEntry (OP65_LDY, L[1]->AM, L[1]->Arg, 0, L[1]->LI);
+            /* ldy #xxx-2 */
+            Arg = MakeHexArg (L[1]->Num - 2);
+            X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[1]->LI);
             CS_InsertEntry (S, X, I+9);
 
             /* lda (sp),y */
@@ -1330,22 +1336,28 @@ unsigned OptPtrLoad16 (CodeSeg* S)
 
            CodeEntry* X;
 
-                   /* Store the high byte */
-                   X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
-           CS_InsertEntry (S, X, I);
+                   /* stx ptr1+1 */
+                   X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[1]->LI);
+           CS_InsertEntry (S, X, I+2);
 
-           /* Store the low byte */
-           X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[0]->LI);
-           CS_InsertEntry (S, X, I+1);
+           /* sta ptr1 */
+           X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[1]->LI);
+           CS_InsertEntry (S, X, I+3);
 
-           /* Delete the call to ldauidx */
-           CS_DelEntry (S, I+3);
+            /* ldy ... */
+           X = NewCodeEntry (L[0]->OPC, L[0]->AM, L[0]->Arg, 0, L[0]->LI);
+           CS_InsertEntry (S, X, I+4);
 
-           /* 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);
+           /* ldx #$00 */
+           X = NewCodeEntry (OP65_LDX, AM65_IMM, "$00", 0, L[1]->LI);
+           CS_InsertEntry (S, X, I+5);
+
+            /* lda (ptr1),y */
+           X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[1]->LI);
+           CS_InsertEntry (S, X, I+6);
+
+           /* Delete the old code */
+           CS_DelEntries (S, I, 2);
 
            /* Remember, we had changes */
            ++Changes;