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

Fixed unaligned accesses. Now Rayman DS shows 3 intros.

This commit is contained in:
luigi__ 2008-12-04 22:04:09 +00:00
parent bd1367a536
commit 00e8e666cb
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/src/arm_instructions.cpp
View File

@ -39,17 +39,17 @@ extern volatile BOOL execute;
// Use this macros for reading/writing, so the GDB stub isn't broken // Use this macros for reading/writing, so the GDB stub isn't broken
#ifdef GDB_STUB #ifdef GDB_STUB
#define READ32(a,b) cpu->mem_if->read32(a,b) #define READ32(a,b) cpu->mem_if->read32(a,b & 0xFFFFFFFC)
#define WRITE32(a,b,c) cpu->mem_if->write32(a,b,c) #define WRITE32(a,b,c) cpu->mem_if->write32(a,b & 0xFFFFFFFC,c)
#define READ16(a,b) cpu->mem_if->read16(a,b) #define READ16(a,b) cpu->mem_if->read16(a,b & 0xFFFFFFFE)
#define WRITE16(a,b,c) cpu->mem_if->write16(a,b,c) #define WRITE16(a,b,c) cpu->mem_if->write16(a,b & 0xFFFFFFFE,c)
#define READ8(a,b) cpu->mem_if->read8(a,b) #define READ8(a,b) cpu->mem_if->read8(a,b)
#define WRITE8(a,b,c) cpu->mem_if->write8(a,b,c) #define WRITE8(a,b,c) cpu->mem_if->write8(a,b,c)
#else #else
#define READ32(a,b) MMU_read32(PROCNUM, b) #define READ32(a,b) MMU_read32(PROCNUM, b & 0xFFFFFFFC)
#define WRITE32(a,b,c) MMU_write32(PROCNUM,b,c) #define WRITE32(a,b,c) MMU_write32(PROCNUM,b & 0xFFFFFFFC,c)
#define READ16(a,b) MMU_read16(PROCNUM, b) #define READ16(a,b) MMU_read16(PROCNUM, b & 0xFFFFFFFE)
#define WRITE16(a,b,c) MMU_write16(PROCNUM,b,c) #define WRITE16(a,b,c) MMU_write16(PROCNUM,b & 0xFFFFFFFE,c)
#define READ8(a,b) MMU_read8(PROCNUM, b) #define READ8(a,b) MMU_read8(PROCNUM, b)
#define WRITE8(a,b,c) MMU_write8(PROCNUM,b,c) #define WRITE8(a,b,c) MMU_write8(PROCNUM,b,c)
#endif #endif

16
desmume/src/thumb_instructions.cpp
View File

@ -42,17 +42,17 @@ extern volatile BOOL execute;
// Use this macros for reading/writing, so the GDB stub isn't broken // Use this macros for reading/writing, so the GDB stub isn't broken
#ifdef GDB_STUB #ifdef GDB_STUB
#define READ32(a,b) cpu->mem_if->read32(a,b) #define READ32(a,b) cpu->mem_if->read32(a,b & 0xFFFFFFFC)
#define WRITE32(a,b,c) cpu->mem_if->write32(a,b,c) #define WRITE32(a,b,c) cpu->mem_if->write32(a,b & 0xFFFFFFFC,c)
#define READ16(a,b) cpu->mem_if->read16(a,b) #define READ16(a,b) cpu->mem_if->read16(a,b & 0xFFFFFFFE)
#define WRITE16(a,b,c) cpu->mem_if->write16(a,b,c) #define WRITE16(a,b,c) cpu->mem_if->write16(a,b & 0xFFFFFFFE,c)
#define READ8(a,b) cpu->mem_if->read8(a,b) #define READ8(a,b) cpu->mem_if->read8(a,b)
#define WRITE8(a,b,c) cpu->mem_if->write8(a,b,c) #define WRITE8(a,b,c) cpu->mem_if->write8(a,b,c)
#else #else
#define READ32(a,b) MMU_read32(PROCNUM, b) #define READ32(a,b) MMU_read32(PROCNUM, b & 0xFFFFFFFC)
#define WRITE32(a,b,c) MMU_write32(PROCNUM,b,c) #define WRITE32(a,b,c) MMU_write32(PROCNUM,b & 0xFFFFFFFC,c)
#define READ16(a,b) MMU_read16(PROCNUM, b) #define READ16(a,b) MMU_read16(PROCNUM, b & 0xFFFFFFFE)
#define WRITE16(a,b,c) MMU_write16(PROCNUM,b,c) #define WRITE16(a,b,c) MMU_write16(PROCNUM,b & 0xFFFFFFFE,c)
#define READ8(a,b) MMU_read8(PROCNUM, b) #define READ8(a,b) MMU_read8(PROCNUM, b)
#define WRITE8(a,b,c) MMU_write8(PROCNUM,b,c) #define WRITE8(a,b,c) MMU_write8(PROCNUM,b,c)
#endif #endif