LI_NONE = 0x00,
LI_DIRECT = 0x01, /* Direct op may be used */
LI_RELOAD_Y = 0x02, /* Reload index register Y */
- LI_REMOVE = 0x04, /* Load may be removed */
+ LI_TRANSFER = 0x04, /* Loaded value is transfered */
+ LI_REMOVE = 0x08, /* Load may be removed */
} LI_FLAGS;
/* Structure that tells us how to load the lhs values */
typedef struct LoadRegInfo LoadRegInfo;
struct LoadRegInfo {
+ LI_FLAGS Flags; /* Tells us how to load */
int LoadIndex; /* Index of load insn, -1 if invalid */
CodeEntry* LoadEntry; /* The actual entry, 0 if invalid */
- LI_FLAGS Flags; /* Tells us how to load */
+ int XferIndex; /* Index of transfer insn */
+ CodeEntry* XferEntry; /* The actual transfer entry */
unsigned char Offs; /* Stack offset if data is on stack */
};
-
+
/* Now combined for both registers */
typedef struct LoadInfo LoadInfo;
struct LoadInfo {
/* Clear a LoadRegInfo struct */
{
RI->LoadIndex = -1;
+ RI->XferIndex = -1;
+ RI->Flags = LI_NONE;
+}
+
+
+
+static void InvalidateLoadRegInfo (LoadRegInfo* RI)
+/* Invalidate a LoadRegInfo struct */
+{
+ RI->LoadIndex = -1;
+ RI->XferIndex = -1;
}
static void FinalizeLoadRegInfo (LoadRegInfo* RI, CodeSeg* S)
/* Prepare a LoadRegInfo struct for use */
{
- /* Get the entry */
+ /* Get the entries */
if (RI->LoadIndex >= 0) {
RI->LoadEntry = CS_GetEntry (S, RI->LoadIndex);
} else {
RI->LoadEntry = 0;
}
- RI->Flags = LI_NONE;
+ if (RI->XferIndex >= 0) {
+ RI->XferEntry = CS_GetEntry (S, RI->XferIndex);
+ } else {
+ RI->XferEntry = 0;
+ }
}
-static void AdjustLoadRegInfo (LoadRegInfo* RI, int DelIndex, int Change)
+static void AdjustLoadRegInfo (LoadRegInfo* RI, int Index, int Change)
/* Adjust a load register info struct after deleting or inserting an entry
* with a given index
*/
CHECK (abs (Change) == 1);
if (Change < 0) {
/* Deletion */
- if (DelIndex < RI->LoadIndex) {
+ if (Index < RI->LoadIndex) {
--RI->LoadIndex;
- } else if (DelIndex == RI->LoadIndex) {
+ } else if (Index == RI->LoadIndex) {
/* Has been removed */
RI->LoadIndex = -1;
RI->LoadEntry = 0;
}
+ if (Index < RI->XferIndex) {
+ --RI->XferIndex;
+ } else if (Index == RI->XferIndex) {
+ /* Has been removed */
+ RI->XferIndex = -1;
+ RI->XferEntry = 0;
+ }
} else {
/* Insertion */
- if (DelIndex <= RI->LoadIndex) {
+ if (Index <= RI->LoadIndex) {
++RI->LoadIndex;
}
+ if (Index <= RI->XferIndex) {
+ ++RI->XferIndex;
+ }
}
}
-static void AdjustLoadInfo (LoadInfo* LI, int DelIndex, int Change)
+static void AdjustLoadInfo (LoadInfo* LI, int Index, int Change)
/* Adjust a load info struct after deleting entry with a given index */
{
- AdjustLoadRegInfo (&LI->A, DelIndex, Change);
- AdjustLoadRegInfo (&LI->X, DelIndex, Change);
- AdjustLoadRegInfo (&LI->Y, DelIndex, Change);
+ AdjustLoadRegInfo (&LI->A, Index, Change);
+ AdjustLoadRegInfo (&LI->X, Index, Change);
+ AdjustLoadRegInfo (&LI->Y, Index, Change);
}
if (E->Info & OF_LOAD) {
if (E->Chg & REG_A) {
LI->A.LoadIndex = I;
+ LI->A.XferIndex = -1;
}
if (E->Chg & REG_X) {
LI->X.LoadIndex = I;
+ LI->X.XferIndex = -1;
}
if (E->Chg & REG_Y) {
LI->Y.LoadIndex = I;
+ LI->Y.XferIndex = -1;
}
} else if (E->Info & OF_XFR) {
switch (E->OPC) {
- case OP65_TAX: LI->X.LoadIndex = LI->A.LoadIndex; break;
- case OP65_TAY: LI->Y.LoadIndex = LI->A.LoadIndex; break;
- case OP65_TXA: LI->A.LoadIndex = LI->X.LoadIndex; break;
- case OP65_TYA: LI->A.LoadIndex = LI->Y.LoadIndex; break;
- default: break;
+ case OP65_TAX:
+ LI->X.LoadIndex = LI->A.LoadIndex;
+ LI->X.XferIndex = I;
+ break;
+ case OP65_TAY:
+ LI->Y.LoadIndex = LI->A.LoadIndex;
+ LI->Y.XferIndex = I;
+ break;
+ case OP65_TXA:
+ LI->A.LoadIndex = LI->X.LoadIndex;
+ LI->A.XferIndex = I;
+ break;
+ case OP65_TYA:
+ LI->A.LoadIndex = LI->Y.LoadIndex;
+ LI->A.XferIndex = I;
+ break;
+ default:
+ break;
}
} else if (CE_IsCallTo (E, "ldaxysp")) {
/* Both registers set, Y changed */
LI->A.LoadIndex = I;
- LI->X.LoadIndex = I;
- LI->Y.LoadIndex = -1;
+ LI->A.XferIndex = -1;
+ LI->X.LoadIndex = I;
+ LI->X.XferIndex = -1;
+ InvalidateLoadRegInfo (&LI->Y);
} else {
if (E->Chg & REG_A) {
- LI->A.LoadIndex = -1;
+ InvalidateLoadRegInfo (&LI->A);
}
if (E->Chg & REG_X) {
- LI->X.LoadIndex = -1;
+ InvalidateLoadRegInfo (&LI->X);
}
if (E->Chg & REG_Y) {
- LI->Y.LoadIndex = -1;
+ InvalidateLoadRegInfo (&LI->Y);
}
}
}
+static void InsertEntry (StackOpData* D, CodeEntry* E, int Index)
+/* Insert a new entry. Depending on Index, D->PushIndex and D->OpIndex will
+ * be adjusted by this function.
+ */
+{
+ /* Insert the entry into the code segment */
+ CS_InsertEntry (D->Code, E, Index);
+
+ /* Adjust register loads if necessary */
+ AdjustLoadInfo (&D->Lhs, Index, 1);
+ AdjustLoadInfo (&D->Rhs, Index, 1);
+
+ /* Adjust the indices if necessary */
+ if (D->PushEntry && Index <= D->PushIndex) {
+ ++D->PushIndex;
+ }
+ if (D->OpEntry && Index <= D->OpIndex) {
+ ++D->OpIndex;
+ }
+}
+
+
+
+static void DelEntry (StackOpData* D, int Index)
+/* Delete an entry. Depending on Index, D->PushIndex and D->OpIndex will be
+ * adjusted by this function, and PushEntry/OpEntry may get invalidated.
+ */
+{
+ /* Delete the entry from the code segment */
+ CS_DelEntry (D->Code, Index);
+
+ /* Adjust register loads if necessary */
+ AdjustLoadInfo (&D->Lhs, Index, -1);
+ AdjustLoadInfo (&D->Rhs, Index, -1);
+
+ /* Adjust the other indices if necessary */
+ if (Index < D->PushIndex) {
+ --D->PushIndex;
+ } else if (Index == D->PushIndex) {
+ D->PushEntry = 0;
+ }
+ if (Index < D->OpIndex) {
+ --D->OpIndex;
+ } else if (Index == D->OpIndex) {
+ D->OpEntry = 0;
+ }
+}
+
+
+
static void AdjustStackOffset (StackOpData* D, unsigned Offs)
/* Adjust the offset for all stack accesses in the range PushIndex to OpIndex.
* OpIndex is adjusted according to the insertions.
/* Insert a new load instruction before the stack access */
const char* Arg = MakeHexArg (E->RI->In.RegY - Offs);
CodeEntry* X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, E->LI);
- CS_InsertEntry (D->Code, X, I++);
-
- /* One more inserted entries */
- ++D->OpIndex;
+ InsertEntry (D, X, I++);
}
if (RegYUsed (D->Code, I+1)) {
const char* Arg = MakeHexArg (E->RI->In.RegY);
CodeEntry* X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, E->LI);
- CS_InsertEntry (D->Code, X, I+1);
-
- /* One more inserted entries */
- ++D->OpIndex;
+ InsertEntry (D, X, I+1);
/* Skip this instruction in the next round */
++I;
-static void InsertEntry (StackOpData* D, CodeEntry* E, int Index)
-/* Insert a new entry. Depending on Index, D->PushIndex and D->OpIndex will
- * be adjusted by this function.
- */
-{
- /* Insert the entry into the code segment */
- CS_InsertEntry (D->Code, E, Index);
-
- /* Adjust register loads if necessary */
- AdjustLoadInfo (&D->Lhs, Index, 1);
- AdjustLoadInfo (&D->Rhs, Index, 1);
-
- /* Adjust the indices if necessary */
- if (D->PushEntry && Index <= D->PushIndex) {
- ++D->PushIndex;
- }
- if (D->OpEntry && Index <= D->OpIndex) {
- ++D->OpIndex;
- }
-}
-
-
-
-static void DelEntry (StackOpData* D, int Index)
-/* Delete an entry. Depending on Index, D->PushIndex and D->OpIndex will be
- * adjusted by this function, and PushEntry/OpEntry may get invalidated.
- */
-{
- /* Delete the entry from the code segment */
- CS_DelEntry (D->Code, Index);
-
- /* Adjust register loads if necessary */
- AdjustLoadInfo (&D->Lhs, Index, -1);
- AdjustLoadInfo (&D->Rhs, Index, -1);
-
- /* Adjust the other indices if necessary */
- if (Index < D->PushIndex) {
- --D->PushIndex;
- } else if (Index == D->PushIndex) {
- D->PushEntry = 0;
- }
- if (Index < D->OpIndex) {
- --D->OpIndex;
- } else if (Index == D->OpIndex) {
- D->OpEntry = 0;
- }
-}
-
-
-
static void CheckOneDirectOp (LoadRegInfo* LI, unsigned char Offs)
/* Check if the given entry is a lda instruction with an addressing mode
* that allows us to replace it by another operation (like ora). If so, we may
/* Both registers may be loaded with one insn, but DelEntry will in this
* case clear the other one.
*/
- if (LI->A.LoadIndex >= 0 && (LI->A.Flags & LI_REMOVE)) {
- DelEntry (D, LI->A.LoadIndex);
+ if (LI->A.Flags & LI_REMOVE) {
+ if (LI->A.LoadIndex >= 0) {
+ DelEntry (D, LI->A.LoadIndex);
+ }
+ if (LI->A.XferIndex >= 0) {
+ DelEntry (D, LI->A.XferIndex);
+ }
}
- if (LI->X.LoadIndex >= 0 && (LI->X.Flags & LI_REMOVE)) {
- DelEntry (D, LI->X.LoadIndex);
+ if (LI->X.Flags & LI_REMOVE) {
+ if (LI->X.LoadIndex >= 0) {
+ DelEntry (D, LI->X.LoadIndex);
+ }
+ if (LI->X.XferIndex >= 0) {
+ DelEntry (D, LI->X.XferIndex);
+ }
}
}
+static unsigned Opt_tosugtax (StackOpData* D)
+/* Optimize the tosugtax sequence */
+{
+ CodeEntry* X;
+
+
+ /* Inline the sbc */
+ D->IP = D->OpIndex+1;
+
+ /* Must be true because of OP_RHS_LOAD */
+ CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0);
+
+ /* Add code for low operand */
+ AddOpLow (D, OP65_CMP, &D->Rhs);
+
+ /* Add code for high operand */
+ AddOpHigh (D, OP65_SBC, &D->Rhs, 0);
+
+ /* Transform to boolean */
+ X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolugt", 0, D->OpEntry->LI);
+ InsertEntry (D, X, D->IP++);
+
+ /* Remove the push and the call to the operator function */
+ RemoveRemainders (D);
+
+ /* We changed the sequence */
+ return 1;
+}
+
+
+
+static unsigned Opt_tosuleax (StackOpData* D)
+/* Optimize the tosuleax sequence */
+{
+ CodeEntry* X;
+
+
+ /* Inline the sbc */
+ D->IP = D->OpIndex+1;
+
+ /* Must be true because of OP_RHS_LOAD */
+ CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0);
+
+ /* Add code for low operand */
+ AddOpLow (D, OP65_CMP, &D->Rhs);
+
+ /* Add code for high operand */
+ AddOpHigh (D, OP65_SBC, &D->Rhs, 0);
+
+ /* Transform to boolean */
+ X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolule", 0, D->OpEntry->LI);
+ InsertEntry (D, X, D->IP++);
+
+ /* Remove the push and the call to the operator function */
+ RemoveRemainders (D);
+
+ /* We changed the sequence */
+ return 1;
+}
+
+
+
+static unsigned Opt_tosultax (StackOpData* D)
+/* Optimize the tosultax sequence */
+{
+ CodeEntry* X;
+
+
+ /* Inline the sbc */
+ D->IP = D->OpIndex+1;
+
+ /* Must be true because of OP_RHS_LOAD */
+ CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0);
+
+ /* Add code for low operand */
+ AddOpLow (D, OP65_CMP, &D->Rhs);
+
+ /* Add code for high operand */
+ AddOpHigh (D, OP65_SBC, &D->Rhs, 0);
+
+ /* Transform to boolean */
+ X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolult", 0, D->OpEntry->LI);
+ InsertEntry (D, X, D->IP++);
+
+ /* Remove the push and the call to the operator function */
+ RemoveRemainders (D);
+
+ /* We changed the sequence */
+ return 1;
+}
+
+
+
static unsigned Opt_tosxorax (StackOpData* D)
/* Optimize the tosxorax sequence */
{
{ "tosorax", Opt_tosorax, REG_NONE, OP_NONE },
{ "tossubax", Opt_tossubax, REG_NONE, OP_RHS_LOAD_DIRECT },
{ "tosugeax", Opt_tosugeax, REG_NONE, OP_RHS_LOAD_DIRECT },
+ { "tosugtax", Opt_tosugtax, REG_NONE, OP_RHS_LOAD_DIRECT },
+ { "tosuleax", Opt_tosuleax, REG_NONE, OP_RHS_LOAD_DIRECT },
+ { "tosultax", Opt_tosultax, REG_NONE, OP_RHS_LOAD_DIRECT },
{ "tosxorax", Opt_tosxorax, REG_NONE, OP_NONE },
};
#define FUNC_COUNT (sizeof(FuncTable) / sizeof(FuncTable[0]))
break;
}
+ /* Prepare the remainder of the data structure. */
+ Data.PrevEntry = CS_GetPrevEntry (S, Data.PushIndex);
+ Data.PushEntry = CS_GetEntry (S, Data.PushIndex);
+ Data.OpEntry = CS_GetEntry (S, Data.OpIndex);
+ Data.NextEntry = CS_GetNextEntry (S, Data.OpIndex);
+
/* Adjust stack offsets to account for the upcoming removal */
AdjustStackOffset (&Data, 2);
*/
CS_GenRegInfo (S);
- /* Prepare the remainder of the data structure. */
- Data.PrevEntry = CS_GetPrevEntry (S, Data.PushIndex);
- Data.PushEntry = CS_GetEntry (S, Data.PushIndex);
- Data.OpEntry = CS_GetEntry (S, Data.OpIndex);
- Data.NextEntry = CS_GetNextEntry (S, Data.OpIndex);
-
/* Call the optimizer function */
Changes += Data.OptFunc->Func (&Data);
projects / cc65 / commitdiff