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

#endif was not at the right line (causing unreferenced symbols)

This commit is contained in:
damdoum 2007-02-16 15:45:40 +00:00
parent 771aede2b4
commit 1c937b81e4
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
desmume/src/MMU.c
View File

@ -37,12 +37,12 @@
#include "registers.h" #include "registers.h"
void FASTCALL MMU_writeXX(u32 proc, u32 adr, u32 val, u8 nbbytes);
void FASTCALL MMU_write8_old(u32 proc, u32 adr, u8 val); void FASTCALL MMU_write8_old(u32 proc, u32 adr, u8 val);
void FASTCALL MMU_write16_old(u32 proc, u32 adr, u16 val); void FASTCALL MMU_write16_old(u32 proc, u32 adr, u16 val);
void FASTCALL MMU_write32_old(u32 proc, u32 adr, u32 val); void FASTCALL MMU_write32_old(u32 proc, u32 adr, u32 val);
#define USE_OLD 1
#define USE_OLD 0
#if USE_OLD #if USE_OLD
void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val) { void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val) {
MMU_write8_old(proc, adr, val); MMU_write8_old(proc, adr, val);
@ -190,6 +190,10 @@ u32 MMU_ARM7_WAIT32[16]={
1, 1, 1, 1, 1, 1, 1, 1, 8, 8, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 8, 5, 1, 1, 1, 1, 1,
}; };
void MMU_Init(void) { void MMU_Init(void) {
int i; int i;
@ -801,6 +805,9 @@ u32 FASTCALL MMU_read32(u32 proc, u32 adr)
/* Returns data from memory */ /* Returns data from memory */
return T1ReadLong(MMU.MMU_MEM[proc][(adr >> 20) & 0xFF], adr & MMU.MMU_MASK[proc][(adr >> 20) & 0xFF]); return T1ReadLong(MMU.MMU_MEM[proc][(adr >> 20) & 0xFF], adr & MMU.MMU_MASK[proc][(adr >> 20) & 0xFF]);
} }
u16 partie = 1;
u32 testval = 0;
void FASTCALL MMU_write8_old(u32 proc, u32 adr, u8 val) void FASTCALL MMU_write8_old(u32 proc, u32 adr, u8 val)
{ {
@ -1127,7 +1134,6 @@ void FASTCALL MMU_write8_old(u32 proc, u32 adr, u8 val)
MMU.MMU_MEM[proc][(adr>>20)&0xFF][adr&MMU.MMU_MASK[proc][(adr>>20)&0xFF]]=val; MMU.MMU_MEM[proc][(adr>>20)&0xFF][adr&MMU.MMU_MASK[proc][(adr>>20)&0xFF]]=val;
} }
u16 partie = 1;
void FASTCALL MMU_write16_old(u32 proc, u32 adr, u16 val) void FASTCALL MMU_write16_old(u32 proc, u32 adr, u16 val)
{ {
@ -1844,7 +1850,6 @@ void FASTCALL MMU_write16_old(u32 proc, u32 adr, u16 val)
T1WriteWord(MMU.MMU_MEM[proc][(adr>>20)&0xFF], adr&MMU.MMU_MASK[proc][(adr>>20)&0xFF], val); T1WriteWord(MMU.MMU_MEM[proc][(adr>>20)&0xFF], adr&MMU.MMU_MASK[proc][(adr>>20)&0xFF], val);
} }
u32 testval = 0;
void FASTCALL MMU_write32_old(u32 proc, u32 adr, u32 val) void FASTCALL MMU_write32_old(u32 proc, u32 adr, u32 val)
{ {
@ -2769,6 +2774,8 @@ void FASTCALL MMU_write32_acl(u32 proc, u32 adr, u32 val)
} }
#endif
@ -3742,6 +3749,7 @@ typedef union {
} u32_union; } u32_union;
#endif #endif
void FASTCALL MMU_writeXX(u32 proc, u32 adr, u32 val, u8 nbbytes) { void FASTCALL MMU_writeXX(u32 proc, u32 adr, u32 val, u8 nbbytes) {
u32 adr_u8_1 = adr & 0xFFFFFFFC; u32 adr_u8_1 = adr & 0xFFFFFFFC;
u32 adr_u8_2 = adr_u8_1 + 1; u32 adr_u8_2 = adr_u8_1 + 1;
@ -3934,6 +3942,3 @@ void FASTCALL MMU_writeXX(u32 proc, u32 adr, u32 val, u8 nbbytes) {
} }
} }
#endif

3
desmume/src/MMU.h
View File

@ -129,7 +129,7 @@ void MMU_unsetRom();
u8 FASTCALL MMU_read8(u32 proc, u32 adr); 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);
#ifdef MMU_ENABLE_ACL #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);
u16 FASTCALL MMU_read16_acl(u32 proc, u32 adr, u32 access); u16 FASTCALL MMU_read16_acl(u32 proc, u32 adr, u32 access);
@ -150,6 +150,7 @@ u32 FASTCALL MMU_read32(u32 proc, u32 adr);
void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val); 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_writeXX(u32 proc, u32 adr, u32 val, u8 nbbytes);
#ifdef MMU_ENABLE_ACL #ifdef MMU_ENABLE_ACL
void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val); void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val);