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
case AM65_ZPX:
case AM65_ABSX:
case AM65_ABSY:
- if (IsZPName (E->Arg, &Use) && Use != REG_NONE) {
- if (E->OPC == OP65_INC || E->OPC == OP65_DEC) {
- E->Chg |= Use;
- E->Use |= Use;
+ 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 |= Info->ByteUse;
+ E->Use |= Info->ByteUse;
} else if ((E->Info & OF_STORE) != 0) {
- E->Chg |= Use;
+ /* Just output */
+ E->Chg |= Info->ByteUse;
} else {
- E->Use |= Use;
+ /* Input only */
+ E->Use |= Info->ByteUse;
}
}
break;
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;
-
+
default:
/* Keep gcc silent */
break;
case OP65_ASL:
if (E->AM == AM65_ACC && In->RegA >= 0) {
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;
+ }
}
break;
case OP65_DEA:
if (In->RegA >= 0) {
- Out->RegA = In->RegA - 1;
+ Out->RegA = (In->RegA - 1) & 0xFF;
}
break;
case OP65_DEC:
if (E->AM == AM65_ACC && In->RegA >= 0) {
- Out->RegA = In->RegA - 1;
+ 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;
+ }
}
break;
case OP65_DEX:
if (In->RegX >= 0) {
- Out->RegX = In->RegX - 1;
+ Out->RegX = (In->RegX - 1) & 0xFF;
}
break;
case OP65_DEY:
if (In->RegY >= 0) {
- Out->RegY = In->RegY - 1;
+ Out->RegY = (In->RegY - 1) & 0xFF;
}
break;
case OP65_INA:
if (In->RegA >= 0) {
- Out->RegA = In->RegA + 1;
+ Out->RegA = (In->RegA + 1) & 0xFF;
}
break;
case OP65_INC:
if (E->AM == AM65_ACC && In->RegA >= 0) {
- Out->RegA = In->RegA + 1;
+ 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;
+ }
}
break;
case OP65_INX:
if (In->RegX >= 0) {
- Out->RegX = In->RegX + 1;
+ Out->RegX = (In->RegX + 1) & 0xFF;
}
break;
case OP65_INY:
if (In->RegY >= 0) {
- Out->RegY = In->RegY + 1;
+ Out->RegY = (In->RegY + 1) & 0xFF;
}
break;
if (Chg & REG_Y) {
Out->RegY = -1;
}
+ if (Chg & REG_SREG_LO) {
+ Out->SRegLo = -1;
+ }
+ if (Chg & REG_SREG_HI) {
+ Out->SRegHi = -1;
+ }
break;
case OP65_JVC:
case OP65_LDA:
if (CE_KnownImm (E)) {
- Out->RegA = (unsigned char) E->Num;
+ 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;
+ }
} else {
- /* A is now unknown */
- Out->RegA = -1;
+ /* A is now unknown */
+ Out->RegA = -1;
}
break;
case OP65_LDX:
if (CE_KnownImm (E)) {
- Out->RegX = (unsigned char) E->Num;
+ 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;
+ }
} else {
- /* X is now unknown */
- Out->RegX = -1;
+ /* X is now unknown */
+ Out->RegX = -1;
}
break;
case OP65_LDY:
if (CE_KnownImm (E)) {
- Out->RegY = (unsigned char) E->Num;
+ 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;
+ }
} else {
/* Y is now unknown */
Out->RegY = -1;
case OP65_LSR:
if (E->AM == AM65_ACC && In->RegA >= 0) {
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;
+ }
}
break;
case OP65_PLP:
break;
- case OP65_PLX:
- Out->RegX = -1;
- break;
+ case OP65_PLX:
+ Out->RegX = -1;
+ break;
- case OP65_PLY:
- Out->RegY = -1;
- break;
+ case OP65_PLY:
+ Out->RegY = -1;
+ break;
- case OP65_ROL:
- Out->RegA = -1;
- break;
+ case OP65_ROL:
+ if (E->AM == AM65_ACC) {
+ Out->RegA = -1;
+ } 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;
+ }
+ }
+ break;
- case OP65_ROR:
- Out->RegA = -1;
- break;
+ case OP65_ROR:
+ if (E->AM == AM65_ACC) {
+ Out->RegA = -1;
+ } 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;
+ }
+ }
+ break;
- case OP65_RTI:
- break;
+ case OP65_RTI:
+ break;
- case OP65_RTS:
- break;
+ case OP65_RTS:
+ break;
- case OP65_SBC:
- /* We don't know the value of the carry bit */
- Out->RegA = -1;
- break;
+ case OP65_SBC:
+ /* We don't know the value of the carry bit */
+ Out->RegA = -1;
+ break;
- case OP65_SEC:
- break;
+ case OP65_SEC:
+ break;
- case OP65_SED:
- break;
+ case OP65_SED:
+ break;
- case OP65_SEI:
- break;
+ case OP65_SEI:
+ break;
- case OP65_STA:
+ 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;
+ }
+ }
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;
+ }
+ }
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;
+ }
+ }
break;
case OP65_TAX:
/* Return a string containing register info */
{
Buf[0] = '\0';
- if (U & REG_SREG) {
- strcat (Buf, "E");
- }
- if (U & REG_A) {
- strcat (Buf, "A");
- }
- if (U & REG_X) {
- strcat (Buf, "X");
- }
- if (U & REG_Y) {
- strcat (Buf, "Y");
- }
- if (U & REG_TMP1) {
- strcat (Buf, "T1");
- }
- if (U & REG_TMP2) {
- strcat (Buf, "T2");
- }
- if (U & REG_TMP3) {
- strcat (Buf, "T3");
- }
- if (U & REG_PTR1) {
- strcat (Buf, "P1");
- }
- if (U & REG_PTR2) {
- strcat (Buf, "P2");
- }
- if (U & REG_PTR3) {
- strcat (Buf, "P3");
- }
- if (U & REG_PTR4) {
- strcat (Buf, "P4");
- }
+
+ strcat (Buf, U & REG_SREG_HI? "H" : "_");
+ strcat (Buf, U & REG_SREG_LO? "L" : "_");
+ strcat (Buf, U & REG_A? "A" : "_");
+ strcat (Buf, U & REG_X? "X" : "_");
+ strcat (Buf, U & REG_Y? "Y" : "_");
+ strcat (Buf, U & REG_TMP1? "T1" : "__");
+ strcat (Buf, U & REG_PTR1? "1" : "_");
+ strcat (Buf, U & REG_PTR2? "2" : "_");
+ strcat (Buf, U & REG_SAVE? "V" : "_");
+
return Buf;
}
char Use [128];
char Chg [128];
fprintf (F,
- "%*s; USE: %-18s CHG: %-18s SIZE: %u\n",
+ "%*s; USE: %-20s CHG: %-20s SIZE: %u\n",
30-Chars, "",
RegInfoDesc (E->Use, Use),
RegInfoDesc (E->Chg, Chg),
projects / cc65 / blobdiff