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

nes-remove newly redundant wram masking from derived board classes (mmc3 and mmc1 affected); separate checkin done for this in case i goofed up

This commit is contained in:
zeromus 2012-05-27 07:44:29 +00:00
parent c5a2d0f8f0
commit 82e57988c6
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3_family.cs
View File

@ -392,9 +392,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public abstract class MMC3Board_Base : MMC3_Family_Board_Base public abstract class MMC3Board_Base : MMC3_Family_Board_Base
{ {
//configuration
protected int wram_mask;
//state //state
protected MMC3 mmc3; protected MMC3 mmc3;
@ -410,8 +407,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
protected override void BaseSetup() protected override void BaseSetup()
{ {
wram_mask = (Cart.wram_size * 1024) - 1;
int num_prg_banks = Cart.prg_size / 8; int num_prg_banks = Cart.prg_size / 8;
mapper = mmc3 = new MMC3(this, num_prg_banks); mapper = mmc3 = new MMC3(this, num_prg_banks);

13
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
View File

@ -26,19 +26,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
} }
} }
public override byte ReadWRAM(int addr)
{
if (Cart.wram_size != 0)
return WRAM[addr & wram_mask];
else return 0xFF;
}
public override void WriteWRAM(int addr, byte value)
{
if (Cart.wram_size != 0)
WRAM[addr & wram_mask] = value;
}
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {

17
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs
View File

@ -198,7 +198,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
{ {
//configuration //configuration
protected int prg_mask, chr_mask; protected int prg_mask, chr_mask;
protected int vram_mask, wram_mask; protected int vram_mask;
//state //state
protected MMC1 mmc1; protected MMC1 mmc1;
@ -244,24 +244,10 @@ namespace BizHawk.Emulation.Consoles.Nintendo
else base.WritePPU(addr, value); else base.WritePPU(addr, value);
} }
public override byte ReadWRAM(int addr)
{
if (Cart.wram_size != 0)
return WRAM[addr & wram_mask];
else return 0xFF;
}
public override void WriteWRAM(int addr, byte value)
{
if (Cart.wram_size != 0)
WRAM[addr & wram_mask] = value;
}
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
base.SyncState(ser); base.SyncState(ser);
mmc1.SyncState(ser); mmc1.SyncState(ser);
} }
public override bool Configure(NES.EDetectionOrigin origin) public override bool Configure(NES.EDetectionOrigin origin)
@ -345,7 +331,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
mmc1 = new MMC1(this); mmc1 = new MMC1(this);
prg_mask = (Cart.prg_size / 16) - 1; prg_mask = (Cart.prg_size / 16) - 1;
vram_mask = (Cart.vram_size*1024) - 1; vram_mask = (Cart.vram_size*1024) - 1;
wram_mask = (Cart.wram_size*1024) - 1;
chr_mask = (Cart.chr_size / 8 * 2) - 1; chr_mask = (Cart.chr_size / 8 * 2) - 1;
SetMirrorType(mmc1.mirror); SetMirrorType(mmc1.mirror);
} }