the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address issues

Browse Source
This commit is contained in:
Colin Leroy-Mira
2025-07-20 16:29:00 +02:00
parent 095ee0b27c
commit fa1b6ed4f7
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cc65/coptmisc.c
View File

@@ -434,7 +434,7 @@ static unsigned OptIncDecOps (CodeSeg* S, const char* dec, const char* inc, cons
(N = CS_GetNextEntry (S, I)) != 0 && (N = CS_GetNextEntry (S, I)) != 0 &&
(N->OPC == OP65_JSR || N->OPC == OP65_JMP) && (N->OPC == OP65_JSR || N->OPC == OP65_JMP) &&
(Val2 = IsShift (N, dec, inc, sub, add)) != 0 && (Val2 = IsShift (N, dec, inc, sub, add)) != 0 &&
abs(Val1 += Val2) <= 255 && abs (Val1 += Val2) <= 255 &&
!CE_HasLabel (N)) { !CE_HasLabel (N)) {
CodeEntry* X; CodeEntry* X;
@@ -442,14 +442,14 @@ static unsigned OptIncDecOps (CodeSeg* S, const char* dec, const char* inc, cons
if (Val1 != 0) { if (Val1 != 0) {
/* We can combine the two */ /* We can combine the two */
if (abs(Val1) <= 8) { if (abs (Val1) <= 8) {
/* Insert a call to inc/dec using the last OPC */ /* Insert a call to inc/dec using the last OPC */
xsprintf (Buf, sizeof (Buf), "%s%u", Val1 < 0 ? dec:inc, abs(Val1)); xsprintf (Buf, sizeof (Buf), "%s%u", Val1 < 0 ? dec:inc, abs (Val1));
X = NewCodeEntry (N->OPC, AM65_ABS, Buf, 0, N->LI); X = NewCodeEntry (N->OPC, AM65_ABS, Buf, 0, N->LI);
CS_InsertEntry (S, X, I+2); CS_InsertEntry (S, X, I+2);
} else { } else {
/* Insert a call to add/sub */ /* Insert a call to add/sub */
const char* Arg = MakeHexArg (abs(Val1)); const char* Arg = MakeHexArg (abs (Val1));
X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, N->LI); X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, N->LI);
CS_InsertEntry (S, X, I+2); CS_InsertEntry (S, X, I+2);
if (Val1 < 0) { if (Val1 < 0) {
@@ -568,15 +568,14 @@ unsigned OptAXLoad2 (CodeSeg* S)
signed Val; signed Val;
CodeEntry* E[3]; CodeEntry* E[3];
CodeEntry *X; CodeEntry* X;
char *End;
/* Get the next entry */ /* Get the next entry */
E[0] = CS_GetEntry (S, I); E[0] = CS_GetEntry (S, I);
/* Check for ldy followed by incaxy followed by jsr/jmp ldaxi */ /* Check for ldy followed by incaxy followed by jsr/jmp ldaxi */
if (E[0]->OPC == OP65_LDY && if (E[0]->OPC == OP65_LDY &&
E[0]->AM == AM65_IMM && CE_IsConstImm (E[0]) &&
CS_GetEntries (S, E+1, I+1, 2) && CS_GetEntries (S, E+1, I+1, 2) &&
E[1]->OPC == OP65_JSR && E[1]->OPC == OP65_JSR &&
strcmp (E[1]->Arg, "incaxy") == 0 && strcmp (E[1]->Arg, "incaxy") == 0 &&
@@ -585,10 +584,9 @@ unsigned OptAXLoad2 (CodeSeg* S)
!CS_RangeHasLabel (S, I, 3)) { !CS_RangeHasLabel (S, I, 3)) {
/* Replace with ldy (y+1) / jsr ldaxidx */ /* Replace with ldy (y+1) / jsr ldaxidx */
Val = strtoul(E[0]->Arg + 1, &End, 16); Val = E[0]->Num + 1;
Val++;
X = NewCodeEntry (OP65_LDY, AM65_IMM, MakeHexArg(Val), 0, E[0]->LI); X = NewCodeEntry (OP65_LDY, AM65_IMM, MakeHexArg (Val), 0, E[0]->LI);
CS_InsertEntry (S, X, I+3); CS_InsertEntry (S, X, I+3);
X = NewCodeEntry (E[2]->OPC, AM65_ABS, "ldaxidx", 0, E[0]->LI); X = NewCodeEntry (E[2]->OPC, AM65_ABS, "ldaxidx", 0, E[0]->LI);
CS_InsertEntry (S, X, I+4); CS_InsertEntry (S, X, I+4);