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 bad BIOS Load16 on big endian

This commit is contained in:
Jeffrey Pfau 2015-10-04 21:19:17 -07:00
parent a32f17b4bb
commit db31ecbe6f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -15,6 +15,7 @@ Bugfixes:
- GBA Video: Fix objwin and blending interaction on sprites - GBA Video: Fix objwin and blending interaction on sprites
- GBA Video: Fix OBJ semitransparency improperly interacting with other blending ops - GBA Video: Fix OBJ semitransparency improperly interacting with other blending ops
- GBA: Fix autodetect problems with some bad dumps of Super Mario Advance 2 - GBA: Fix autodetect problems with some bad dumps of Super Mario Advance 2
- GBA Memory: Fix bad BIOS Load16 on big endian
Misc: Misc:
- Qt: Remove useless help icons in dialogs - Qt: Remove useless help icons in dialogs
- GBA: Attempting to save a screenshot-style savestate should be allowed without libpng - GBA: Attempting to save a screenshot-style savestate should be allowed without libpng

2
src/gba/memory.c
View File

@ -441,7 +441,7 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
LOAD_16(value, address, memory->bios); LOAD_16(value, address, memory->bios);
} else { } else {
GBALog(gba, GBA_LOG_GAME_ERROR, "Bad BIOS Load16: 0x%08X", address); GBALog(gba, GBA_LOG_GAME_ERROR, "Bad BIOS Load16: 0x%08X", address);
LOAD_16(value, address & 2, &memory->biosPrefetch); value = (memory->biosPrefetch >> ((address & 2) * 8)) & 0xFFFF;
} }
} else { } else {
GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load16: 0x%08X", address); GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load16: 0x%08X", address);