]> git.sur5r.net Git - cc65/blobdiff - src/cc65/codeent.c
Added better code to replace tossubax.
[cc65] / src / cc65 / codeent.c
index e37d079f50a16df7edef3b5dc7400062069a075f..aed401d88a0214e86c7424d309d39818ba88f7b9 100644 (file)
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
 
 
 #include <stdlib.h>
-#include <string.h>
 
 /* common */
 #include "chartype.h"
 #include "check.h"
+#include "debugflag.h"
 #include "xmalloc.h"
 #include "xsprintf.h"
 
 /* cc65 */
+#include "codeent.h"
 #include "codeinfo.h"
 #include "error.h"
 #include "global.h"
 #include "codelab.h"
 #include "opcodes.h"
-#include "codeent.h"
+#include "output.h"
 
 
 
@@ -137,13 +138,13 @@ static int NumArg (const char* Arg, unsigned long* Num)
 static void SetUseChgInfo (CodeEntry* E, const OPCDesc* D)
 /* Set the Use and Chg in E */
 {
-    unsigned short Use;
+    const ZPInfo* Info;
 
     /* If this is a subroutine call, or a jump to an external function,
      * lookup the information about this function and use it. The jump itself
      * does not change any registers, so we don't need to use the data from D.
      */
-    if ((E->Info & (OF_BRA | OF_CALL)) != 0 && E->JumpTo == 0) {
+    if ((E->Info & (OF_UBRA | OF_CALL)) != 0 && E->JumpTo == 0) {
        /* A subroutine call or jump to external symbol (function exit) */
        GetFuncInfo (E->Arg, &E->Use, &E->Chg);
     } else {
@@ -156,26 +157,36 @@ static void SetUseChgInfo (CodeEntry* E, const OPCDesc* D)
        /* Check for special zero page registers used */
        switch (E->AM) {
 
+           case AM65_ACC:
+               if (E->OPC == OP65_ASL || E->OPC == OP65_DEC ||
+                   E->OPC == OP65_INC || E->OPC == OP65_LSR ||
+                   E->OPC == OP65_ROL || E->OPC == OP65_ROR) {
+                   /* A is changed by these insns */
+                   E->Chg |= REG_A;
+               }
+                break;
+
            case AM65_ZP:
            case AM65_ABS:
            /* Be conservative: */
            case AM65_ZPX:
            case AM65_ABSX:
            case AM65_ABSY:
-               if (IsZPName (E->Arg, &Use) && Use != REG_NONE) {
+               Info = GetZPInfo (E->Arg);
+               if (Info && Info->ByteUse != REG_NONE) {
                    if (E->OPC == OP65_ASL || E->OPC == OP65_DEC ||
-                       E->OPC == OP65_INC || E->OPC == OP65_LSR ||
-                       E->OPC == OP65_ROL || E->OPC == OP65_ROR ||
-                       E->OPC == OP65_TRB || E->OPC == OP65_TSB) {
-                       /* The zp loc is both, input and output */
-                       E->Chg |= Use;
-                       E->Use |= Use;
+                       E->OPC == OP65_INC || E->OPC == OP65_LSR ||
+                       E->OPC == OP65_ROL || E->OPC == OP65_ROR ||
+                       E->OPC == OP65_TRB || E->OPC == OP65_TSB) {
+                       /* The zp loc is both, input and output */
+                       E->Chg |= Info->ByteUse;
+                       E->Use |= Info->ByteUse;
                    } else if ((E->Info & OF_STORE) != 0) {
-                       /* Just output */
-                       E->Chg |= Use;
+                       /* Just output */
+                       E->Chg |= Info->ByteUse;
                    } else {
-                       /* Input only */
-                       E->Use |= Use;
+                       /* Input only */
+                       E->Use |= Info->ByteUse;
                    }
                }
                break;
@@ -183,9 +194,10 @@ static void SetUseChgInfo (CodeEntry* E, const OPCDesc* D)
            case AM65_ZPX_IND:
            case AM65_ZP_INDY:
            case AM65_ZP_IND:
-               if (IsZPName (E->Arg, &Use) && Use != REG_NONE) {
+               Info = GetZPInfo (E->Arg);
+               if (Info && Info->ByteUse != REG_NONE) {
                    /* These addressing modes will never change the zp loc */
-                   E->Use |= Use;
+                   E->Use |= Info->WordUse;
                }
                break;
 
@@ -204,6 +216,21 @@ static void SetUseChgInfo (CodeEntry* E, const OPCDesc* D)
 
 
 
+const char* MakeHexArg (unsigned Num)
+/* Convert Num into a string in the form $XY, suitable for passing it as an
+ * argument to NewCodeEntry, and return a pointer to the string.
+ * BEWARE: The function returns a pointer to a static buffer, so the value is
+ * gone if you call it twice (and apart from that it's not thread and signal
+ * safe).
+ */
+{
+    static char Buf[16];
+    xsprintf (Buf, sizeof (Buf), "$%02X", (unsigned char) Num);
+    return Buf;
+}
+
+
+
 CodeEntry* NewCodeEntry (opc_t OPC, am_t AM, const char* Arg,
                         CodeLabel* JumpTo, LineInfo* LI)
 /* Create a new code entry, initialize and return it */
@@ -217,10 +244,10 @@ CodeEntry* NewCodeEntry (opc_t OPC, am_t AM, const char* Arg,
     /* Initialize the fields */
     E->OPC    = D->OPC;
     E->AM     = AM;
+    E->Size   = GetInsnSize (E->OPC, E->AM);
     E->Arg    = GetArgCopy (Arg);
-    E->Flags  = NumArg (E->Arg, &E->Num)? CEF_NUMARG : 0;
+    E->Flags  = NumArg (E->Arg, &E->Num)? CEF_NUMARG : 0;   /* Needs E->Arg */
     E->Info   = D->Info;
-    E->Size   = GetInsnSize (E->OPC, E->AM);
     E->JumpTo = JumpTo;
     E->LI     = UseLineInfo (LI);
     E->RI     = 0;
@@ -279,7 +306,7 @@ void CE_ReplaceOPC (CodeEntry* E, opc_t OPC)
 int CodeEntriesAreEqual (const CodeEntry* E1, const CodeEntry* E2)
 /* Check if both code entries are equal */
 {
-    return E1->OPC == E2->OPC && E1->AM == E2->AM && strcmp (E1->Arg, E2->Arg) == 0;
+    return (E1->OPC == E2->OPC && E1->AM == E2->AM && strcmp (E1->Arg, E2->Arg) == 0);
 }
 
 
@@ -296,6 +323,22 @@ void CE_AttachLabel (CodeEntry* E, CodeLabel* L)
 
 
 
+void CE_ClearJumpTo (CodeEntry* E)
+/* Clear the JumpTo entry and the argument (which contained the name of the
+ * label). Note: The function will not clear the backpointer from the label,
+ * so use it with care.
+ */
+{
+    /* Clear the JumpTo entry */
+    E->JumpTo = 0;
+
+    /* Clear the argument and assign the empty one */
+    FreeArg (E->Arg);
+    E->Arg = EmptyArg;
+}
+
+
+
 void CE_MoveLabel (CodeLabel* L, CodeEntry* E)
 /* Move the code label L from it's former owner to the code entry E. */
 {
@@ -309,6 +352,18 @@ void CE_MoveLabel (CodeLabel* L, CodeEntry* E)
 
 
 
+void CE_SetArg (CodeEntry* E, const char* Arg)
+/* Replace the argument by the new one. */
+{
+    /* Free the old argument */
+    FreeArg (E->Arg);
+
+    /* Assign the new one */
+    E->Arg = GetArgCopy (Arg);
+}
+
+
+
 void CE_SetNumArg (CodeEntry* E, long Num)
 /* Set a new numeric argument for the given code entry that must already
  * have a numeric argument.
@@ -330,11 +385,8 @@ void CE_SetNumArg (CodeEntry* E, long Num)
        Internal ("Invalid instruction size in CE_SetNumArg");
     }
 
-    /* Free the old argument */
-    FreeArg (E->Arg);
-
-    /* Assign the new one */
-    E->Arg = GetArgCopy (Buf);
+    /* Replace the argument by the new one */
+    CE_SetArg (E, Buf);
 
     /* Use the new numerical value */
     E->Num = Num;
@@ -342,19 +394,97 @@ void CE_SetNumArg (CodeEntry* E, long Num)
 
 
 
-int CE_KnownImm (const CodeEntry* E)
-/* Return true if the argument of E is a known immediate value */
+int CE_IsConstImm (const CodeEntry* E)
+/* Return true if the argument of E is a constant immediate value */
 {
     return (E->AM == AM65_IMM && (E->Flags & CEF_NUMARG) != 0);
 }
 
 
 
+int CE_IsKnownImm (const CodeEntry* E, unsigned long Num)
+/* Return true if the argument of E is a constant immediate value that is
+ * equal to Num.
+ */
+{
+    return E->AM == AM65_IMM            &&
+           (E->Flags & CEF_NUMARG) != 0 &&
+           E->Num == Num;
+}
+
+
+
+int CE_UseLoadFlags (const CodeEntry* E)
+/* Return true if the instruction uses any flags that are set by a load of
+ * a register (N and Z).
+ */
+{
+    /* Follow unconditional branches, but beware of endless loops. After this,
+     * E will point to the first entry that is not a branch.
+     */
+    if (E->Info & OF_UBRA) {
+        Collection C = AUTO_COLLECTION_INITIALIZER;
+
+        /* Follow the chain */
+        while (E->Info & OF_UBRA) {
+
+            /* Remember the entry so we can detect loops */
+            CollAppend (&C, (void*) E);
+
+            /* Check the target */
+            if (E->JumpTo == 0 || CollIndex (&C, E->JumpTo->Owner) >= 0) {
+                /* Unconditional jump to external symbol, or endless loop. */
+                DoneCollection (&C);
+                return 0;       /* Flags not used */
+            }
+
+            /* Follow the chain */
+            E = E->JumpTo->Owner;
+        }
+
+        /* Delete the collection */
+        DoneCollection (&C);
+    }
+
+    /* A branch will use the flags */
+    if (E->Info & OF_FBRA) {
+        return 1;
+    }
+
+    /* Call of a boolean transformer routine will also use the flags */
+    if (E->OPC == OP65_JSR) {
+        /* Get the condition that is evaluated and check it */
+        switch (FindBoolCmpCond (E->Arg)) {
+            case CMP_EQ:
+            case CMP_NE:
+            case CMP_GT:
+            case CMP_GE:
+            case CMP_LT:
+            case CMP_LE:
+            case CMP_UGT:
+            case CMP_ULE:
+                /* Will use the N or Z flags */
+                return 1;
+
+
+            case CMP_UGE:       /* Uses only carry */
+            case CMP_ULT:       /* Dito */
+            default:            /* No bool transformer subroutine */
+                return 0;
+        }
+    }
+
+    /* Anything else */
+    return 0;
+}
+
+
+
 void CE_FreeRegInfo (CodeEntry* E)
 /* Free an existing register info struct */
 {
     if (E->RI) {
-       FreeRegInfo (E->RI);
+               FreeRegInfo (E->RI);
        E->RI = 0;
     }
 }
@@ -396,28 +526,64 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
            /* We don't know the value of the carry, so the result is
             * always unknown.
             */
-           Out->RegA = -1;
+           Out->RegA = UNKNOWN_REGVAL;
            break;
 
        case OP65_AND:
-                   if (In->RegA >= 0) {
-               if (CE_KnownImm (E)) {
+                   if (RegValIsKnown (In->RegA)) {
+               if (CE_IsConstImm (E)) {
                    Out->RegA = In->RegA & (short) E->Num;
+               } else if (E->AM == AM65_ZP) {
+                   switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->RegA = In->RegA & In->Tmp1;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->RegA = In->RegA & In->Ptr1Lo;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->RegA = In->RegA & In->Ptr1Hi;
+                           break;
+                       case REG_SREG_LO:
+                           Out->RegA = In->RegA & In->SRegLo;
+                           break;
+                       case REG_SREG_HI:
+                           Out->RegA = In->RegA & In->SRegHi;
+                           break;
+                       default:
+                           Out->RegA = UNKNOWN_REGVAL;
+                           break;
+                   }
                } else {
-                   Out->RegA = -1;
+                   Out->RegA = UNKNOWN_REGVAL;
                }
            }
            break;
 
        case OP65_ASL:
-           if (E->AM == AM65_ACC && In->RegA >= 0) {
+           if (E->AM == AM65_ACC && RegValIsKnown (In->RegA)) {
                Out->RegA = (In->RegA << 1) & 0xFF;
            } else if (E->AM == AM65_ZP) {
-               if ((E->Chg & REG_SREG_LO) != 0 && In->SRegLo >= 0) {
-                   Out->SRegLo = (In->SRegLo << 1) & 0xFF;
-               } else if ((E->Chg & REG_SREG_HI) != 0 && In->SRegHi >= 0) {
-                   Out->SRegHi = (In->SRegHi << 1) & 0xFF;
+               switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = (In->Tmp1 << 1) & 0xFF;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = (In->Ptr1Lo << 1) & 0xFF;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = (In->Ptr1Hi << 1) & 0xFF;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = (In->SRegLo << 1) & 0xFF;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = (In->SRegHi << 1) & 0xFF;
+                       break;
                }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
@@ -476,71 +642,122 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
            break;
 
        case OP65_DEA:
-           if (In->RegA >= 0) {
+                   if (RegValIsKnown (In->RegA)) {
                Out->RegA = (In->RegA - 1) & 0xFF;
            }
            break;
 
        case OP65_DEC:
-           if (E->AM == AM65_ACC && In->RegA >= 0) {
+           if (E->AM == AM65_ACC && RegValIsKnown (In->RegA)) {
                Out->RegA = (In->RegA - 1) & 0xFF;
            } else if (E->AM == AM65_ZP) {
-               if ((E->Chg & REG_SREG_LO) != 0 && In->SRegLo >= 0) {
-                   Out->SRegLo = (In->SRegLo - 1) & 0xFF;
-               } else if ((E->Chg & REG_SREG_HI) != 0 && In->SRegHi >= 0) {
-                   Out->SRegHi = (In->SRegHi - 1) & 0xFF;
+               switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = (In->Tmp1 - 1) & 0xFF;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = (In->Ptr1Lo - 1) & 0xFF;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = (In->Ptr1Hi - 1) & 0xFF;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = (In->SRegLo - 1) & 0xFF;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = (In->SRegHi - 1) & 0xFF;
+                       break;
                }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
        case OP65_DEX:
-                   if (In->RegX >= 0) {
+                   if (RegValIsKnown (In->RegX)) {
                Out->RegX = (In->RegX - 1) & 0xFF;
            }
            break;
 
        case OP65_DEY:
-                   if (In->RegY >= 0) {
+                   if (RegValIsKnown (In->RegY)) {
                Out->RegY = (In->RegY - 1) & 0xFF;
            }
            break;
 
        case OP65_EOR:
-                   if (In->RegA >= 0) {
-               if (CE_KnownImm (E)) {
+                   if (RegValIsKnown (In->RegA)) {
+               if (CE_IsConstImm (E)) {
                    Out->RegA = In->RegA ^ (short) E->Num;
+               } else if (E->AM == AM65_ZP) {
+                   switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->RegA = In->RegA ^ In->Tmp1;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->RegA = In->RegA ^ In->Ptr1Lo;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->RegA = In->RegA ^ In->Ptr1Hi;
+                           break;
+                       case REG_SREG_LO:
+                           Out->RegA = In->RegA ^ In->SRegLo;
+                           break;
+                       case REG_SREG_HI:
+                           Out->RegA = In->RegA ^ In->SRegHi;
+                           break;
+                       default:
+                           Out->RegA = UNKNOWN_REGVAL;
+                           break;
+                   }
                } else {
-                   Out->RegA = -1;
+                   Out->RegA = UNKNOWN_REGVAL;
                }
            }
            break;
 
        case OP65_INA:
-           if (In->RegA >= 0) {
+           if (RegValIsKnown (In->RegA)) {
                Out->RegA = (In->RegA + 1) & 0xFF;
            }
            break;
 
        case OP65_INC:
-           if (E->AM == AM65_ACC && In->RegA >= 0) {
-               Out->RegA = (In->RegA + 1) & 0xFF;
+           if (E->AM == AM65_ACC && RegValIsKnown (In->RegA)) {
+               Out->RegA = (In->RegA + 1) & 0xFF;
            } else if (E->AM == AM65_ZP) {
-               if ((E->Chg & REG_SREG_LO) != 0 && In->SRegLo >= 0) {
-                   Out->SRegLo = (In->SRegLo + 1) & 0xFF;
-               } else if ((E->Chg & REG_SREG_HI) != 0 && In->SRegHi >= 0) {
-                   Out->SRegHi = (In->SRegHi + 1) & 0xFF;
+               switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = (In->Tmp1 + 1) & 0xFF;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = (In->Ptr1Lo + 1) & 0xFF;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = (In->Ptr1Hi + 1) & 0xFF;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = (In->SRegLo + 1) & 0xFF;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = (In->SRegHi + 1) & 0xFF;
+                       break;
                }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
        case OP65_INX:
-           if (In->RegX >= 0) {
+           if (RegValIsKnown (In->RegX)) {
                Out->RegX = (In->RegX + 1) & 0xFF;
            }
            break;
 
        case OP65_INY:
-           if (In->RegY >= 0) {
+           if (RegValIsKnown (In->RegY)) {
                Out->RegY = (In->RegY + 1) & 0xFF;
            }
            break;
@@ -570,20 +787,47 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
            /* Get the code info for the function */
            GetFuncInfo (E->Arg, &Use, &Chg);
            if (Chg & REG_A) {
-               Out->RegA = -1;
+               Out->RegA = UNKNOWN_REGVAL;
            }
            if (Chg & REG_X) {
-               Out->RegX = -1;
+               Out->RegX = UNKNOWN_REGVAL;
            }
            if (Chg & REG_Y) {
-               Out->RegY = -1;
+               Out->RegY = UNKNOWN_REGVAL;
+           }
+           if (Chg & REG_TMP1) {
+               Out->Tmp1 = UNKNOWN_REGVAL;
+           }
+            if (Chg & REG_PTR1_LO) {
+               Out->Ptr1Lo = UNKNOWN_REGVAL;
+           }
+           if (Chg & REG_PTR1_HI) {
+               Out->Ptr1Hi = UNKNOWN_REGVAL;
            }
             if (Chg & REG_SREG_LO) {
-               Out->SRegLo = -1;
+               Out->SRegLo = UNKNOWN_REGVAL;
            }
            if (Chg & REG_SREG_HI) {
-               Out->SRegHi = -1;
+               Out->SRegHi = UNKNOWN_REGVAL;
            }
+                   /* ## FIXME: Quick hack for some known functions: */
+           if (strcmp (E->Arg, "tosandax") == 0) {
+               if (In->RegA == 0) {
+                   Out->RegA = 0;
+               }
+               if (In->RegX == 0) {
+                   Out->RegX = 0;
+               }
+           } else if (strcmp (E->Arg, "tosorax") == 0) {
+               if (In->RegA == 0xFF) {
+                   Out->RegA = 0xFF;
+               }
+               if (In->RegX == 0xFF) {
+                    Out->RegX = 0xFF;
+                }
+            } else if (FindBoolCmpCond (E->Arg) != CMP_INV) {
+                Out->RegX = 0;
+            }
            break;
 
        case OP65_JVC:
@@ -593,65 +837,119 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
            break;
 
        case OP65_LDA:
-           if (CE_KnownImm (E)) {
+           if (CE_IsConstImm (E)) {
                Out->RegA = (unsigned char) E->Num;
            } else if (E->AM == AM65_ZP) {
-               if (E->Use & REG_SREG_LO) {
-                   Out->RegA = In->SRegLo;
-               } else if (E->Use & REG_SREG_HI) {
-                   Out->RegA = In->SRegHi;
-               } else {
-                   Out->RegA = -1;
+               switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->RegA = In->Tmp1;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->RegA = In->Ptr1Lo;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->RegA = In->Ptr1Hi;
+                       break;
+                   case REG_SREG_LO:
+                       Out->RegA = In->SRegLo;
+                       break;
+                   case REG_SREG_HI:
+                       Out->RegA = In->SRegHi;
+                       break;
+                   default:
+                       Out->RegA = UNKNOWN_REGVAL;
+                       break;
                }
            } else {
                /* A is now unknown */
-               Out->RegA = -1;
+               Out->RegA = UNKNOWN_REGVAL;
            }
            break;
 
        case OP65_LDX:
-           if (CE_KnownImm (E)) {
+           if (CE_IsConstImm (E)) {
                Out->RegX = (unsigned char) E->Num;
            } else if (E->AM == AM65_ZP) {
-               if (E->Use & REG_SREG_LO) {
-                   Out->RegX = In->SRegLo;
-               } else if (E->Use & REG_SREG_HI) {
-                   Out->RegX = In->SRegHi;
-               } else {
-                   Out->RegX = -1;
+               switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->RegX = In->Tmp1;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->RegX = In->Ptr1Lo;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->RegX = In->Ptr1Hi;
+                       break;
+                   case REG_SREG_LO:
+                       Out->RegX = In->SRegLo;
+                       break;
+                   case REG_SREG_HI:
+                       Out->RegX = In->SRegHi;
+                       break;
+                   default:
+                       Out->RegX = UNKNOWN_REGVAL;
+                       break;
                }
            } else {
                /* X is now unknown */
-               Out->RegX = -1;
+               Out->RegX = UNKNOWN_REGVAL;
            }
            break;
 
        case OP65_LDY:
-           if (CE_KnownImm (E)) {
+           if (CE_IsConstImm (E)) {
                Out->RegY = (unsigned char) E->Num;
            } else if (E->AM == AM65_ZP) {
-               if (E->Use & REG_SREG_LO) {
-                   Out->RegY = In->SRegLo;
-               } else if (E->Use & REG_SREG_HI) {
-                   Out->RegY = In->SRegHi;
-               } else {
-                   Out->RegY = -1;
+               switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->RegY = In->Tmp1;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->RegY = In->Ptr1Lo;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->RegY = In->Ptr1Hi;
+                       break;
+                   case REG_SREG_LO:
+                       Out->RegY = In->SRegLo;
+                       break;
+                   case REG_SREG_HI:
+                       Out->RegY = In->SRegHi;
+                       break;
+                   default:
+                       Out->RegY = UNKNOWN_REGVAL;
+                       break;
                }
            } else {
                /* Y is now unknown */
-               Out->RegY = -1;
+               Out->RegY = UNKNOWN_REGVAL;
            }
            break;
 
        case OP65_LSR:
-           if (E->AM == AM65_ACC && In->RegA >= 0) {
+           if (E->AM == AM65_ACC && RegValIsKnown (In->RegA)) {
                Out->RegA = (In->RegA >> 1) & 0xFF;
            } else if (E->AM == AM65_ZP) {
-               if ((E->Chg & REG_SREG_LO) != 0 && In->SRegLo >= 0) {
-                   Out->SRegLo = (In->SRegLo >> 1) & 0xFF;
-               } else if (E->Chg & REG_SREG_HI) {
-                   Out->SRegHi = (In->SRegHi >> 1) & 0xFF;
+               switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = (In->Tmp1 >> 1) & 0xFF;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = (In->Ptr1Lo >> 1) & 0xFF;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = (In->Ptr1Hi >> 1) & 0xFF;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = (In->SRegLo >> 1) & 0xFF;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = (In->SRegHi >> 1) & 0xFF;
+                       break;
                }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
@@ -659,13 +957,34 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
            break;
 
        case OP65_ORA:
-           if (In->RegA >= 0) {
-               if (CE_KnownImm (E)) {
-                   Out->RegA = In->RegA | (short) E->Num;
-               } else {
-                   /* A is now unknown */
-                   Out->RegA = -1;
-               }
+           if (RegValIsKnown (In->RegA)) {
+               if (CE_IsConstImm (E)) {
+                   Out->RegA = In->RegA | (short) E->Num;
+               } else if (E->AM == AM65_ZP) {
+                   switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->RegA = In->RegA | In->Tmp1;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->RegA = In->RegA | In->Ptr1Lo;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->RegA = In->RegA | In->Ptr1Hi;
+                           break;
+                       case REG_SREG_LO:
+                           Out->RegA = In->RegA | In->SRegLo;
+                           break;
+                       case REG_SREG_HI:
+                           Out->RegA = In->RegA | In->SRegHi;
+                           break;
+                       default:
+                           Out->RegA = UNKNOWN_REGVAL;
+                           break;
+                   }
+               } else {
+                   /* A is now unknown */
+                   Out->RegA = UNKNOWN_REGVAL;
+               }
            }
            break;
 
@@ -682,41 +1001,73 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
            break;
 
        case OP65_PLA:
-           Out->RegA = -1;
+           Out->RegA = UNKNOWN_REGVAL;
            break;
 
        case OP65_PLP:
            break;
 
        case OP65_PLX:
-           Out->RegX = -1;
+           Out->RegX = UNKNOWN_REGVAL;
            break;
 
        case OP65_PLY:
-           Out->RegY = -1;
+           Out->RegY = UNKNOWN_REGVAL;
            break;
 
        case OP65_ROL:
+           /* We don't know the value of the carry bit */
            if (E->AM == AM65_ACC) {
-               Out->RegA = -1;
+               Out->RegA = UNKNOWN_REGVAL;
            } else if (E->AM == AM65_ZP) {
-               if (E->Chg & REG_SREG_LO) {
-                   Out->SRegLo = -1;
-               } else if (E->Chg & REG_SREG_HI) {
-                   Out->SRegHi = -1;
-               }
+               switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = UNKNOWN_REGVAL;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = UNKNOWN_REGVAL;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = UNKNOWN_REGVAL;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = UNKNOWN_REGVAL;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = UNKNOWN_REGVAL;
+                       break;
+               }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
        case OP65_ROR:
+           /* We don't know the value of the carry bit */
            if (E->AM == AM65_ACC) {
-               Out->RegA = -1;
+               Out->RegA = UNKNOWN_REGVAL;
            } else if (E->AM == AM65_ZP) {
-               if (E->Chg & REG_SREG_LO) {
-                   Out->SRegLo = -1;
-               } else if (E->Chg & REG_SREG_HI) {
-                   Out->SRegHi = -1;
-               }
+               switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = UNKNOWN_REGVAL;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = UNKNOWN_REGVAL;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = UNKNOWN_REGVAL;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = UNKNOWN_REGVAL;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = UNKNOWN_REGVAL;
+                       break;
+               }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
@@ -728,7 +1079,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 
        case OP65_SBC:
            /* We don't know the value of the carry bit */
-           Out->RegA = -1;
+           Out->RegA = UNKNOWN_REGVAL;
            break;
 
        case OP65_SEC:
@@ -742,54 +1093,204 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 
        case OP65_STA:
            if (E->AM == AM65_ZP) {
-               if (E->Chg & REG_SREG_LO) {
-                   Out->SRegLo = In->RegA;
-               } else if (E->Chg & REG_SREG_HI) {
-                   Out->SRegHi = In->RegA;
+               switch (GetKnownReg (E->Chg & REG_ZP, 0)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = In->RegA;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = In->RegA;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = In->RegA;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = In->RegA;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = In->RegA;
+                       break;
                }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
        case OP65_STX:
            if (E->AM == AM65_ZP) {
-               if (E->Chg & REG_SREG_LO) {
-                   Out->SRegLo = In->RegX;
-               } else if (E->Chg & REG_SREG_HI) {
-                   Out->SRegHi = In->RegX;
+               switch (GetKnownReg (E->Chg & REG_ZP, 0)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = In->RegX;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = In->RegX;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = In->RegX;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = In->RegX;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = In->RegX;
+                       break;
                }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
            }
            break;
 
        case OP65_STY:
            if (E->AM == AM65_ZP) {
-               if (E->Chg & REG_SREG_LO) {
-                   Out->SRegLo = In->RegY;
-               } else if (E->Chg & REG_SREG_HI) {
-                   Out->SRegHi = In->RegY;
+               switch (GetKnownReg (E->Chg & REG_ZP, 0)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = In->RegY;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = In->RegY;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = In->RegY;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = In->RegY;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = In->RegY;
+                       break;
                }
-           }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
+            }
+           break;
+
+       case OP65_STZ:
+           if (E->AM == AM65_ZP) {
+               switch (GetKnownReg (E->Chg & REG_ZP, 0)) {
+                   case REG_TMP1:
+                       Out->Tmp1 = 0;
+                       break;
+                   case REG_PTR1_LO:
+                       Out->Ptr1Lo = 0;
+                       break;
+                   case REG_PTR1_HI:
+                       Out->Ptr1Hi = 0;
+                       break;
+                   case REG_SREG_LO:
+                       Out->SRegLo = 0;
+                       break;
+                   case REG_SREG_HI:
+                       Out->SRegHi = 0;
+                       break;
+               }
+           } else if (E->AM == AM65_ZPX) {
+                /* Invalidates all ZP registers */
+                RC_InvalidateZP (Out);
+            }
            break;
 
        case OP65_TAX:
            Out->RegX = In->RegA;
            break;
 
-       case OP65_TAY:       
+       case OP65_TAY:
            Out->RegY = In->RegA;
            break;
 
        case OP65_TRB:
-           /* For now... */
-           Out->RegA = -1;
+           if (E->AM == AM65_ZPX) {
+               /* Invalidates all ZP registers */
+               RC_InvalidateZP (Out);
+           } else if (E->AM == AM65_ZP) {
+               if (RegValIsKnown (In->RegA)) {
+                   switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->Tmp1 &= ~In->RegA;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->Ptr1Lo &= ~In->RegA;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->Ptr1Hi &= ~In->RegA;
+                           break;
+                       case REG_SREG_LO:
+                           Out->SRegLo &= ~In->RegA;
+                           break;
+                       case REG_SREG_HI:
+                           Out->SRegHi &= ~In->RegA;
+                           break;
+                   }
+               } else {
+                   switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->Tmp1 = UNKNOWN_REGVAL;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->Ptr1Lo = UNKNOWN_REGVAL;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->Ptr1Hi = UNKNOWN_REGVAL;
+                           break;
+                       case REG_SREG_LO:
+                           Out->SRegLo = UNKNOWN_REGVAL;
+                           break;
+                       case REG_SREG_HI:
+                           Out->SRegHi = UNKNOWN_REGVAL;
+                           break;
+                   }
+               }
+           }
            break;
 
        case OP65_TSB:
-           /* For now... */
-           Out->RegA = -1;
+           if (E->AM == AM65_ZPX) {
+               /* Invalidates all ZP registers */
+               RC_InvalidateZP (Out);
+           } else if (E->AM == AM65_ZP) {
+               if (RegValIsKnown (In->RegA)) {
+                   switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->Tmp1 |= In->RegA;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->Ptr1Lo |= In->RegA;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->Ptr1Hi |= In->RegA;
+                           break;
+                       case REG_SREG_LO:
+                           Out->SRegLo |= In->RegA;
+                           break;
+                       case REG_SREG_HI:
+                           Out->SRegHi |= In->RegA;
+                           break;
+                   }
+               } else {
+                   switch (GetKnownReg (E->Chg & REG_ZP, In)) {
+                       case REG_TMP1:
+                           Out->Tmp1 = UNKNOWN_REGVAL;
+                           break;
+                       case REG_PTR1_LO:
+                           Out->Ptr1Lo = UNKNOWN_REGVAL;
+                           break;
+                       case REG_PTR1_HI:
+                           Out->Ptr1Hi = UNKNOWN_REGVAL;
+                           break;
+                       case REG_SREG_LO:
+                           Out->SRegLo = UNKNOWN_REGVAL;
+                           break;
+                       case REG_SREG_HI:
+                           Out->SRegHi = UNKNOWN_REGVAL;
+                           break;
+                   }
+               }
+           }
            break;
 
        case OP65_TSX:
-           Out->RegX = -1;
+           Out->RegX = UNKNOWN_REGVAL;
            break;
 
        case OP65_TXA:
@@ -821,25 +1322,48 @@ static char* RegInfoDesc (unsigned U, char* Buf)
     strcat (Buf, U & REG_A?       "A" : "_");
     strcat (Buf, U & REG_X?       "X" : "_");
     strcat (Buf, U & REG_Y?       "Y" : "_");
-    strcat (Buf, U & REG_SP?      "S" : "_");
     strcat (Buf, U & REG_TMP1?    "T1" : "__");
-    strcat (Buf, U & REG_TMP2?    "T2" : "__");
-    strcat (Buf, U & REG_TMP3?    "T3" : "__");
-    strcat (Buf, U & REG_TMP4?    "T4" : "__");
     strcat (Buf, U & REG_PTR1?    "1" : "_");
     strcat (Buf, U & REG_PTR2?    "2" : "_");
-    strcat (Buf, U & REG_PTR3?    "3" : "_");
-    strcat (Buf, U & REG_PTR4?    "4" : "_");
     strcat (Buf, U & REG_SAVE?    "V"  : "_");
-    strcat (Buf, U & REG_BANK?    "B" : "_");
+    strcat (Buf, U & REG_SP?      "S" : "_");
+
+    return Buf;
+}
+
+
+
+static char* RegContentDesc (const RegContents* RC, char* Buf)
+/* Return a string containing register contents */
+{
+    char* B = Buf;
+
+    if (RegValIsUnknown (RC->RegA)) {
+        strcpy (B, "A:XX ");
+    } else {
+        sprintf (B, "A:%02X ", RC->RegA);
+    }
+    B += 5;
+    if (RegValIsUnknown (RC->RegX)) {
+        strcpy (B, "X:XX ");
+    } else {
+        sprintf (B, "X:%02X ", RC->RegX);
+    }
+    B += 5;
+    if (RegValIsUnknown (RC->RegY)) {
+        strcpy (B, "Y:XX");
+    } else {
+        sprintf (B, "Y:%02X", RC->RegY);
+    }
+    B += 4;
 
     return Buf;
 }
 
 
 
-void CE_Output (const CodeEntry* E, FILE* F)
-/* Output the code entry to a file */
+void CE_Output (const CodeEntry* E)
+/* Output the code entry to the output file */
 {
     const OPCDesc* D;
     unsigned Chars;
@@ -849,71 +1373,68 @@ void CE_Output (const CodeEntry* E, FILE* F)
     unsigned LabelCount = CollCount (&E->Labels);
     unsigned I;
     for (I = 0; I < LabelCount; ++I) {
-       CL_Output (CollConstAt (&E->Labels, I), F);
+       CL_Output (CollConstAt (&E->Labels, I));
     }
 
     /* Get the opcode description */
     D = GetOPCDesc (E->OPC);
 
     /* Print the mnemonic */
-    Chars = fprintf (F, "\t%s", D->Mnemo);
+    Chars = WriteOutput ("\t%s", D->Mnemo);
 
     /* Print the operand */
     switch (E->AM) {
 
-       case AM_IMP:
        case AM65_IMP:
            /* implicit */
            break;
 
        case AM65_ACC:
            /* accumulator */
-           Chars += fprintf (F, "%*sa", 9-Chars, "");
+           Chars += WriteOutput ("%*sa", 9-Chars, "");
            break;
 
-       case AM_IMM:
        case AM65_IMM:
            /* immidiate */
-           Chars += fprintf (F, "%*s#%s", 9-Chars, "", E->Arg);
+           Chars += WriteOutput ("%*s#%s", 9-Chars, "", E->Arg);
            break;
 
-       case AM_ABS:
        case AM65_ZP:
        case AM65_ABS:
            /* zeropage and absolute */
-           Chars += fprintf (F, "%*s%s", 9-Chars, "", E->Arg);
+           Chars += WriteOutput ("%*s%s", 9-Chars, "", E->Arg);
                    break;
 
        case AM65_ZPX:
        case AM65_ABSX:
            /* zeropage,X and absolute,X */
-           Chars += fprintf (F, "%*s%s,x", 9-Chars, "", E->Arg);
+           Chars += WriteOutput ("%*s%s,x", 9-Chars, "", E->Arg);
            break;
 
        case AM65_ABSY:
            /* absolute,Y */
-           Chars += fprintf (F, "%*s%s,y", 9-Chars, "", E->Arg);
+           Chars += WriteOutput ("%*s%s,y", 9-Chars, "", E->Arg);
            break;
 
        case AM65_ZPX_IND:
            /* (zeropage,x) */
-                   Chars += fprintf (F, "%*s(%s,x)", 9-Chars, "", E->Arg);
+                   Chars += WriteOutput ("%*s(%s,x)", 9-Chars, "", E->Arg);
            break;
 
        case AM65_ZP_INDY:
            /* (zeropage),y */
-                   Chars += fprintf (F, "%*s(%s),y", 9-Chars, "", E->Arg);
+                   Chars += WriteOutput ("%*s(%s),y", 9-Chars, "", E->Arg);
            break;
 
        case AM65_ZP_IND:
            /* (zeropage) */
-                   Chars += fprintf (F, "%*s(%s)", 9-Chars, "", E->Arg);
+                   Chars += WriteOutput ("%*s(%s)", 9-Chars, "", E->Arg);
            break;
 
        case AM65_BRA:
            /* branch */
            Target = E->JumpTo? E->JumpTo->Name : E->Arg;
-           Chars += fprintf (F, "%*s%s", 9-Chars, "", Target);
+           Chars += WriteOutput ("%*s%s", 9-Chars, "", Target);
            break;
 
        default:
@@ -925,16 +1446,23 @@ void CE_Output (const CodeEntry* E, FILE* F)
     if (Debug) {
        char Use [128];
        char Chg [128];
-               fprintf (F,
-                        "%*s; USE: %-20s CHG: %-20s SIZE: %u\n",
-                        30-Chars, "",
-                RegInfoDesc (E->Use, Use),
-                RegInfoDesc (E->Chg, Chg),
-                E->Size);
-    } else {
-       /* Terminate the line */
-       fprintf (F, "\n");
+               WriteOutput ("%*s; USE: %-12s CHG: %-12s SIZE: %u",
+                            30-Chars, "",
+                    RegInfoDesc (E->Use, Use),
+                    RegInfoDesc (E->Chg, Chg),
+                    E->Size);
+
+        if (E->RI) {
+            char RegIn[32];
+            char RegOut[32];
+            WriteOutput ("    In %s  Out %s",
+                         RegContentDesc (&E->RI->In, RegIn),
+                         RegContentDesc (&E->RI->Out, RegOut));
+        }
     }
+
+    /* Terminate the line */
+    WriteOutput ("\n");
 }