Fixed two compiler warnings.

[cc65] / src / cc65 / coptptrload.c

diff --git a/src/cc65/coptptrload.c b/src/cc65/coptptrload.c
index 99118cefc1bf7676fecc172e179b64c882049862..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;
@@ -566,7 +567,6 @@ unsigned OptPtrLoad6 (CodeSeg* S)
  *      tay
  *      ldx     #$00
  *      lda     (ptr1),y
- *      ldy     #$00
  */
 {
     unsigned Changes = 0;
@@ -594,7 +594,8 @@ 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;
             const char* Arg;
@@ -628,10 +629,6 @@ unsigned OptPtrLoad6 (CodeSeg* S)
            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[6]->LI);
            CS_InsertEntry (S, X, I+13);
 
-            /* ldy #$00 (will eventually get removed later) */
-            X = NewCodeEntry (OP65_LDY, AM65_IMM, "$00", 0, L[5]->LI);
-            CS_InsertEntry (S, X, I+14);
-
            /* Remove the old code */
            CS_DelEntries (S, I, 7);
 
@@ -1339,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);
+
+            /* ldy ... */
+           X = NewCodeEntry (L[0]->OPC, L[0]->AM, L[0]->Arg, 0, L[0]->LI);
+           CS_InsertEntry (S, X, I+4);
 
-           /* Delete the call to ldauidx */
-           CS_DelEntry (S, I+3);
+           /* ldx #$00 */
+           X = NewCodeEntry (OP65_LDX, AM65_IMM, "$00", 0, L[1]->LI);
+           CS_InsertEntry (S, X, I+5);
 
-           /* 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);
+            /* 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;