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

ACL checks disabled when define MMU_ENABLE_ACL is not set

This commit is contained in:
mightymax 2007-01-10 12:49:48 +00:00
parent 2ed45a1d41
commit 9a65ce5c07
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/MMU.c
View File

@ -2353,6 +2353,7 @@ void FASTCALL MMU_doDMA(u32 proc, u32 num)
} }
} }
#ifdef MMU_ENABLE_ACL
u8 FASTCALL MMU_read8_acl(u32 proc, u32 adr, u32 access) u8 FASTCALL MMU_read8_acl(u32 proc, u32 adr, u32 access)
{ {
if (proc == ARMCPU_ARM9) /* on arm9 we need to check the MPU regions */ if (proc == ARMCPU_ARM9) /* on arm9 we need to check the MPU regions */
@ -2475,3 +2476,4 @@ void FASTCALL MMU_write32_acl(u32 proc, u32 adr, u32 val)
} }
MMU_write32(proc,adr,val) ; MMU_write32(proc,adr,val) ;
} }
#endif

24
desmume/src/MMU.h
View File

@ -117,9 +117,15 @@ u8 FASTCALL MMU_read8(u32 proc, u32 adr);
u16 FASTCALL MMU_read16(u32 proc, u32 adr); u16 FASTCALL MMU_read16(u32 proc, u32 adr);
u32 FASTCALL MMU_read32(u32 proc, u32 adr); u32 FASTCALL MMU_read32(u32 proc, u32 adr);
u8 FASTCALL MMU_read8_acl(u32 proc, u32 adr, u32 access); #ifdef MMU_ENABLE_ACL
u16 FASTCALL MMU_read16_acl(u32 proc, u32 adr, u32 access); u8 FASTCALL MMU_read8_acl(u32 proc, u32 adr, u32 access);
u32 FASTCALL MMU_read32_acl(u32 proc, u32 adr, u32 access); u16 FASTCALL MMU_read16_acl(u32 proc, u32 adr, u32 access);
u32 FASTCALL MMU_read32_acl(u32 proc, u32 adr, u32 access);
#else
#define MMU_read8_acl(proc,adr,access) MMU_read8(proc,adr)
#define MMU_read16_acl(proc,adr,access) MMU_read16(proc,adr)
#define MMU_read32_acl(proc,adr,access) MMU_read32(proc,adr)
#endif
#define MMU_writeByte MMU_write8 #define MMU_writeByte MMU_write8
#define MMU_writeHWord MMU_write16 #define MMU_writeHWord MMU_write16
@ -132,9 +138,15 @@ void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val);
void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val); void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val);
void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val); void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val);
void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val); #ifdef MMU_ENABLE_ACL
void FASTCALL MMU_write16_acl(u32 proc, u32 adr, u16 val); void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val);
void FASTCALL MMU_write32_acl(u32 proc, u32 adr, u32 val); void FASTCALL MMU_write16_acl(u32 proc, u32 adr, u16 val);
void FASTCALL MMU_write32_acl(u32 proc, u32 adr, u32 val);
#else
#define MMU_write8_acl MMU_write8
#define MMU_write16_acl MMU_write16
#define MMU_write32_acl MMU_write32
#endif
void FASTCALL MMU_doDMA(u32 proc, u32 num); void FASTCALL MMU_doDMA(u32 proc, u32 num);