Fixed two compiler warnings.

[cc65] / src / cc65 / coptc02.c

diff --git a/src/cc65/coptc02.c b/src/cc65/coptc02.c
index b7f765c63b4bcb226e4792d4dca8383f8ddc29c0..bffb5acc8da8a3578e5c93fb35a4d4943b042af4 100644 (file)
--- a/src/cc65/coptc02.c
+++ b/src/cc65/coptc02.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2001-2005, Ullrich von Bassewitz                                      */
+/*                Römerstrasse 52                                            */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -131,7 +131,7 @@ unsigned Opt65C02BitOps (CodeSeg* S)
             !CS_RangeHasLabel (S, I+1, 2)                       &&
             CS_GetEntries (S, L+1, I+1, 2)                      &&
             (L[1]->OPC == OP65_AND || L[1]->OPC == OP65_ORA)    &&
-            CE_KnownImm (L[1])                                  &&
+            CE_IsConstImm (L[1])                                &&
             L[2]->OPC == OP65_STA                               &&
             L[2]->AM == L[0]->AM                                &&
             strcmp (L[2]->Arg, L[0]->Arg) == 0                  &&
@@ -146,26 +146,76 @@ unsigned Opt65C02BitOps (CodeSeg* S)
                 /* LDA #XX */
                 sprintf (Buf, "$%02X", (int) ((~L[1]->Num) & 0xFF));
                 X = NewCodeEntry (OP65_LDA, AM65_IMM, Buf, 0, L[1]->LI);
-                CS_InsertEntry (S, X, I);
+                CS_InsertEntry (S, X, I+3);
 
                 /* TRB */
                 X = NewCodeEntry (OP65_TRB, L[0]->AM, L[0]->Arg, 0, L[0]->LI);
-                CS_InsertEntry (S, X, I+1);
+                CS_InsertEntry (S, X, I+4);
 
             } else {
 
                 /* LDA #XX */
                 sprintf (Buf, "$%02X", (int) L[1]->Num);
                 X = NewCodeEntry (OP65_LDA, AM65_IMM, Buf, 0, L[1]->LI);
-                CS_InsertEntry (S, X, I);
+                CS_InsertEntry (S, X, I+3);
 
-                /* TRB */
+                /* TSB */
                 X = NewCodeEntry (OP65_TSB, L[0]->AM, L[0]->Arg, 0, L[0]->LI);
-                CS_InsertEntry (S, X, I+1);
+                CS_InsertEntry (S, X, I+4);
             }
 
             /* Delete the old stuff */
-            CS_DelEntries (S, I+2, 3);
+            CS_DelEntries (S, I, 3);
+
+           /* We had changes */
+           ++Changes;
+       }
+
+       /* Next entry */
+       ++I;
+
+    }
+
+    /* Free register info */
+    CS_FreeRegInfo (S);
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+
+
+unsigned Opt65C02Stores (CodeSeg* S)
+/* Use STZ where possible */
+{
+    unsigned Changes = 0;
+    unsigned I;
+
+    /* Generate register info for this step */
+    CS_GenRegInfo (S);
+
+    /* Walk over the entries */
+    I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+       /* Get next entry */
+               CodeEntry* E = CS_GetEntry (S, I);
+
+       /* Check for a store with a register value of zero and an addressing
+        * mode available with STZ.
+        */
+               if (((E->OPC == OP65_STA && E->RI->In.RegA == 0) ||
+            (E->OPC == OP65_STX && E->RI->In.RegX == 0) ||
+            (E->OPC == OP65_STY && E->RI->In.RegY == 0))       &&
+            (E->AM == AM65_ZP  || E->AM == AM65_ABS ||
+             E->AM == AM65_ZPX || E->AM == AM65_ABSX)) {
+
+            /* Replace by STZ */
+            CodeEntry* X = NewCodeEntry (OP65_STZ, E->AM, E->Arg, 0, E->LI);
+            CS_InsertEntry (S, X, I+1);
+
+            /* Delete the old stuff */
+            CS_DelEntry (S, I);
 
            /* We had changes */
            ++Changes;