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

.github/workflows/build-ubuntu.yml

@@ -24,8 +24,8 @@ jobs:
       working-directory: ${{runner.workspace}}
       run: | # Fetch a new version of CMake, because the default is too old.
         sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \
-        && sudo apt-get update \
-        && sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev
+        && sudo apt update \
+        && sudo apt install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp0=4.1.0-2ubuntu2.1 libslirp-dev --allow-downgrades
     - name: Create build environment
       run: mkdir ${{runner.workspace}}/build
     - name: Configure

src/ARMJIT_Memory.cpp

@@ -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);

src/NDS.cpp

@@ -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();