empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed 'Opt_staxspidx' for the invariant of 'staxspidx'.

Browse source
This commit is contained in:
acqn 2021-02-13 22:02:52 +08:00 • committed by greg-king5
parent 3a7282544e
commit 55ae350fed
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cc65/coptstop.c
View file

@ -453,6 +453,7 @@ static unsigned Opt_staxspidx (StackOpData* D)
/* Optimize the staxspidx sequence */ /* Optimize the staxspidx sequence */
{ {
CodeEntry* X; CodeEntry* X;
const char* Arg = 0;
/* Check if we're using a register variable */ /* Check if we're using a register variable */
if (!IsRegVar (D)) { if (!IsRegVar (D)) {
@ -469,7 +470,7 @@ static unsigned Opt_staxspidx (StackOpData* D)
if (RegValIsKnown (D->OpEntry->RI->In.RegY)) { if (RegValIsKnown (D->OpEntry->RI->In.RegY)) {
/* Value of Y is known */ /* Value of Y is known */
const char* Arg = MakeHexArg (D->OpEntry->RI->In.RegY + 1); Arg = MakeHexArg (D->OpEntry->RI->In.RegY + 1);
X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, D->OpEntry->LI); X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, D->OpEntry->LI);
} else { } else {
X = NewCodeEntry (OP65_INY, AM65_IMP, 0, 0, D->OpEntry->LI); X = NewCodeEntry (OP65_INY, AM65_IMP, 0, 0, D->OpEntry->LI);
@ -478,7 +479,7 @@ static unsigned Opt_staxspidx (StackOpData* D)
if (RegValIsKnown (D->OpEntry->RI->In.RegX)) { if (RegValIsKnown (D->OpEntry->RI->In.RegX)) {
/* Value of X is known */ /* Value of X is known */
const char* Arg = MakeHexArg (D->OpEntry->RI->In.RegX); Arg = MakeHexArg (D->OpEntry->RI->In.RegX);
X = NewCodeEntry (OP65_LDA, AM65_IMM, Arg, 0, D->OpEntry->LI); X = NewCodeEntry (OP65_LDA, AM65_IMM, Arg, 0, D->OpEntry->LI);
} else { } else {
/* Value unknown */ /* Value unknown */
@ -493,7 +494,12 @@ static unsigned Opt_staxspidx (StackOpData* D)
/* If we remove staxspidx, we must restore the Y register to what the /* If we remove staxspidx, we must restore the Y register to what the
** function would return. ** function would return.
*/ */
X = NewCodeEntry (OP65_LDY, AM65_IMM, "$00", 0, D->OpEntry->LI); if (RegValIsKnown (D->OpEntry->RI->In.RegY)) {
Arg = MakeHexArg (D->OpEntry->RI->In.RegY);
X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, D->OpEntry->LI);
} else {
X = NewCodeEntry (OP65_DEY, AM65_IMP, 0, 0, D->OpEntry->LI);
}
InsertEntry (D, X, D->OpIndex+5); InsertEntry (D, X, D->OpIndex+5);
/* Remove the push and the call to the staxspidx function */ /* Remove the push and the call to the staxspidx function */