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

GBA Memory: Fix Matrix memory bounding

This commit is contained in:
Vicki Pfau 2021-01-23 19:06:04 -08:00
parent 79c40d9359
commit 3b1b890f3e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gba/matrix.c
View File

@ -11,6 +11,8 @@
#include <mgba/internal/gba/serialize.h> #include <mgba/internal/gba/serialize.h>
#include <mgba-util/vfs.h> #include <mgba-util/vfs.h>
#define MAPPING_MASK (GBA_MATRIX_MAPPINGS_MAX - 1)
static void _remapMatrix(struct GBA* gba) { static void _remapMatrix(struct GBA* gba) {
if (gba->memory.matrix.vaddr & 0xFFFFE1FF) { if (gba->memory.matrix.vaddr & 0xFFFFE1FF) {
mLOG(GBA_MEM, ERROR, "Invalid Matrix mapping: %08X", gba->memory.matrix.vaddr); mLOG(GBA_MEM, ERROR, "Invalid Matrix mapping: %08X", gba->memory.matrix.vaddr);
@ -24,11 +26,11 @@ static void _remapMatrix(struct GBA* gba) {
mLOG(GBA_MEM, ERROR, "Invalid Matrix mapping end: %08X", gba->memory.matrix.vaddr + gba->memory.matrix.size); mLOG(GBA_MEM, ERROR, "Invalid Matrix mapping end: %08X", gba->memory.matrix.vaddr + gba->memory.matrix.size);
return; return;
} }
int start = (gba->memory.matrix.vaddr >> 9) & 0x1F; int start = gba->memory.matrix.vaddr >> 9;
int size = (gba->memory.matrix.size >> 9) & 0x1F; int size = (gba->memory.matrix.size >> 9) & MAPPING_MASK;
int i; int i;
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
gba->memory.matrix.mappings[start + i] = gba->memory.matrix.paddr + (i << 9); gba->memory.matrix.mappings[(start + i) & MAPPING_MASK] = gba->memory.matrix.paddr + (i << 9);
} }
gba->romVf->seek(gba->romVf, gba->memory.matrix.paddr, SEEK_SET); gba->romVf->seek(gba->romVf, gba->memory.matrix.paddr, SEEK_SET);