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

mount empty memory for tex and tex palette memory when slots are unmapped. provide diagnostics when unmapped slots are referenced by textures.

This commit is contained in:
zeromus 2009-01-15 19:33:04 +00:00
parent 92fb5e378f
commit c3e28a662f
3 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/ARM9.h
View File

@ -24,7 +24,7 @@ struct ALIGN(16) ARM9_struct {
u8 *textureSlotAddr[4]; u8 *textureSlotAddr[4];
u8 *blank_memory[0x20000]; u8 blank_memory[0x20000];
}; };
extern ARM9_struct ARM9Mem; extern ARM9_struct ARM9Mem;

31
desmume/src/MMU.cpp
View File

@ -461,18 +461,10 @@ void MMU_clearMem()
osdA->setOffset(MainScreen.offset); osdA->setOffset(MainScreen.offset);
osdB->setOffset(SubScreen.offset); osdB->setOffset(SubScreen.offset);
/* setup the texture slot pointers */ for(int i=0;i<4;i++)
#if 0 ARM9Mem.textureSlotAddr[i] = ARM9Mem.blank_memory;
ARM9Mem.textureSlotAddr[0] = ARM9Mem.blank_memory; for(int i=0;i<6;i++)
ARM9Mem.textureSlotAddr[1] = ARM9Mem.blank_memory; ARM9Mem.texPalSlot[i] = ARM9Mem.blank_memory;
ARM9Mem.textureSlotAddr[2] = ARM9Mem.blank_memory;
ARM9Mem.textureSlotAddr[3] = ARM9Mem.blank_memory;
#else
ARM9Mem.textureSlotAddr[0] = &ARM9Mem.ARM9_LCD[0x20000 * 0];
ARM9Mem.textureSlotAddr[1] = &ARM9Mem.ARM9_LCD[0x20000 * 1];
ARM9Mem.textureSlotAddr[2] = &ARM9Mem.ARM9_LCD[0x20000 * 2];
ARM9Mem.textureSlotAddr[3] = &ARM9Mem.ARM9_LCD[0x20000 * 3];
#endif
LCDdst[0] = ARM9Mem.ARM9_LCD; // Bank A LCDdst[0] = ARM9Mem.ARM9_LCD; // Bank A
LCDdst[1] = ARM9Mem.ARM9_LCD + 0x20000; // Bank B LCDdst[1] = ARM9Mem.ARM9_LCD + 0x20000; // Bank B
@ -581,6 +573,21 @@ static inline void MMU_VRAMmapControl(u8 block, u8 VRAMBankCnt)
u32 vram_map_addr = 0xFFFFFFFF; u32 vram_map_addr = 0xFFFFFFFF;
u8 *LCD_addr = LCDdst[block]; u8 *LCD_addr = LCDdst[block];
//unmap texmem
for(int i=0;i<4;i++)
if(ARM9Mem.textureSlotAddr[i] == LCD_addr)
ARM9Mem.textureSlotAddr[i] = ARM9Mem.blank_memory;
//unmap texpal mem. This is not a straightforward way to do it,
//but it is the only place we have this information stored.
for(int i=0;i<4;i++)
if(ARM9Mem.texPalSlot[i] == LCD_addr + 0x4000*i || ARM9Mem.texPalSlot[i] == LCD_addr)
ARM9Mem.texPalSlot[i] = ARM9Mem.blank_memory;
for(int i=4;i<6;i++)
if(ARM9Mem.texPalSlot[i] == LCD_addr)
ARM9Mem.texPalSlot[i] = ARM9Mem.blank_memory;
switch (VRAMBankCnt & 0x07) switch (VRAMBankCnt & 0x07)
{ {

27
desmume/src/OGLRender.cpp
View File

@ -147,16 +147,9 @@ static MemSpan MemSpan_TexMem(u32 ofs, u32 len)
ofs += curr.len; ofs += curr.len;
currofs += curr.len; currofs += curr.len;
u8* ptr = ARM9Mem.textureSlotAddr[slot]; u8* ptr = ARM9Mem.textureSlotAddr[slot];
//this is just a guess. what happens if there is a gap in the mapping? lets put zeros
if(ptr == NULL) { if(ptr == ARM9Mem.blank_memory)
PROGINFO("Texture gap in memory mapping. Trying to accomodate.\n"); PROGINFO("Tried to reference unmapped texture memory: slot %d\n",slot);
static u8* emptyTextureSlot = 0;
if(emptyTextureSlot == NULL) {
emptyTextureSlot = new u8[128*1024];
memset(emptyTextureSlot,0,128*1024);
}
ptr = emptyTextureSlot;
}
curr.ptr = ptr + curr.start; curr.ptr = ptr + curr.start;
} }
@ -185,16 +178,10 @@ static MemSpan MemSpan_TexPalette(u32 ofs, u32 len)
//here is an actual test case of bank spanning //here is an actual test case of bank spanning
currofs += curr.len; currofs += curr.len;
u8* ptr = ARM9Mem.texPalSlot[slot]; u8* ptr = ARM9Mem.texPalSlot[slot];
//this is just a guess. what happens if there is a gap in the mapping? lets put zeros
if(ptr == NULL) { if(ptr == ARM9Mem.blank_memory)
PROGINFO("Texture palette gap in memory mapping. Trying to accomodate.\n"); PROGINFO("Tried to reference unmapped texture palette memory: 16k slot #%d\n",slot);
static u8* emptyTexturePalette = 0;
if(emptyTexturePalette == NULL) {
emptyTexturePalette = new u8[16*1024];
memset(emptyTexturePalette,0,16*1024);
}
ptr = emptyTexturePalette;
}
curr.ptr = ptr + curr.start; curr.ptr = ptr + curr.start;
} }
return ret; return ret;