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

More volatile checks

This commit is contained in:
drmortalwombat 2023-03-14 20:51:54 +01:00
parent f590284ae2
commit 7617029652
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar64/NativeCodeGenerator.cpp
View File

@ -14092,13 +14092,16 @@ bool NativeCodeBasicBlock::OptimizeXYPairUsage(void)
void NativeCodeBasicBlock::BuildUseChangeSets(int start, int end, unsigned & used, unsigned & changed) void NativeCodeBasicBlock::BuildUseChangeSets(int start, int end, unsigned & used, unsigned & changed, uint32 & flags)
{ {
used = 0; used = 0;
changed = 0; changed = 0;
flags = 0;
for (int i = start; i < end; i++) for (int i = start; i < end; i++)
{ {
flags |= mIns[i].mFlags;
if (mIns[i].RequiresCarry() && !(changed & LIVE_CPU_REG_C)) if (mIns[i].RequiresCarry() && !(changed & LIVE_CPU_REG_C))
used |= LIVE_CPU_REG_C; used |= LIVE_CPU_REG_C;
if (mIns[i].RequiresXReg() && !(changed & LIVE_CPU_REG_X)) if (mIns[i].RequiresXReg() && !(changed & LIVE_CPU_REG_X))
@ -14118,9 +14121,13 @@ void NativeCodeBasicBlock::BuildUseChangeSets(int start, int end, unsigned & use
bool NativeCodeBasicBlock::CanExchangeSegments(int start, int mid, int end) bool NativeCodeBasicBlock::CanExchangeSegments(int start, int mid, int end)
{ {
unsigned usedFront, changedFront, usedBack, changedBack; unsigned usedFront, changedFront, usedBack, changedBack;
uint32 flagsFront, flagsBack;
BuildUseChangeSets(start, mid, usedFront, changedFront); BuildUseChangeSets(start, mid, usedFront, changedFront, flagsFront);
BuildUseChangeSets(mid, end, usedBack, changedBack); BuildUseChangeSets(mid, end, usedBack, changedBack, flagsBack);
if (flagsFront & flagsBack & NCIF_VOLATILE)
return false;
if (usedFront & changedBack) if (usedFront & changedBack)
return false; return false;
@ -37788,7 +37795,7 @@ void NativeCodeProcedure::RebuildEntry(void)
void NativeCodeProcedure::Optimize(void) void NativeCodeProcedure::Optimize(void)
{ {
CheckFunc = !strcmp(mInterProc->mIdent->mString, "check"); CheckFunc = !strcmp(mInterProc->mIdent->mString, "_mapUp");
#if 1 #if 1
int step = 0; int step = 0;
@ -38214,6 +38221,7 @@ void NativeCodeProcedure::Optimize(void)
changed = true; changed = true;
#endif #endif
#if 1 #if 1
if (step >= 5) if (step >= 5)
{ {

2
oscar64/NativeCodeGenerator.h
View File

@ -495,7 +495,7 @@ public:
bool MoveAccuTrainsDown(void); bool MoveAccuTrainsDown(void);
bool MoveAccuTrainDown(int end, int start); bool MoveAccuTrainDown(int end, int start);
void BuildUseChangeSets(int start, int end, unsigned & used, unsigned & changed); void BuildUseChangeSets(int start, int end, unsigned & used, unsigned & changed, uint32 & flags);
bool CanExchangeSegments(int start, int mid, int end); bool CanExchangeSegments(int start, int mid, int end);
bool CrossBlockXYPreservation(void); bool CrossBlockXYPreservation(void);