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

Fix absolute address high byte propagation error

This commit is contained in:
drmortalwombat 2023-09-30 22:22:33 +02:00
parent 078d14861c
commit 235437be56
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar64/NativeCodeGenerator.cpp
View File

@ -23597,17 +23597,17 @@ bool NativeCodeBasicBlock::PatchGlobalAddressSumYPointer(const NativeCodeBasicBl
int naddr = address + mIns[at + 2].mAddress + 256 * mIns[at + 5].mAddress; int naddr = address + mIns[at + 2].mAddress + 256 * mIns[at + 5].mAddress;
mIns[at + 2].mType = ASMIT_ADC; mIns[at + 2].mType = ASMIT_ADC;
mIns[at + 2].mMode = ASMIM_IMMEDIATE_ADDRESS; mIns[at + 2].mMode = lobj ? ASMIM_IMMEDIATE_ADDRESS : ASMIM_IMMEDIATE;
mIns[at + 2].mLinkerObject = lobj; mIns[at + 2].mLinkerObject = lobj;
mIns[at + 2].mAddress = naddr; mIns[at + 2].mAddress = lobj ? naddr : naddr & 0xff;
mIns[at + 2].mFlags = NCIF_LOWER; mIns[at + 2].mFlags = NCIF_LOWER;
mIns[at + 4].mMode = ASMIM_IMMEDIATE; mIns[at + 4].mMode = ASMIM_IMMEDIATE;
mIns[at + 4].mAddress = 0; mIns[at + 4].mAddress = 0;
mIns[at + 5].mMode = ASMIM_IMMEDIATE_ADDRESS; mIns[at + 5].mMode = lobj ? ASMIM_IMMEDIATE_ADDRESS : ASMIM_IMMEDIATE;;
mIns[at + 5].mLinkerObject = lobj; mIns[at + 5].mLinkerObject = lobj;
mIns[at + 5].mAddress = naddr; mIns[at + 5].mAddress = lobj ? naddr : naddr >> 8;
mIns[at + 5].mFlags = NCIF_UPPER; mIns[at + 5].mFlags = NCIF_UPPER;
at += 6; at += 6;
@ -27746,6 +27746,11 @@ bool NativeCodeBasicBlock::MoveCLCLoadAddZPStoreDown(int at)
mIns.Insert(j, mIns[at + 1]); // LDA mIns.Insert(j, mIns[at + 1]); // LDA
mIns.Insert(j, mIns[at + 0]); // CLC mIns.Insert(j, mIns[at + 0]); // CLC
mIns[j + 0].mLive |= mIns[j - 1].mLive;
mIns[j + 1].mLive |= mIns[j - 1].mLive;
mIns[j + 2].mLive |= mIns[j - 1].mLive;
mIns[j + 3].mLive |= mIns[j - 1].mLive;
mIns[at + 0].mType = ASMIT_NOP; mIns[at + 0].mMode = ASMIM_IMPLIED; mIns[at + 0].mType = ASMIT_NOP; mIns[at + 0].mMode = ASMIM_IMPLIED;
mIns[at + 1].mType = ASMIT_NOP; mIns[at + 1].mMode = ASMIM_IMPLIED; mIns[at + 1].mType = ASMIT_NOP; mIns[at + 1].mMode = ASMIM_IMPLIED;
mIns[at + 2].mType = ASMIT_NOP; mIns[at + 2].mMode = ASMIM_IMPLIED; mIns[at + 2].mType = ASMIT_NOP; mIns[at + 2].mMode = ASMIM_IMPLIED;
@ -41269,7 +41274,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
{ {
mInterProc = proc; mInterProc = proc;
CheckFunc = !strcmp(mInterProc->mIdent->mString, "main"); CheckFunc = !strcmp(mInterProc->mIdent->mString, "dungeon_rand_path");
int nblocks = proc->mBlocks.Size(); int nblocks = proc->mBlocks.Size();
tblocks = new NativeCodeBasicBlock * [nblocks]; tblocks = new NativeCodeBasicBlock * [nblocks];
@ -41958,7 +41963,6 @@ void NativeCodeProcedure::Optimize(void)
} }
#endif #endif
int t = 0; int t = 0;
#if 1 #if 1
do do