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

hopefully fixed unaligned reads correctly this time... 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1178 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
normmatt234 2013-03-28 16:56:22 +00:00
parent 2a520f5ba2
commit 455105fd77
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gba/GBAinline.h
View File

@ -46,13 +46,11 @@ extern int cpuTotalTicks;
static inline u32 CPUReadMemory(u32 address) static inline u32 CPUReadMemory(u32 address)
{ {
int shift;
u32 value; u32 value;
u32 oldAddress = address; u32 oldAddress = address;
#ifdef C_CORE #ifdef C_CORE
if(address & 3) { if(address & 3) {
shift = (address & 3) << 3;
address &= ~0x03; address &= ~0x03;
} }
#endif #endif
@ -151,6 +149,7 @@ unreadable:
if(oldAddress & 3) { if(oldAddress & 3) {
#ifdef C_CORE #ifdef C_CORE
int shift = (oldAddress & 3) << 3;
value = (value >> shift) | (value << (32 - shift)); value = (value >> shift) | (value << (32 - shift));
#else #else
#ifdef __GNUC__ #ifdef __GNUC__
@ -158,10 +157,10 @@ unreadable:
"shl $3 ,%%ecx;" "shl $3 ,%%ecx;"
"ror %%cl, %0" "ror %%cl, %0"
: "=r" (value) : "=r" (value)
: "r" (value), "c" (address)); : "r" (value), "c" (oldAddress));
#else #else
__asm { __asm {
mov ecx, address; mov ecx, oldAddress;
and ecx, 3; and ecx, 3;
shl ecx, 3; shl ecx, 3;
ror [dword ptr value], cl; ror [dword ptr value], cl;
@ -200,7 +199,7 @@ static inline u32 CPUReadHalfWord(u32 address)
if(address < 0x4000) { if(address < 0x4000) {
#ifdef GBA_LOGGING #ifdef GBA_LOGGING
if(systemVerbose & VERBOSE_ILLEGAL_READ) { if(systemVerbose & VERBOSE_ILLEGAL_READ) {
log("Illegal halfword read from bios: %08x at %08x\n", address, armMode ? log("Illegal halfword read from bios: %08x at %08x\n", oldAddress, armMode ?
armNextPC - 4 : armNextPC - 2); armNextPC - 4 : armNextPC - 2);
} }
#endif #endif
@ -277,7 +276,7 @@ static inline u32 CPUReadHalfWord(u32 address)
unreadable: unreadable:
#ifdef GBA_LOGGING #ifdef GBA_LOGGING
if(systemVerbose & VERBOSE_ILLEGAL_READ) { if(systemVerbose & VERBOSE_ILLEGAL_READ) {
log("Illegal halfword read: %08x at %08x\n", address, armMode ? log("Illegal halfword read: %08x at %08x\n", oldAddress, armMode ?
armNextPC - 4 : armNextPC - 2); armNextPC - 4 : armNextPC - 2);
} }
#endif #endif
@ -290,21 +289,18 @@ unreadable:
value = CPUReadHalfWordQuick(reg[15].I); value = CPUReadHalfWordQuick(reg[15].I);
} }
} }
break; return value;
} }
if(oldAddress & 1) { if(oldAddress & 1) {
value = (value >> 8) | (value << 24); value = (value >> 8) | (value << 24);
} #ifdef GBA_LOGGING
#ifdef GBA_LOGGING
if(oldAddress & 1) {
if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) { if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
log("Unaligned halfword read from: %08x at %08x (%08x)\n", oldAddress, armMode ? log("Unaligned halfword read from: %08x at %08x (%08x)\n", oldAddress, armMode ?
armNextPC - 4 : armNextPC - 2, value); armNextPC - 4 : armNextPC - 2, value);
} }
#endif
} }
#endif
return value; return value;
} }