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

This commit is contained in:
Jeffrey Pfau 2015-08-15 20:32:43 -07:00
parent 9cda63f6c0
commit 7a6582503f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gba/memory.c
View File

@ -446,8 +446,7 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
} else {
GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load16: 0x%08X", address);
LOAD_BAD;
volatile uint32_t v2 = value;
LOAD_16(value, address & 2, &v2);
value = (value >> ((address & 2) * 8)) & 0xFFFF;
}
break;
case REGION_WORKING_RAM:
@ -506,8 +505,7 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
default:
GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load16: 0x%08X", address);
LOAD_BAD;
volatile uint32_t v2 = value;
LOAD_16(value, address & 2, &v2);
value = (value >> ((address & 2) * 8)) & 0xFFFF;
break;
}