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

Fix init state of 32 vsprites mux

This commit is contained in:
drmortalwombat 2023-06-03 13:01:52 +02:00
parent 7c0db6161d
commit 962240f09d
3 changed files with 105 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/c64/sprites.c
View File

@ -233,10 +233,10 @@ void vspr_update(void)
vic.spr_msbx = xymask;
if (spriteYPos[8] < 230)
{
#pragma unroll(full)
for(char ti=0; ti<VSPRITES_MAX - 8; ti++)
{
if (spriteYPos[ti + 8] < 250)
{
char m = 1 << (ti & 7);
@ -254,10 +254,7 @@ void vspr_update(void)
rirq_data(spirq + ti, 4, xymask);
rirq_move(ti, spriteYPos[ti + 1] + 23);
}
}
else
{
for(char ti=0; ti<VSPRITES_MAX - 8; ti++)
rirq_clear(ti);
}
}

100
oscar64/NativeCodeGenerator.cpp
View File

@ -13856,6 +13856,92 @@ bool NativeCodeBasicBlock::CombineSameXY(void)
return changed;
}
bool NativeCodeBasicBlock::JoinXYCascade(void)
{
bool changed = false;
if (!mVisited)
{
mVisited = true;
bool restart;
do {
restart = false;
int predXPos = -1, predYPos = -1;
for (int i = 0; i + 2 < mIns.Size(); i++)
{
if (mIns[i + 0].mType == ASMIT_TXA &&
mIns[i + 1].mType == ASMIT_CLC &&
mIns[i + 2].mType == ASMIT_ADC && mIns[i + 2].mMode == ASMIM_IMMEDIATE)
{
if (predXPos >= 0 && !(mIns[i + 2].mLive & (LIVE_CPU_REG_X | LIVE_CPU_REG_C)) && mIns[predXPos + 2].mAddress + 1 == mIns[i + 2].mAddress)
{
// Remove add
mIns[i + 1].mType = ASMIT_NOP; mIns[i + 1].mMode = ASMIM_IMPLIED;
mIns[i + 2].mType = ASMIT_NOP; mIns[i + 2].mMode = ASMIM_IMPLIED;
// Insert INX
mIns.Insert(i, NativeCodeInstruction(mIns[i].mIns, ASMIT_INX));
// Insert TAX
mIns[predXPos + 2].mLive &= ~LIVE_CPU_REG_X;
mIns.Insert(predXPos + 3, NativeCodeInstruction(mIns[i].mIns, ASMIT_TAX));
// Restart
restart = true;
predXPos = -1;
predYPos = -1;
changed = true;
}
else
predXPos = i;
}
else if (mIns[i + 0].ReferencesXReg())
predXPos = -1;
else if (mIns[i + 0].mType == ASMIT_TYA &&
mIns[i + 1].mType == ASMIT_CLC &&
mIns[i + 2].mType == ASMIT_ADC && mIns[i + 2].mMode == ASMIM_IMMEDIATE)
{
if (predYPos >= 0 && !(mIns[i + 2].mLive & (LIVE_CPU_REG_Y | LIVE_CPU_REG_C)) && mIns[predYPos + 2].mAddress + 1 == mIns[i + 2].mAddress)
{
// Remove add
mIns[i + 1].mType = ASMIT_NOP; mIns[i + 1].mMode = ASMIM_IMPLIED;
mIns[i + 2].mType = ASMIT_NOP; mIns[i + 2].mMode = ASMIM_IMPLIED;
// Insert INY
mIns.Insert(i, NativeCodeInstruction(mIns[i].mIns, ASMIT_INY));
// Insert TAX
mIns[predYPos + 2].mLive &= ~LIVE_CPU_REG_Y;
mIns.Insert(predYPos + 3, NativeCodeInstruction(mIns[i].mIns, ASMIT_TAY));
// Restart
restart = true;
predXPos = -1;
predYPos = -1;
changed = true;
}
else
predYPos = i;
}
else if (mIns[i + 0].ReferencesYReg())
predYPos = -1;
}
} while (restart);
if (mTrueJump && mTrueJump->JoinXYCascade())
changed = true;
if (mFalseJump && mFalseJump->JoinXYCascade())
changed = true;
}
return changed;
}
bool NativeCodeBasicBlock::RegisterValueForwarding(void)
{
bool changed = false;
@ -26323,6 +26409,7 @@ bool NativeCodeBasicBlock::MoveLoadAddImmStoreUp(int at)
if (mIns[j].mLive & (LIVE_CPU_REG_A | LIVE_CPU_REG_C))
return false;
mIns[j].mLive |= LIVE_CPU_REG_A;
for (int i = j + 1; i < at; i++)
mIns[i].mLive |= LIVE_CPU_REG_C;
@ -38876,11 +38963,13 @@ void NativeCodeBasicBlock::CheckLive(void)
assert(!(live & (LIVE_CPU_REG_C | LIVE_CPU_REG_Z)));
}
if (mIns[j].ChangesAccu()) live &= ~LIVE_CPU_REG_A;
if (mIns[j].ChangesXReg()) live &= ~LIVE_CPU_REG_X;
if (mIns[j].ChangesYReg()) live &= ~LIVE_CPU_REG_Y;
if (mIns[j].ChangesCarry()) live &= ~LIVE_CPU_REG_C;
if (mIns[j].ChangesZFlag()) live &= ~LIVE_CPU_REG_Z;
if (mIns[j].RequiresAccu()) live |= LIVE_CPU_REG_A;
if (mIns[j].RequiresXReg()) live |= LIVE_CPU_REG_X;
if (mIns[j].RequiresYReg()) live |= LIVE_CPU_REG_Y;
if (mIns[j].RequiresCarry()) live |= LIVE_CPU_REG_C;
@ -38889,6 +38978,8 @@ void NativeCodeBasicBlock::CheckLive(void)
if (mEntryRequiredRegs.Size() > 0)
{
if (live & LIVE_CPU_REG_A)
assert(mEntryRequiredRegs[CPU_REG_A]);
if (live & LIVE_CPU_REG_X)
assert(mEntryRequiredRegs[CPU_REG_X]);
if (live & LIVE_CPU_REG_Y)
@ -39467,7 +39558,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
{
mInterProc = proc;
CheckFunc = !strcmp(mInterProc->mIdent->mString, "main");
CheckFunc = !strcmp(mInterProc->mIdent->mString, "sieve");
int nblocks = proc->mBlocks.Size();
tblocks = new NativeCodeBasicBlock * [nblocks];
@ -40499,6 +40590,12 @@ void NativeCodeProcedure::Optimize(void)
}
#endif
if (step == 8)
{
ResetVisited();
if (mEntryBlock->JoinXYCascade())
changed = true;
}
#if 1
if (step == 6)
@ -40697,7 +40794,6 @@ void NativeCodeProcedure::Optimize(void)
else
cnt++;
} while (changed);

3
oscar64/NativeCodeGenerator.h
View File

@ -411,6 +411,9 @@ public:
bool ForwardZpXIndex(bool full);
bool ForwardAXYReg(void);
// Join sequences of TXA, CLC, ADC #xx into INX, TXA sequences if possible
bool JoinXYCascade(void);
bool RegisterValueForwarding(void);
bool CanCombineSameXtoY(int start, int end);
bool CanCombineSameYtoX(int start, int end);