ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 16-bit DSi ARM9 read

This commit is contained in:
RSDuck 2020-07-23 20:06:44 +00:00
parent f5130f82eb
commit 116d831cfd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ARMJIT_A64/ARMJIT_LoadStore.cpp
View File

@ -258,7 +258,7 @@ void Compiler::Comp_MemAccess(int rd, int rn, Op2 offset, int size, int flags)
case 32: QuickCallFunction(X3, SlowRead9<u32, 0>); break; case 32: QuickCallFunction(X3, SlowRead9<u32, 0>); break;
case 33: QuickCallFunction(X3, SlowRead9<u32, 1>); break; case 33: QuickCallFunction(X3, SlowRead9<u32, 1>); break;
case 16: QuickCallFunction(X3, SlowRead9<u16, 0>); break; case 16: QuickCallFunction(X3, SlowRead9<u16, 0>); break;
case 17: QuickCallFunction(X3, SlowRead9<u16, 0>); break; case 17: QuickCallFunction(X3, SlowRead9<u16, 1>); break;
case 8: QuickCallFunction(X3, SlowRead9<u8, 0>); break; case 8: QuickCallFunction(X3, SlowRead9<u8, 0>); break;
case 9: QuickCallFunction(X3, SlowRead9<u8, 1>); break; case 9: QuickCallFunction(X3, SlowRead9<u8, 1>); break;
} }
@ -643,7 +643,7 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
if (Num == 0) if (Num == 0)
{ {
MOV(X3, RCPU); MOV(X3, RCPU);
switch (store * 2 | NDS::ConsoleType) switch ((u32)store * 2 | NDS::ConsoleType)
{ {
case 0: QuickCallFunction(X4, SlowBlockTransfer9<false, 0>); break; case 0: QuickCallFunction(X4, SlowBlockTransfer9<false, 0>); break;
case 1: QuickCallFunction(X4, SlowBlockTransfer9<false, 1>); break; case 1: QuickCallFunction(X4, SlowBlockTransfer9<false, 1>); break;
@ -653,7 +653,7 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
} }
else else
{ {
switch (store * 2 | NDS::ConsoleType) switch ((u32)store * 2 | NDS::ConsoleType)
{ {
case 0: QuickCallFunction(X4, SlowBlockTransfer7<false, 0>); break; case 0: QuickCallFunction(X4, SlowBlockTransfer7<false, 0>); break;
case 1: QuickCallFunction(X4, SlowBlockTransfer7<false, 1>); break; case 1: QuickCallFunction(X4, SlowBlockTransfer7<false, 1>); break;