piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

make linux work and fix a few bugs

Browse Source
This commit is contained in:
RSDuck
2020-07-04 18:58:00 +02:00
parent 62c6e2f703
commit 778623a8b7
7 changed files with 136 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ARMJIT_x64/ARMJIT_LoadStore.cpp
View File

@ -379,19 +379,16 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
AND(32, R(RSCRATCH4), Imm8(~3));
u8* fastPathStart = GetWritableCodePtr();
u8* firstLoadStoreAddr;
bool firstLoadStore = true;
u8* loadStoreAddr[16];
MOV(64, R(RSCRATCH2), ImmPtr(Num == 0 ? ARMJIT_Memory::FastMem9Start : ARMJIT_Memory::FastMem7Start));
ADD(64, R(RSCRATCH2), R(RSCRATCH4));
MOV(32, R(RSCRATCH3), R(RSCRATCH4));
u32 offset = 0;
int i = 0;
for (int reg : regs)
{
if (firstLoadStore)
firstLoadStoreAddr = GetWritableCodePtr();
loadStoreAddr[i] = GetWritableCodePtr();
OpArg mem = MDisp(RSCRATCH2, offset);
if (store)
@ -403,8 +400,7 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
else
{
LoadReg(reg, RSCRATCH);
if (firstLoadStore)
firstLoadStoreAddr = GetWritableCodePtr();
loadStoreAddr[i] = GetWritableCodePtr();
MOV(32, mem, R(RSCRATCH));
}
}
@ -421,17 +417,19 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
}
}
offset += 4;
firstLoadStore = false;
i++;
}
LoadStorePatch patch;
patch.Size = GetWritableCodePtr() - fastPathStart;
patch.Offset = fastPathStart - firstLoadStoreAddr;
SwitchToFarCode();
patch.PatchFunc = GetWritableCodePtr();
LoadStorePatches[firstLoadStoreAddr] = patch;
for (i = 0; i < regsCount; i++)
{
patch.Offset = fastPathStart - loadStoreAddr[i];
LoadStorePatches[loadStoreAddr[i]] = patch;
}
}
if (!store)