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

GBA Memory: Return misaligned addresses from LDM/STM

This commit is contained in:
Jeffrey Pfau 2014-11-01 14:40:13 -07:00
parent 3ad2047855
commit d8bee5d34b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gba/gba-memory.c
View File

@ -676,6 +676,7 @@ uint32_t GBALoadMultiple(struct ARMCore* cpu, uint32_t address, int mask, enum L
address += offset;
}
uint32_t addressMisalign = address & 0x3;
address &= 0xFFFFFFFC;
switch (address >> BASE_OFFSET) {
@ -744,7 +745,7 @@ uint32_t GBALoadMultiple(struct ARMCore* cpu, uint32_t address, int mask, enum L
address -= (popcount << 2) + 4;
}
return address;
return address | addressMisalign;
}
#define STM_LOOP_BEGIN \
@ -780,6 +781,7 @@ uint32_t GBAStoreMultiple(struct ARMCore* cpu, uint32_t address, int mask, enum
address += offset;
}
uint32_t addressMisalign = address & 0x3;
address &= 0xFFFFFFFC;
switch (address >> BASE_OFFSET) {
@ -848,7 +850,7 @@ uint32_t GBAStoreMultiple(struct ARMCore* cpu, uint32_t address, int mask, enum
address -= (popcount << 2) + 4;
}
return address;
return address | addressMisalign;
}
void GBAAdjustWaitstates(struct GBA* gba, uint16_t parameters) {