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

Merge branch 'master' of https://github.com/Arisotura/melonDS

Browse Source
This commit is contained in:
Arisotura
2020-09-03 11:52:41 +02:00
parent aa94cbaeb0 910050a898
commit 1f634ed157
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ARMJIT_Memory.cpp
View File

@ -524,8 +524,8 @@ bool MapAtAddress(u32 addr)
{
u32 sectionOffset = offset;
bool hasCode = isExecutable && ARMJIT::PageContainsCode(&range[offset / 512]);
while ((!isExecutable || ARMJIT::PageContainsCode(&range[offset / 512]) == hasCode)
&& offset < mirrorSize
while (offset < mirrorSize
&& (!isExecutable || ARMJIT::PageContainsCode(&range[offset / 512]) == hasCode)
&& (!skipDTCM || mirrorStart + offset != NDS::ARM9->DTCMBase))
{
assert(states[(mirrorStart + offset) >> 12] == memstate_Unmapped);

2
src/NDS.cpp
View File

@ -3745,7 +3745,7 @@ void ARM7IOWrite8(u32 addr, u8 val)
return;
case 0x04000301:
val & 0xC0;
val &= 0xC0;
if (val == 0x40) printf("!! GBA MODE NOT SUPPORTED\n");
else if (val == 0x80) ARM7->Halt(1);
else if (val == 0xC0) EnterSleepMode();