X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodeent.c;h=3868a353103f7e0b14d80dac9f66ba7441019a1f;hb=3f4096d3030095605f28b4cfa73563c53a563df6;hp=14bab06393a42336caabc71ffa88a3b8d289de30;hpb=486640200baa9dfd84029c76f40fd118b63aee86;p=cc65 diff --git a/src/cc65/codeent.c b/src/cc65/codeent.c index 14bab0639..3868a3531 100644 --- a/src/cc65/codeent.c +++ b/src/cc65/codeent.c @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2001-2002 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 2001-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -39,6 +39,7 @@ /* common */ #include "chartype.h" #include "check.h" +#include "debugflag.h" #include "xmalloc.h" #include "xsprintf.h" @@ -224,7 +225,7 @@ const char* MakeHexArg (unsigned Num) */ { static char Buf[16]; - xsprintf (Buf, sizeof (Buf), "$%02X", (char) Num); + xsprintf (Buf, sizeof (Buf), "$%02X", (unsigned char) Num); return Buf; } @@ -243,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; @@ -376,6 +377,45 @@ int CE_KnownImm (const CodeEntry* E) +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). + */ +{ + /* 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 */ { @@ -422,18 +462,24 @@ 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 (RegValIsKnown (In->RegA)) { if (CE_KnownImm (E)) { Out->RegA = In->RegA & (short) E->Num; } else if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Use, In)) { + 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; @@ -441,23 +487,29 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) Out->RegA = In->RegA & In->SRegHi; break; default: - Out->RegA = -1; - break; + 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) { - switch (GetKnownReg (E->Chg, In)) { + 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; @@ -526,19 +578,25 @@ 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) { - switch (GetKnownReg (E->Chg, In)) { + 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; @@ -553,26 +611,32 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) 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 (RegValIsKnown (In->RegA)) { if (CE_KnownImm (E)) { Out->RegA = In->RegA ^ (short) E->Num; } else if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Use, In)) { + 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; @@ -580,29 +644,35 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) Out->RegA = In->RegA ^ In->SRegHi; break; default: - Out->RegA = -1; + 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) { + if (E->AM == AM65_ACC && RegValIsKnown (In->RegA)) { Out->RegA = (In->RegA + 1) & 0xFF; } else if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Chg, In)) { + 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; @@ -617,13 +687,13 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) 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; @@ -653,24 +723,30 @@ 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 = -1; + 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; } - /* Quick hack for some known functions: */ + /* ## FIXME: Quick hack for some known functions: */ if (strcmp (E->Arg, "tosandax") == 0) { if (In->RegA == 0) { Out->RegA = 0; @@ -685,6 +761,8 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) if (In->RegX == 0xFF) { Out->RegX = 0xFF; } + } else if (FindBoolCmpCond (E->Arg) != CMP_INV) { + Out->RegX = 0; } break; @@ -698,10 +776,16 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) if (CE_KnownImm (E)) { Out->RegA = (unsigned char) E->Num; } else if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Use, In)) { + 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; @@ -709,12 +793,12 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) Out->RegA = In->SRegHi; break; default: - Out->RegA = -1; + Out->RegA = UNKNOWN_REGVAL; break; } } else { /* A is now unknown */ - Out->RegA = -1; + Out->RegA = UNKNOWN_REGVAL; } break; @@ -722,10 +806,16 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) if (CE_KnownImm (E)) { Out->RegX = (unsigned char) E->Num; } else if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Use, In)) { + 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; @@ -733,12 +823,12 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) Out->RegX = In->SRegHi; break; default: - Out->RegX = -1; + Out->RegX = UNKNOWN_REGVAL; break; } } else { /* X is now unknown */ - Out->RegX = -1; + Out->RegX = UNKNOWN_REGVAL; } break; @@ -746,10 +836,16 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) if (CE_KnownImm (E)) { Out->RegY = (unsigned char) E->Num; } else if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Use, In)) { + 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; @@ -757,23 +853,29 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) Out->RegY = In->SRegHi; break; default: - Out->RegY = -1; + 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) { - switch (GetKnownReg (E->Chg, In)) { + 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; @@ -791,28 +893,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 if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Use, In)) { - case REG_TMP1: - Out->RegA = In->RegA | In->Tmp1; - 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 = -1; - break; - } - } else { - /* A is now unknown */ - Out->RegA = -1; - } + if (RegValIsKnown (In->RegA)) { + if (CE_KnownImm (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; @@ -829,34 +937,40 @@ 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) { - switch (GetKnownReg (E->Chg, In)) { + switch (GetKnownReg (E->Chg & REG_ZP, In)) { case REG_TMP1: - Out->Tmp1 = -1; + 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 = -1; + Out->SRegLo = UNKNOWN_REGVAL; break; case REG_SREG_HI: - Out->SRegHi = -1; + Out->SRegHi = UNKNOWN_REGVAL; break; } } else if (E->AM == AM65_ZPX) { @@ -868,17 +982,23 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) 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) { - switch (GetKnownReg (E->Chg, In)) { + switch (GetKnownReg (E->Chg & REG_ZP, In)) { case REG_TMP1: - Out->Tmp1 = -1; + 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 = -1; + Out->SRegLo = UNKNOWN_REGVAL; break; case REG_SREG_HI: - Out->SRegHi = -1; + Out->SRegHi = UNKNOWN_REGVAL; break; } } else if (E->AM == AM65_ZPX) { @@ -895,7 +1015,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: @@ -909,16 +1029,22 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) case OP65_STA: if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Chg, 0)) { + 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; + break; } } else if (E->AM == AM65_ZPX) { /* Invalidates all ZP registers */ @@ -928,10 +1054,16 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) case OP65_STX: if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Chg, 0)) { + 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; @@ -947,10 +1079,16 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) case OP65_STY: if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Chg, 0)) { + 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; @@ -966,9 +1104,15 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) case OP65_STZ: if (E->AM == AM65_ZP) { - switch (GetKnownReg (E->Chg, 0)) { + switch (GetKnownReg (E->Chg & REG_ZP, 0)) { case REG_TMP1: - Out->Tmp1 = 0; + 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; @@ -996,11 +1140,17 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) /* Invalidates all ZP registers */ RC_InvalidateZP (Out); } else if (E->AM == AM65_ZP) { - if (In->RegA >= 0) { - switch (GetKnownReg (E->Chg, In)) { + 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; @@ -1009,15 +1159,21 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) break; } } else { - switch (GetKnownReg (E->Chg, In)) { + switch (GetKnownReg (E->Chg & REG_ZP, In)) { case REG_TMP1: - Out->Tmp1 = -1; + 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 = -1; + Out->SRegLo = UNKNOWN_REGVAL; break; - case REG_SREG_HI: - Out->SRegHi = -1; + case REG_SREG_HI: + Out->SRegHi = UNKNOWN_REGVAL; break; } } @@ -1029,11 +1185,17 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) /* Invalidates all ZP registers */ RC_InvalidateZP (Out); } else if (E->AM == AM65_ZP) { - if (In->RegA >= 0) { - switch (GetKnownReg (E->Chg, In)) { + 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; @@ -1042,15 +1204,21 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) break; } } else { - switch (GetKnownReg (E->Chg, In)) { + switch (GetKnownReg (E->Chg & REG_ZP, In)) { case REG_TMP1: - Out->Tmp1 = -1; + 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 = -1; + Out->SRegLo = UNKNOWN_REGVAL; break; case REG_SREG_HI: - Out->SRegHi = -1; + Out->SRegHi = UNKNOWN_REGVAL; break; } } @@ -1058,7 +1226,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs) break; case OP65_TSX: - Out->RegX = -1; + Out->RegX = UNKNOWN_REGVAL; break; case OP65_TXA: @@ -1094,6 +1262,7 @@ static char* RegInfoDesc (unsigned U, char* Buf) strcat (Buf, U & REG_PTR1? "1" : "_"); strcat (Buf, U & REG_PTR2? "2" : "_"); strcat (Buf, U & REG_SAVE? "V" : "_"); + strcat (Buf, U & REG_SP? "S" : "_"); return Buf; } @@ -1188,7 +1357,7 @@ void CE_Output (const CodeEntry* E, FILE* F) char Use [128]; char Chg [128]; fprintf (F, - "%*s; USE: %-20s CHG: %-20s SIZE: %u\n", + "%*s; USE: %-12s CHG: %-12s SIZE: %u\n", 30-Chars, "", RegInfoDesc (E->Use, Use), RegInfoDesc (E->Chg, Chg),