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

Replaced direct CEF_NUMARG flag checks on code entries with CE_HasNumArg().

Browse Source
This commit is contained in:
acqn
2020-04-16 17:17:52 +08:00
committed by Oliver Schmidt
parent c45a6b3685
commit 28c7aa2bc8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc65/coptcmp.c
View File

@@ -176,14 +176,14 @@ static int IsImmCmp16 (CodeEntry** L)
{ {
return (L[0]->OPC == OP65_CPX && return (L[0]->OPC == OP65_CPX &&
L[0]->AM == AM65_IMM && L[0]->AM == AM65_IMM &&
(L[0]->Flags & CEF_NUMARG) != 0 && CE_HasNumArg (L[0]) &&
!CE_HasLabel (L[0]) && !CE_HasLabel (L[0]) &&
(L[1]->OPC == OP65_JNE || L[1]->OPC == OP65_BNE) && (L[1]->OPC == OP65_JNE || L[1]->OPC == OP65_BNE) &&
L[1]->JumpTo != 0 && L[1]->JumpTo != 0 &&
!CE_HasLabel (L[1]) && !CE_HasLabel (L[1]) &&
L[2]->OPC == OP65_CMP && L[2]->OPC == OP65_CMP &&
L[2]->AM == AM65_IMM && L[2]->AM == AM65_IMM &&
(L[2]->Flags & CEF_NUMARG) != 0 && CE_HasNumArg (L[2]) &&
(L[3]->Info & OF_CBRA) != 0 && (L[3]->Info & OF_CBRA) != 0 &&
L[3]->JumpTo != 0 && L[3]->JumpTo != 0 &&
(L[1]->JumpTo->Owner == L[3] || L[1]->JumpTo == L[3]->JumpTo)); (L[1]->JumpTo->Owner == L[3] || L[1]->JumpTo == L[3]->JumpTo));

18
src/cc65/coptneg.c
View File

@@ -68,15 +68,15 @@ unsigned OptBNegA1 (CodeSeg* S)
CodeEntry* E = CS_GetEntry (S, I); CodeEntry* E = CS_GetEntry (S, I);
/* Check for a ldx */ /* Check for a ldx */
if (E->OPC == OP65_LDX && if (E->OPC == OP65_LDX &&
E->AM == AM65_IMM && E->AM == AM65_IMM &&
(E->Flags & CEF_NUMARG) != 0 && CE_HasNumArg (E) &&
E->Num == 0 && E->Num == 0 &&
CS_GetEntries (S, L, I+1, 2) && CS_GetEntries (S, L, I+1, 2) &&
L[0]->OPC == OP65_LDA && L[0]->OPC == OP65_LDA &&
(L[0]->Use & REG_X) == 0 && (L[0]->Use & REG_X) == 0 &&
!CE_HasLabel (L[0]) && !CE_HasLabel (L[0]) &&
CE_IsCallTo (L[1], "bnega") && CE_IsCallTo (L[1], "bnega") &&
!CE_HasLabel (L[1])) { !CE_HasLabel (L[1])) {
/* Remove the ldx instruction */ /* Remove the ldx instruction */