NesHawk - properly dispose of bytebuffers

This commit is contained in:
adelikat 2016-11-09 17:24:32 -06:00
parent 109b21239b
commit 45ba9254cb
35 changed files with 582 additions and 382 deletions

View File

@ -26,6 +26,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
regs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -40,6 +40,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
public override void Dispose()
{
prg_regs.Dispose();
low.Dispose();
chr_regs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -59,6 +59,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public override void Dispose()
{
prg_banks_16k.Dispose();
chr_banks_8k.Dispose();
base.Dispose();
}

View File

@ -56,6 +56,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public override void Dispose()
{
prg_banks_16k.Dispose();
chr_banks_8k.Dispose();
base.Dispose();
}

View File

@ -23,6 +23,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -24,6 +24,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
EXPREGS.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -23,6 +23,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -26,6 +26,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -39,6 +39,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -74,6 +74,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
prg_regs_8k.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -40,6 +40,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
prg_regs_8k.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -21,6 +21,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
regs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -40,6 +40,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
prg_regs_8k.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -32,6 +32,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg_banks_8k.Dispose();
base.Dispose();
}
public override byte ReadPRG(int addr)
{

View File

@ -39,6 +39,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
reg.Dispose();
base.Dispose();
}
public void sync(byte value)
{
prg=reg[2]>>2;

View File

@ -28,6 +28,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
reg.Dispose();
base.Dispose();
}
public override byte ReadWRAM(int addr)
{
return ROM[(reg[4] << 13) + (addr & 0x1FFF)];

View File

@ -27,6 +27,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
latch.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -46,6 +46,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg_banks_8k.Dispose();
chr_banks_8k.Dispose();
base.Dispose();
}
static readonly EMirrorType[] kMirrorTypes = {EMirrorType.Vertical,EMirrorType.Horizontal,EMirrorType.OneScreenA,EMirrorType.OneScreenB};
void SyncMirror()
{

View File

@ -31,6 +31,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg_banks_32k.Dispose();
base.Dispose();
}
public override void WriteEXP(int addr, byte value)
{
switch (addr)

View File

@ -34,6 +34,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg.Dispose();
chr.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -20,6 +20,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
_SRAM.Dispose();
regs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
ser.Sync("SRAM", ref _SRAM);

View File

@ -36,6 +36,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg_banks_16k.Dispose();
base.Dispose();
}
public override byte ReadPRG(int addr)
{
int bank_16k = addr >> 14;

View File

@ -31,6 +31,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg_banks_32k.Dispose();
base.Dispose();
}
public override byte ReadEXP(int addr)
{
//some kind of magic number..

View File

@ -28,6 +28,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
regs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
ser.Sync("reg_addr", ref reg_addr);

View File

@ -82,7 +82,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
void SyncMap()
private void SyncMap()
{
ApplyMemoryMapMask(prg_bank_mask_8k, prg_banks_8k);
ApplyMemoryMapMask(chr_bank_mask_2k, chr_banks_2k);

View File

@ -34,6 +34,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
preg.Dispose();
creg.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -31,6 +31,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
prg.Dispose();
chrlo.Dispose();
chrhi.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);
@ -148,9 +156,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
return base.ReadPPU(addr);
}
public override void WritePPU(int addr, byte value)
{
if (addr < 0x2000)

View File

@ -23,6 +23,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
regs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -32,6 +32,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
SyncIRQ();
}
public override void Dispose()
{
prg_banks_16k.Dispose();
chr_banks_2k.Dispose();
base.Dispose();
}
public override bool Configure(NES.EDetectionOrigin origin)
{
switch (Cart.board_type)

View File

@ -25,6 +25,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
regs.Dispose();
base.Dispose();
}
public override void WriteEXP(int addr, byte value)
{
if (addr >= 0x1000 && addr <= 0x1003)

View File

@ -31,6 +31,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
reg.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
ser.Sync("reg", ref reg);

View File

@ -15,7 +15,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
private int prg_mask_8k, chr_mask_1k;
public override bool Configure(NES.EDetectionOrigin origin)
{
switch (Cart.board_type)
@ -69,6 +68,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
chr_regs_1k.Dispose();
prg_regs_8k.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -26,6 +26,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
exRegs.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);

View File

@ -31,6 +31,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true;
}
public override void Dispose()
{
chr.Dispose();
base.Dispose();
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);