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

gxstat shouldnt have a reset method. its constructor resets it. this happens when MMU_struct_new gets reconstructed.

This commit is contained in:
zeromus 2009-10-04 16:25:07 +00:00
parent 7e70ed64bb
commit 6c019ad77a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/MMU.cpp
View File

@ -857,7 +857,7 @@ void MMU_Init(void) {
GFX_PIPEclear();
GFX_FIFOclear();
DISP_FIFOinit();
MMU_new.gxstat.reset();
new(&MMU_new) MMU_struct_new;
mc_init(&MMU.fw, MC_TYPE_FLASH); /* init fw device */
mc_alloc(&MMU.fw, NDS_FW_SIZE_V1);
@ -916,7 +916,6 @@ void MMU_Reset()
GFX_PIPEclear();
GFX_FIFOclear();
DISP_FIFOinit();
MMU_new.gxstat.reset();
MMU.DTCMRegion = 0x027C0000;
MMU.ITCMRegion = 0x00000000;
@ -1787,11 +1786,6 @@ static INLINE void write_timer(int proc, int timerIndex, u16 val)
// NDS_RescheduleDMA();
//}
void TGXSTAT::reset()
{
gxfifo_irq = se = tr = tb = 0;
}
extern CACHE_ALIGN MatrixStack mtxStack[4];
u32 TGXSTAT::read32()
{

2
desmume/src/MMU.h
View File

@ -119,8 +119,6 @@ struct TGXSTAT : public TRegister_32
u8 se; //stack error
u8 gxfifo_irq; //irq configuration
void reset();
virtual u32 read32();
virtual void write32(const u32 val);