frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix x reg zp dependency during peephole shuffle

This commit is contained in:
drmortalwombat 2024-10-17 18:12:08 +02:00
parent ea33f253d4
commit 4e2a2c99ba
5 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/c64/rasterirq.c
View File

@ -421,7 +421,8 @@ void rirq_addrhi(RIRQCode * ic, byte n, byte hi)
void rirq_data(RIRQCode * ic, byte n, byte data)
{
byte p = irqdi[n];
ic->code[p] = data;
// ic->code[p] = data;
(volatile char *)(ic->code)[p] = data;
}
void rirq_write(RIRQCode * ic, byte n, void * addr, byte data)
@ -640,6 +641,7 @@ void rirq_sort(void)
#endif
npos++;
nextIRQ = 0;
byte yp = rasterIRQNext[nextIRQ];
if (yp != 0xff)
vic.raster = yp - 1;

3
include/c64/sprites.c
View File

@ -309,6 +309,8 @@ void vspr_update(void)
if (!done && spriteYPos[ti + 9] < 250)
{
byte ri = spriteOrder[ti + 8];
rirq_move(ti, spriteYPos[ti + 1] + 23);
#ifdef VSPRITE_REVERSE
char m = 0x80 >> (ti & 7);
#else
@ -325,7 +327,6 @@ void vspr_update(void)
rirq_data(spirq + ti, 3, vspriteImage[ri]);
rirq_data(spirq + ti, 4, xymask);
rirq_move(ti, spriteYPos[ti + 1] + 23);
// spriteYPos[ti + 9] = vspriteYLow[ri];
}
else

6
oscar64/InterCode.cpp
View File

@ -13518,7 +13518,9 @@ bool InterCodeBasicBlock::HoistCommonConditionalPath(void)
{
InterInstruction* ins = cblock->mInstructions[i];
if (cblock->CanMoveInstructionBeforeBlock(i) && !HasSideEffect(ins->mCode) && ins->mDst.mTemp >= 0 && !cblock->IsTempModifiedInRange(i + 1, cblock->mInstructions.Size(), ins->mDst.mTemp))
if (cblock->CanMoveInstructionBeforeBlock(i) && !HasSideEffect(ins->mCode) && ins->mDst.mTemp >= 0 &&
!cblock->IsTempModifiedInRange(i + 1, cblock->mInstructions.Size(), ins->mDst.mTemp) &&
!cblock->mExitRequiredTemps[ins->mDst.mTemp])
{
int j = 0;
while (j < eblock->mInstructions.Size() && !eblock->mInstructions[j]->IsEqualSource(ins))
@ -22898,7 +22900,7 @@ void InterCodeProcedure::Close(void)
{
GrowingTypeArray tstack(IT_NONE);
CheckFunc = !strcmp(mIdent->mString, "f");
CheckFunc = !strcmp(mIdent->mString, "main");
CheckCase = false;
mEntryBlock = mBlocks[0];

59
oscar64/NativeCodeGenerator.cpp
View File

@ -1565,6 +1565,10 @@ bool NativeCodeInstruction::RequiresAccu(void) const
mType == ASMIT_TAX || mType == ASMIT_TAY ||
mType == ASMIT_ASL || mType == ASMIT_LSR || mType == ASMIT_ROL || mType == ASMIT_ROR;
}
else if (mType == ASMIT_JSR)
{
return (mFlags & NCIF_USE_CPU_REG_A);
}
else
{
return
@ -5354,7 +5358,7 @@ int NativeCodeBasicBlock::PutBranch(NativeCodeProcedure* proc, NativeCodeBasicBl
}
}
void NativeCodeBasicBlock::LoadConstantToReg(InterCodeProcedure* proc, const InterInstruction* ins, const InterOperand& op, InterType type, int reg)
void NativeCodeBasicBlock::LoadConstantToReg(InterCodeProcedure* proc, const InterInstruction* ins, const InterOperand& op, InterType type, int reg, bool checkRange)
{
if (type == IT_FLOAT)
@ -5375,7 +5379,7 @@ void NativeCodeBasicBlock::LoadConstantToReg(InterCodeProcedure* proc, const Int
{
if (op.mMemory == IM_GLOBAL)
{
if (op.mIntConst < 0 || op.mIntConst > op.mLinkerObject->mSize)
if (checkRange && (op.mIntConst < 0 || op.mIntConst > op.mLinkerObject->mSize))
proc->mModule->mErrors->Error(ins->mLocation, EWARN_UNDEFINED_POINTER_ARITHMETIC, "Undefined constant pointer arithmetic");
mIns.Push(NativeCodeInstruction(ins, ASMIT_LDA, ASMIM_IMMEDIATE_ADDRESS, op.mIntConst, op.mLinkerObject, NCIF_LOWER));
@ -12770,7 +12774,7 @@ void NativeCodeBasicBlock::RelationalOperator(InterCodeProcedure* proc, const In
if (lreg < 0)
{
lreg = BC_REG_ACCU;
LoadConstantToReg(proc, ins, ins->mSrc[li], IT_POINTER, lreg);
LoadConstantToReg(proc, ins, ins->mSrc[li], IT_POINTER, lreg, false);
}
else
lreg = BC_REG_TMP + proc->mTempOffset[lreg];
@ -12778,7 +12782,7 @@ void NativeCodeBasicBlock::RelationalOperator(InterCodeProcedure* proc, const In
if (rreg < 0)
{
rreg = BC_REG_ACCU;
LoadConstantToReg(proc, ins, ins->mSrc[ri], IT_POINTER, rreg);
LoadConstantToReg(proc, ins, ins->mSrc[ri], IT_POINTER, rreg, false);
}
else
rreg = BC_REG_TMP + proc->mTempOffset[rreg];
@ -25122,6 +25126,7 @@ bool NativeCodeBasicBlock::JoinTailCodeSequences(NativeCodeProcedure* proc, bool
}
}
}
#if 1
if (mIns.Size() >= 2 && mFalseJump)
{
@ -25222,6 +25227,8 @@ bool NativeCodeBasicBlock::JoinTailCodeSequences(NativeCodeProcedure* proc, bool
int ns = mIns.Size();
const NativeCodeInstruction& ins(mIns[ns - 2]);
CheckLive();
if (ins.mType == ASMIT_STA && ins.mMode == ASMIM_ZERO_PAGE && mTrueJump && mFalseJump && !mIns[ns-1].UsesZeroPage(ins.mAddress) && mTrueJump->mEntryRequiredRegs.Size() && mFalseJump->mEntryRequiredRegs.Size())
{
if (!mIns[ns - 1].ChangesAccu())
@ -25255,6 +25262,7 @@ bool NativeCodeBasicBlock::JoinTailCodeSequences(NativeCodeProcedure* proc, bool
{
mIns[ns - 3].mType = ASMIT_LDX; mIns[ns - 3].mLive |= LIVE_CPU_REG_X;
mIns[ns - 2].mType = ASMIT_STX;
mIns[ns - 1].mLive |= LIVE_CPU_REG_X;
mTrueJump->mIns.Insert(0, ins);
mTrueJump->mIns[0].mLive |= LIVE_CPU_REG_C;
if (mTrueJump->mEntryRequiredRegs[CPU_REG_A])
@ -25269,6 +25277,7 @@ bool NativeCodeBasicBlock::JoinTailCodeSequences(NativeCodeProcedure* proc, bool
{
mIns[ns - 3].mType = ASMIT_LDX; mIns[ns - 3].mLive |= LIVE_CPU_REG_X;
mIns[ns - 2].mType = ASMIT_STX;
mIns[ns - 1].mLive |= LIVE_CPU_REG_X;
mFalseJump->mIns.Insert(0, ins);
mFalseJump->mIns[0].mLive |= LIVE_CPU_REG_C;
if (mFalseJump->mEntryRequiredRegs[CPU_REG_A])
@ -42659,25 +42668,6 @@ bool NativeCodeBasicBlock::PeepHoleOptimizerShuffle(int pass)
}
CheckLive();
#endif
// move sta zp, tax, lda abs,x , sta zp down to use
#if 1
for (int i = 0; i + 4 < mIns.Size(); i++)
{
if (mIns[i + 0].mType == ASMIT_STA && mIns[i + 0].mMode == ASMIM_ZERO_PAGE &&
mIns[i + 1].mType == ASMIT_TAX &&
mIns[i + 2].mType == ASMIT_LDA && mIns[i + 2].mMode == ASMIM_ABSOLUTE_X &&
mIns[i + 3].mType == ASMIT_STA && mIns[i + 3].mMode == ASMIM_ZERO_PAGE &&
!(mIns[i + 3].mLive & (LIVE_CPU_REG_A | LIVE_CPU_REG_X | LIVE_CPU_REG_Z)))
{
if (MoveStaTaxLdaStaDown(i))
changed = true;
}
}
CheckLive();
#endif
#if 1
@ -43603,6 +43593,25 @@ bool NativeCodeBasicBlock::PeepHoleOptimizerShuffle(int pass)
}
CheckLive();
#endif
// move sta zp, tax, lda abs,x , sta zp down to use
#if 1
for (int i = 0; i + 4 < mIns.Size(); i++)
{
if (mIns[i + 0].mType == ASMIT_STA && mIns[i + 0].mMode == ASMIM_ZERO_PAGE &&
mIns[i + 1].mType == ASMIT_TAX &&
mIns[i + 2].mType == ASMIT_LDA && mIns[i + 2].mMode == ASMIM_ABSOLUTE_X &&
mIns[i + 3].mType == ASMIT_STA && mIns[i + 3].mMode == ASMIM_ZERO_PAGE &&
!(mIns[i + 3].mLive & (LIVE_CPU_REG_A | LIVE_CPU_REG_X | LIVE_CPU_REG_Z)))
{
if (MoveStaTaxLdaStaDown(i))
changed = true;
}
}
CheckLive();
#endif
@ -51506,7 +51515,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
mInterProc = proc;
mInterProc->mLinkerObject->mNativeProc = this;
CheckFunc = !strcmp(mInterProc->mIdent->mString, "room_check_wall");
CheckFunc = !strcmp(mInterProc->mIdent->mString, "vspr_update");
int nblocks = proc->mBlocks.Size();
tblocks = new NativeCodeBasicBlock * [nblocks];
@ -52461,13 +52470,11 @@ void NativeCodeProcedure::Optimize(void)
CheckBlocks();
#if 1
ResetVisited();
if (mEntryBlock->PeepHoleOptimizer(step))
changed = true;
#endif
if (step == 2)
{
ResetVisited();

2
oscar64/NativeCodeGenerator.h
View File

@ -359,7 +359,7 @@ public:
void CheckFrameIndex(const InterInstruction * ins, int & reg, int & index, int size, int treg = 0);
void LoadValueToReg(InterCodeProcedure* proc, const InterInstruction * ins, int reg, const NativeCodeInstruction * ainsl, const NativeCodeInstruction* ainsh);
void LoadConstantToReg(InterCodeProcedure* proc, const InterInstruction* ins, InterType type, int reg);
void LoadConstantToReg(InterCodeProcedure* proc, const InterInstruction* ins, const InterOperand & op, InterType type, int reg);
void LoadConstantToReg(InterCodeProcedure* proc, const InterInstruction* ins, const InterOperand & op, InterType type, int reg, bool checkRange = true);
void LoadConstant(InterCodeProcedure* proc, const InterInstruction * ins);
void StoreValue(InterCodeProcedure* proc, const InterInstruction * ins);