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

Add files via upload

This commit is contained in:
alyosha-tas 2016-10-23 20:50:06 -04:00 committed by GitHub
parent 62057f60cb
commit 18d8baa65d
3 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
View File

@ -79,18 +79,22 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//when the ppu issues a write it goes through here and into the game board //when the ppu issues a write it goes through here and into the game board
public void ppubus_write(int addr, byte value) public void ppubus_write(int addr, byte value)
{ {
nes.Board.AddressPPU(addr); if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
nes.Board.AddressPPU(addr);
nes.Board.WritePPU(addr, value); nes.Board.WritePPU(addr, value);
} }
//when the ppu issues a read it goes through here and into the game board //when the ppu issues a read it goes through here and into the game board
public byte ppubus_read(int addr, bool ppu) public byte ppubus_read(int addr, bool ppu, bool addr_ppu)
{ {
//hardware doesnt touch the bus when the PPU is disabled //hardware doesnt touch the bus when the PPU is disabled
if (!reg_2001.PPUON && ppu) if (!reg_2001.PPUON && ppu)
return 0xFF; return 0xFF;
nes.Board.AddressPPU(addr); if (addr_ppu)
nes.Board.AddressPPU(addr);
return nes.Board.ReadPPU(addr); return nes.Board.ReadPPU(addr);
} }

65
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.regs.cs
View File

@ -58,6 +58,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
// this byte is used to simulate open bus reads and writes // this byte is used to simulate open bus reads and writes
// it should be modified by every read and write to a ppu register // it should be modified by every read and write to a ppu register
public byte ppu_open_bus; public byte ppu_open_bus;
public bool s_latch_clear;
public bool d_latch_clear;
public int double_2007_read; // emulates a hardware bug of back to back 2007 reads public int double_2007_read; // emulates a hardware bug of back to back 2007 reads
public int[] ppu_open_bus_decay_timer = new int[8]; public int[] ppu_open_bus_decay_timer = new int[8];
@ -173,6 +175,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
_fv = _v = _h = _vt = _ht = 0; _fv = _v = _h = _vt = _ht = 0;
fh = 0; fh = 0;
ppu.d_latch_clear = true;
ppu.s_latch_clear = true;
} }
public void increment_hsc() public void increment_hsc()
@ -365,7 +369,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//once we thought we clear latches here, but that caused midframe glitches. //once we thought we clear latches here, but that caused midframe glitches.
//i think we should only reset the state machine for 2005/2006 //i think we should only reset the state machine for 2005/2006
//ppur.clear_latches(); //ppur.clear_latches();
byte ret = peek_2002(); byte ret = peek_2002();
vtoggle = false; vtoggle = false;
@ -468,30 +471,36 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//VRAM address register (write) //VRAM address register (write)
void write_2006(byte value) void write_2006(byte value)
{ {
if (!vtoggle) //if (d_latch_clear)
{ //{
ppur._vt &= 0x07; if (!vtoggle)
ppur._vt |= (value & 0x3) << 3; {
ppur._h = (value >> 2) & 1; ppur._vt &= 0x07;
ppur._v = (value >> 3) & 1; ppur._vt |= (value & 0x3) << 3;
ppur._fv = (value >> 4) & 3; ppur._h = (value >> 2) & 1;
//nes.LogLine("addr wrote fv = {0}", ppur._fv); ppur._v = (value >> 3) & 1;
} ppur._fv = (value >> 4) & 3;
else //nes.LogLine("addr wrote fv = {0}", ppur._fv);
{ }
ppur._vt &= 0x18; else
ppur._vt |= (value >> 5); {
ppur._ht = value & 31; ppur._vt &= 0x18;
ppur.install_latches(); ppur._vt |= (value >> 5);
//nes.LogLine("addr wrote vt = {0}, ht = {1}", ppur._vt, ppur._ht); ppur._ht = value & 31;
ppur.install_latches();
//nes.LogLine("addr wrote vt = {0}, ht = {1}", ppur._vt, ppur._ht);
d_latch_clear = false;
//normally the address isnt observed by the board till it gets clocked by a read or write.
//but maybe thats just because a ppu read/write shoves it on the address bus
//apparently this shoves it on the address bus, too, or else blargg's mmc3 tests dont pass
//ONLY if the ppu is not rendering
if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
nes.Board.AddressPPU(ppur.get_2007access());
}
//normally the address isnt observed by the board till it gets clocked by a read or write. vtoggle ^= true;
//but maybe thats just because a ppu read/write shoves it on the address bus //}
//apparently this shoves it on the address bus, too, or else blargg's mmc3 tests dont pass
nes.Board.AddressPPU(ppur.get_2007access());
}
vtoggle ^= true;
} }
byte read_2006() { return ppu_open_bus; } byte read_2006() { return ppu_open_bus; }
byte peek_2006() { return ppu_open_bus; } byte peek_2006() { return ppu_open_bus; }
@ -536,7 +545,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ppur.increment2007(ppur.status.rendering && reg_2001.PPUON, reg_2000.vram_incr32 != 0); ppur.increment2007(ppur.status.rendering && reg_2001.PPUON, reg_2000.vram_incr32 != 0);
//see comments in $2006 //see comments in $2006
nes.Board.AddressPPU(ppur.get_2007access()); if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
nes.Board.AddressPPU(ppur.get_2007access());
} }
byte read_2007() byte read_2007()
{ {
@ -546,7 +556,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
byte ret = VRAMBuffer; byte ret = VRAMBuffer;
//in any case, we read from the ppu bus //in any case, we read from the ppu bus
VRAMBuffer = ppubus_read(addr,false); VRAMBuffer = ppubus_read(addr, false, false);
//but reads from the palette are implemented in the PPU and return immediately //but reads from the palette are implemented in the PPU and return immediately
if ((addr & 0x3F00) == 0x3F00) if ((addr & 0x3F00) == 0x3F00)
@ -559,7 +569,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ppur.increment2007(ppur.status.rendering && reg_2001.PPUON, reg_2000.vram_incr32 != 0); ppur.increment2007(ppur.status.rendering && reg_2001.PPUON, reg_2000.vram_incr32 != 0);
//see comments in $2006 //see comments in $2006
nes.Board.AddressPPU(ppur.get_2007access()); if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
nes.Board.AddressPPU(ppur.get_2007access());
// update open bus here // update open bus here
ppu_open_bus = ret; ppu_open_bus = ret;

20
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
View File

@ -88,7 +88,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
case 0: case 0:
ppu_addr_temp = ppur.get_ntread(); ppu_addr_temp = ppur.get_ntread();
bgdata.nt = ppubus_read(ppu_addr_temp, true); bgdata.nt = ppubus_read(ppu_addr_temp, true, true);
runppu(1); runppu(1);
break; break;
case 1: case 1:
@ -97,7 +97,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
case 2: case 2:
{ {
ppu_addr_temp = ppur.get_atread(); ppu_addr_temp = ppur.get_atread();
byte at = ppubus_read(ppu_addr_temp, true); byte at = ppubus_read(ppu_addr_temp, true, true);
//modify at to get appropriate palette shift //modify at to get appropriate palette shift
if ((ppur.vt & 2) != 0) at >>= 4; if ((ppur.vt & 2) != 0) at >>= 4;
@ -122,7 +122,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
break; break;
case 4: case 4:
ppu_addr_temp = ppur.get_ptread(bgdata.nt); ppu_addr_temp = ppur.get_ptread(bgdata.nt);
bgdata.pt_0 = ppubus_read(ppu_addr_temp, true); bgdata.pt_0 = ppubus_read(ppu_addr_temp, true, true);
runppu(1); runppu(1);
break; break;
case 5: case 5:
@ -130,7 +130,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
break; break;
case 6: case 6:
ppu_addr_temp |= 8; ppu_addr_temp |= 8;
bgdata.pt_1 = ppubus_read(ppu_addr_temp, true); bgdata.pt_1 = ppubus_read(ppu_addr_temp, true, true);
runppu(1); runppu(1);
break; break;
case 7: case 7:
@ -490,7 +490,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//garbage nametable fetches + scroll resets //garbage nametable fetches + scroll resets
int garbage_todo = 2; int garbage_todo = 2;
ppubus_read(ppur.get_ntread(), true); ppubus_read(ppur.get_ntread(), true, true);
if (reg_2001.PPUON) if (reg_2001.PPUON)
{ {
if (sl == 0 && ppur.status.cycle == 304) if (sl == 0 && ppur.status.cycle == 304)
@ -550,7 +550,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
ppubus_read(ppur.get_atread(), true); //at or nt? ppubus_read(ppur.get_atread(), true, true); //at or nt?
if (realSprite) if (realSprite)
{ {
runppu(1); runppu(1);
@ -565,22 +565,22 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
if (realSprite) if (realSprite)
{ {
ppubus_read(patternAddress, true); ppubus_read(patternAddress, true, false);
ppubus_read(patternAddress, true); ppubus_read(patternAddress, true, false);
runppu(kFetchTime * 2); runppu(kFetchTime * 2);
} }
} }
else else
{ {
int addr = patternAddress; int addr = patternAddress;
t_oam[s].patterns_0 = ppubus_read(addr, true); t_oam[s].patterns_0 = ppubus_read(addr, true, true);
if (realSprite) if (realSprite)
{ {
runppu(kFetchTime); runppu(kFetchTime);
read_value = t_oam[s].oam_x; read_value = t_oam[s].oam_x;
} }
addr += 8; addr += 8;
t_oam[s].patterns_1 = ppubus_read(addr, true); t_oam[s].patterns_1 = ppubus_read(addr, true, true);
if (realSprite) if (realSprite)
{ {
runppu(kFetchTime); runppu(kFetchTime);