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

NES: change namcot 163/129 to conform to more accurate modern knowledge of how the chip works. probably doesn't affect any games?

This commit is contained in:
goyuken 2014-02-02 17:06:48 +00:00
parent c3df573698
commit 63a1be2a70
1 changed files with 49 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
View File

@ -15,9 +15,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//state //state
IntBuffer prg_banks_8k = new IntBuffer(4); IntBuffer prg_banks_8k = new IntBuffer(4);
IntBuffer chr_banks_1k = new IntBuffer(8); IntBuffer chr_banks_1k = new IntBuffer(12);
IntBuffer nt_banks_1k = new IntBuffer(4); bool[] vram_enable = new bool[3];
bool[] vram_enable = new bool[2];
int irq_counter; int irq_counter;
bool irq_enabled; bool irq_enabled;
@ -32,7 +31,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
base.Dispose(); base.Dispose();
prg_banks_8k.Dispose(); prg_banks_8k.Dispose();
chr_banks_1k.Dispose(); chr_banks_1k.Dispose();
nt_banks_1k.Dispose();
} }
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
@ -40,8 +38,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
base.SyncState(ser); base.SyncState(ser);
ser.Sync("prg_banks_8k", ref prg_banks_8k); ser.Sync("prg_banks_8k", ref prg_banks_8k);
ser.Sync("chr_banks_1k", ref chr_banks_1k); ser.Sync("chr_banks_1k", ref chr_banks_1k);
ser.Sync("nt_banks_1k", ref nt_banks_1k); for (int i = 0; i < vram_enable.Length; i++)
for (int i = 0; i < 2; i++)
ser.Sync("vram_enable_" + i, ref vram_enable[i]); ser.Sync("vram_enable_" + i, ref vram_enable[i]);
ser.Sync("irq_counter", ref irq_counter); ser.Sync("irq_counter", ref irq_counter);
ser.Sync("irq_enabled", ref irq_enabled); ser.Sync("irq_enabled", ref irq_enabled);
@ -60,8 +57,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
switch (Cart.board_type) switch (Cart.board_type)
{ {
case "MAPPER019": case "MAPPER019":
break; AssertVram(0);
case "MAPPER210":
break; break;
//mapper 19: //mapper 19:
@ -71,36 +67,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//dragon ninja //dragon ninja
//famista '90 //famista '90
//hydelide 3 *this is a good test of more advanced features //hydelide 3 *this is a good test of more advanced features
Cart.vram_size = 8; //not many test cases of this, but hydelide 3 needs it. AssertPrg(128,256); AssertChr(128,256); AssertVram(0); AssertWram(0,8);
AssertPrg(128,256); AssertChr(128,256); AssertVram(8); AssertWram(0,8);
if (NES.apu != null)
audio = new Namco163Audio(NES.apu.ExternalQueue);
break; break;
/*
//mapper 210:
case "NAMCOT-175":
//wagyan land 2
//splatter house
AssertPrg(128,256); AssertChr(128); AssertVram(0); AssertWram(0);
break;
case "NAMCOT-340":
//family circuit '91
//dream master
//famista '92
AssertPrg(128,256,512); AssertChr(128,256); AssertVram(0); AssertWram(0,8);
break;
*/
default: default:
return false; return false;
} }
if (NES.apu != null)
audio = new Namco163Audio(NES.apu.ExternalQueue);
prg_bank_mask_8k = Cart.prg_size / 8 - 1; prg_bank_mask_8k = Cart.prg_size / 8 - 1;
chr_bank_mask_1k = Cart.chr_size / 1 - 1; chr_bank_mask_1k = Cart.chr_size / 1 - 1;
prg_banks_8k[3] = (byte)(0xFF & prg_bank_mask_8k); prg_banks_8k[3] = (byte)(0xFF & prg_bank_mask_8k);
nt_banks_1k[0] = nt_banks_1k[2] = 0xFF; chr_banks_1k[8] = chr_banks_1k[10] = 0xFF;
nt_banks_1k[1] = nt_banks_1k[3] = 0xFF; chr_banks_1k[9] = chr_banks_1k[11] = 0xFF;
vram_enable[2] = true;
return true; return true;
} }
@ -159,27 +143,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
addr &= 0xF800; addr &= 0xF800;
switch (addr) switch (addr)
{ {
case 0x0000: chr_banks_1k[0] = value & chr_bank_mask_1k; break; case 0x0000: chr_banks_1k[0] = value; break;
case 0x0800: chr_banks_1k[1] = value & chr_bank_mask_1k; break; case 0x0800: chr_banks_1k[1] = value; break;
case 0x1000: chr_banks_1k[2] = value & chr_bank_mask_1k; break; case 0x1000: chr_banks_1k[2] = value; break;
case 0x1800: chr_banks_1k[3] = value & chr_bank_mask_1k; break; case 0x1800: chr_banks_1k[3] = value; break;
case 0x2000: chr_banks_1k[4] = value & chr_bank_mask_1k; break; case 0x2000: chr_banks_1k[4] = value; break;
case 0x2800: chr_banks_1k[5] = value & chr_bank_mask_1k; break; case 0x2800: chr_banks_1k[5] = value; break;
case 0x3000: chr_banks_1k[6] = value & chr_bank_mask_1k; break; case 0x3000: chr_banks_1k[6] = value; break;
case 0x3800: chr_banks_1k[7] = value & chr_bank_mask_1k; break; case 0x3800: chr_banks_1k[7] = value; break;
case 0x4000: chr_banks_1k[8] = value; break;
case 0x4000: //$C000 case 0x4800: chr_banks_1k[9] = value; break;
nt_banks_1k[0] = value; case 0x5000: chr_banks_1k[10] = value; break;
break; case 0x5800: chr_banks_1k[11] = value; break;
case 0x4800: //$C800
nt_banks_1k[1] = value;
break;
case 0x5000: //$D000
nt_banks_1k[2] = value;
break;
case 0x5800: //$D800
nt_banks_1k[3] = value;
break;
case 0x6000: //$E000 case 0x6000: //$E000
prg_banks_8k[0] = (value & 0x3F) & prg_bank_mask_8k; prg_banks_8k[0] = (value & 0x3F) & prg_bank_mask_8k;
@ -199,7 +174,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
} }
public override byte ReadPRG(int addr) public override byte ReadPRG(int addr)
{ {
int bank_8k = addr >> 13; int bank_8k = addr >> 13;
@ -212,67 +186,41 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public override void WritePPU(int addr, byte value) public override void WritePPU(int addr, byte value)
{ {
if (addr < 0x2000)
{
//hydelide 3 is the first game i found that tests this
VRAM[addr] = value;
}
else
{
addr -= 0x2000;
int bank_1k = addr >> 10; int bank_1k = addr >> 10;
if (bank_1k >= 12)
bank_1k -= 4; // mirror 3000:3fff to 2000:2fff
int ofs = addr & ((1 << 10) - 1); int ofs = addr & ((1 << 10) - 1);
bank_1k = nt_banks_1k[bank_1k]; bool useciram = vram_enable[bank_1k >> 2];
if (bank_1k >= 0xE0) bank_1k = chr_banks_1k[bank_1k];
if (useciram && bank_1k >= 0xe0)
{ {
int which_nt = bank_1k & 1; bank_1k &= 1;
NES.CIRAM[which_nt * 0x400 + ofs] = value; NES.CIRAM[bank_1k << 10 | ofs] = value;
} }
else else
{ {
//throw new InvalidOperationException("what? the nametable was mapped to rom.."); // mapped to VROM; nothing to do
base.WritePPU(addr + 0x2000, value);
}
} }
} }
public override byte ReadPPU(int addr) public override byte ReadPPU(int addr)
{
if (addr < 0x2000)
{ {
int bank_1k = addr >> 10; int bank_1k = addr >> 10;
if (bank_1k >= 12)
bank_1k -= 4; // mirror 3000:3fff to 2000:2fff
int ofs = addr & ((1 << 10) - 1); int ofs = addr & ((1 << 10) - 1);
bool useciram = vram_enable[bank_1k >> 2];
bank_1k = chr_banks_1k[bank_1k]; bank_1k = chr_banks_1k[bank_1k];
if (bank_1k >= 0xE0)
if (useciram && bank_1k >= 0xe0)
{ {
//chr ram handling bank_1k &= 1;
int side = addr >> 12; return NES.CIRAM[bank_1k << 10 | ofs];
if (vram_enable[side])
{
bank_1k -= 0xE0;
bank_1k &= 7; //??
return VRAM[bank_1k * 0x400 + ofs];
}
}
addr = (bank_1k << 10) | ofs;
return VROM[addr];
} }
else else
{ {
addr -= 0x2000; bank_1k &= chr_bank_mask_1k;
int bank_1k = addr >> 10; return VROM[bank_1k << 10 | ofs];
if (bank_1k > 3) return base.ReadPPU(addr); //namco classic 2 tests this at the title screen
int ofs = addr & ((1 << 10) - 1);
bank_1k = nt_banks_1k[bank_1k];
if (bank_1k >= 0xE0)
{
int which_nt = bank_1k & 1;
return NES.CIRAM[which_nt * 0x400 + ofs];
}
else
{
int chr_bank_1k = bank_1k;
return VROM[chr_bank_1k * 0x400 + ofs];
}
} }
} }
@ -302,12 +250,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
if (irq_enabled) if (irq_enabled)
{ {
//irq_cycles--;
//if (irq_cycles == 0)
//{
//irq_cycles += 3;
ClockIRQ(); ClockIRQ();
//}
} }
if (audio != null) if (audio != null)
{ {