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

DS Memory: Fix crash when overflowing misaligned WRAM jump

This commit is contained in:
Vicki Pfau 2021-07-01 23:08:59 -07:00
parent b98ad200a8
commit 5c6a3de915
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -25,6 +25,7 @@ Bugfixes:
- DS GX: Fix depth test scaling
- DS GX: Fix overflow causing a division crash
- DS Video: Use separate value for maximum sprite cycles (fixes mgba.io/i/624)
- DS Memory: Fix crash when overflowing misaligned WRAM jump
Misc:
- ARM: Add F-block instruction decoding
- DS GX: Clean up and unify texture mapping

3
src/ds/memory.c
View File

@ -238,6 +238,7 @@ static void DS7SetActiveRegion(struct ARMCore* cpu, uint32_t address) {
cpu->memory.activeRegion = ds->memory.wram7;
cpu->memory.activeMask = DS7_SIZE_WORKING_RAM - 1;
} else if (ds->memory.wramSize7 == DS_SIZE_WORKING_RAM) {
// XXX: See the documentation on this hack in DSMemoryReset
if (address & DS_SIZE_WORKING_RAM) {
cpu->memory.activeRegion = ds->memory.wram;
} else {
@ -285,6 +286,7 @@ static void DS7SetActiveRegion(struct ARMCore* cpu, uint32_t address) {
cpu->memory.activeSeqCycles16 = memory->waitstatesPrefetchSeq16[memory->activeRegion];
cpu->memory.activeNonseqCycles32 = memory->waitstatesPrefetchNonseq32[memory->activeRegion];
cpu->memory.activeNonseqCycles16 = memory->waitstatesPrefetchNonseq16[memory->activeRegion];
cpu->memory.activeMask &= -(cpu->cpsr.t ? WORD_SIZE_THUMB : WORD_SIZE_ARM);
}
uint32_t DS7Load32(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
@ -815,6 +817,7 @@ static void DS9SetActiveRegion(struct ARMCore* cpu, uint32_t address) {
cpu->memory.activeSeqCycles16 = memory->waitstatesPrefetchSeq16[memory->activeRegion];
cpu->memory.activeNonseqCycles32 = memory->waitstatesPrefetchNonseq32[memory->activeRegion];
cpu->memory.activeNonseqCycles16 = memory->waitstatesPrefetchNonseq16[memory->activeRegion];
cpu->memory.activeMask &= -(cpu->cpsr.t ? WORD_SIZE_THUMB : WORD_SIZE_ARM);
}
uint32_t DS9Load32(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {