diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-09-03 11:52:41 +0200 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2020-09-03 11:52:41 +0200 |
| commit | 1f634ed1579844e5b829bc890f2040343c505360 (patch) | |
| tree | b8c6195d0f8977fbf271ea39abbaa54ef2c8abd3 | |
| parent | aa94cbaeb0cca8c3f05639fd93a979b38757f899 (diff) | |
| parent | 910050a89887d29d20d3e24a1057f654f4d66365 (diff) | |
Merge branch 'master' of https://github.com/Arisotura/melonDS
| -rw-r--r-- | .github/workflows/build-ubuntu.yml | 4 | ||||
| -rw-r--r-- | src/ARMJIT_Memory.cpp | 4 | ||||
| -rw-r--r-- | src/NDS.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 5974c69..d275f1f 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.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 diff --git a/src/ARMJIT_Memory.cpp b/src/ARMJIT_Memory.cpp index 7885fb7..c5c8f04 100644 --- a/src/ARMJIT_Memory.cpp +++ b/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); diff --git a/src/NDS.cpp b/src/NDS.cpp index bb579f6..a23772c 100644 --- a/src/NDS.cpp +++ b/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(); |