/* Search for the sequence:
*
* jsr pushax
- * ldy xxx
+ * ldy #xxx
* ldx #$00
* lda (sp),y
* jsr tosaddax
*
* sta ptr1
* stx ptr1+1
- * ldy xxx
+ * ldy #xxx-2
* lda (sp),y
* tay
* ldx #$00
if (CE_IsCallTo (L[0], "pushax") &&
CS_GetEntries (S, L+1, I+1, 6) &&
L[1]->OPC == OP65_LDY &&
+ CE_IsConstImm (L[1]) &&
+ L[1]->Num >= 2 &&
L[2]->OPC == OP65_LDX &&
CE_IsKnownImm (L[2], 0) &&
L[3]->OPC == OP65_LDA &&
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;
+ CodeEntry* X;
+ const char* Arg;
/* sta ptr1 */
X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[0]->LI);
CS_InsertEntry (S, X, I+8);
- /* ldy yyy */
- X = NewCodeEntry (OP65_LDY, L[1]->AM, L[1]->Arg, 0, L[1]->LI);
+ /* ldy #xxx-2 */
+ Arg = MakeHexArg (L[1]->Num - 2);
+ X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[1]->LI);
CS_InsertEntry (S, X, I+9);
/* lda (sp),y */
*
* and replace it by:
*
- * ldy ...
* sta ptr1
* stx ptr1+1
+ * ldy ...
* lda (ptr1),y
* tax
* dey
/* Store the high byte */
X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
- CS_InsertEntry (S, X, I+1);
+ 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+2);
+ 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);
/* lda (ptr1),y */
X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[1]->LI);
- CS_InsertEntry (S, X, I+3);
+ CS_InsertEntry (S, X, I+5);
/* tax */
X = NewCodeEntry (OP65_TAX, AM65_IMP, 0, 0, L[1]->LI);
- CS_InsertEntry (S, X, I+4);
+ CS_InsertEntry (S, X, I+6);
/* dey */
X = NewCodeEntry (OP65_DEY, AM65_IMP, 0, 0, L[1]->LI);
- CS_InsertEntry (S, X, I+5);
+ CS_InsertEntry (S, X, I+7);
/* lda (ptr1),y */
X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[1]->LI);
- CS_InsertEntry (S, X, I+6);
+ CS_InsertEntry (S, X, I+8);
- /* Delete the call to ldaxidx */
- CS_DelEntry (S, I+7);
+ /* Delete original sequence */
+ CS_DelEntries (S, I, 2);
/* Remember, we had changes */
++Changes;