6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-27 09:33:42 +00:00
Code Issues Projects Releases Wiki Activity

Replacement code for ule and ugt was wrong and did not cover values that were

Browse Source 
equal.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4112 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2009-09-03 11:58:11 +00:00
parent 7cd92c82fa
commit d85e6f9124
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cc65/coptstop.c
View File

@ -70,7 +70,7 @@ struct LoadRegInfo {
CodeEntry* XferEntry; /* The actual transfer entry */ CodeEntry* XferEntry; /* The actual transfer entry */
unsigned char Offs; /* Stack offset if data is on stack */ unsigned char Offs; /* Stack offset if data is on stack */
}; };
/* Now combined for both registers */ /* Now combined for both registers */
typedef struct LoadInfo LoadInfo; typedef struct LoadInfo LoadInfo;
struct LoadInfo { struct LoadInfo {
@ -293,7 +293,7 @@ static void TrackLoads (LoadInfo* LI, CodeEntry* E, int I)
/* Both registers set, Y changed */ /* Both registers set, Y changed */
LI->A.LoadIndex = I; LI->A.LoadIndex = I;
LI->A.XferIndex = -1; LI->A.XferIndex = -1;
LI->X.LoadIndex = I; LI->X.LoadIndex = I;
LI->X.XferIndex = -1; LI->X.XferIndex = -1;
InvalidateLoadRegInfo (&LI->Y); InvalidateLoadRegInfo (&LI->Y);
} else { } else {
@ -1406,12 +1406,24 @@ static unsigned Opt_tosugtax (StackOpData* D)
/* Must be true because of OP_RHS_LOAD */ /* Must be true because of OP_RHS_LOAD */
CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0); CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0);
/* sec */
X = NewCodeEntry (OP65_SEC, AM65_IMP, 0, 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++);
/* Add code for low operand */ /* Add code for low operand */
AddOpLow (D, OP65_CMP, &D->Rhs); AddOpLow (D, OP65_SBC, &D->Rhs);
/* We need the zero flag, so remember the immediate result */
X = NewCodeEntry (OP65_STA, AM65_ZP, "tmp1", 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++);
/* Add code for high operand */ /* Add code for high operand */
AddOpHigh (D, OP65_SBC, &D->Rhs, 0); AddOpHigh (D, OP65_SBC, &D->Rhs, 0);
/* Set Z flag */
X = NewCodeEntry (OP65_ORA, AM65_ZP, "tmp1", 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++);
/* Transform to boolean */ /* Transform to boolean */
X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolugt", 0, D->OpEntry->LI); X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolugt", 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++); InsertEntry (D, X, D->IP++);
@ -1437,12 +1449,24 @@ static unsigned Opt_tosuleax (StackOpData* D)
/* Must be true because of OP_RHS_LOAD */ /* Must be true because of OP_RHS_LOAD */
CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0); CHECK ((D->Rhs.A.Flags & D->Rhs.X.Flags & LI_DIRECT) != 0);
/* sec */
X = NewCodeEntry (OP65_SEC, AM65_IMP, 0, 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++);
/* Add code for low operand */ /* Add code for low operand */
AddOpLow (D, OP65_CMP, &D->Rhs); AddOpLow (D, OP65_SBC, &D->Rhs);
/* We need the zero flag, so remember the immediate result */
X = NewCodeEntry (OP65_STA, AM65_ZP, "tmp1", 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++);
/* Add code for high operand */ /* Add code for high operand */
AddOpHigh (D, OP65_SBC, &D->Rhs, 0); AddOpHigh (D, OP65_SBC, &D->Rhs, 0);
/* Set Z flag */
X = NewCodeEntry (OP65_ORA, AM65_ZP, "tmp1", 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++);
/* Transform to boolean */ /* Transform to boolean */
X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolule", 0, D->OpEntry->LI); X = NewCodeEntry (OP65_JSR, AM65_ABS, "boolule", 0, D->OpEntry->LI);
InsertEntry (D, X, D->IP++); InsertEntry (D, X, D->IP++);