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

NES Update Core

This commit is contained in:
alyosha-tas 2017-03-08 12:18:30 -05:00 committed by GitHub
parent fd117d3630
commit 22da9ae6ea
4 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
View File

@ -273,11 +273,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
SetupMemoryDomains();
//in this emulator, reset takes place instantaneously
cpu.PC = (ushort)(ReadMemory(0xFFFC) | (ReadMemory(0xFFFD) << 8));
cpu.P = 0x34;
cpu.S = 0xFD;
// some boards cannot have specific values in RAM upon initialization
// Let's hard code those cases here
// these will be defined through the gameDB exclusively for now.

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

@ -133,7 +133,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//when the ppu issues a write it goes through here and into the game board
public void ppubus_write(int addr, byte value)
{
if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
if (ppur.status.sl == 241 || !PPUON)
nes.Board.AddressPPU(addr);
nes.Board.WritePPU(addr, value);
@ -143,7 +143,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public byte ppubus_read(int addr, bool ppu, bool addr_ppu)
{
//hardware doesnt touch the bus when the PPU is disabled
if (!reg_2001.PPUON && ppu)
if (!PPUON && ppu)
return 0xFF;
if (addr_ppu)
@ -219,6 +219,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ser.Sync("soam_index", ref soam_index);
ser.Sync("install_2006", ref install_2006);
ser.Sync("race_2006", ref race_2006);
ser.Sync("install_2001", ref install_2001);
ser.Sync("show_bg_new", ref show_bg_new);
ser.Sync("show_obj_new", ref show_obj_new);
ser.Sync("ppu_open_bus", ref ppu_open_bus);
ser.Sync("double_2007_read", ref double_2007_read);
@ -283,6 +286,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//run one ppu cycle at a time so we can interact with the ppu and clockPPU at high granularity
for (int i = 0; i < x; i++)
{
race_2006 = false;
if (install_2006>0)
{
install_2006--;
@ -295,12 +299,22 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//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))
if (ppur.status.sl == 241 || !PPUON)
nes.Board.AddressPPU(ppur.get_2007access());
race_2006 = true;
}
}
if (install_2001 > 0)
{
install_2001--;
if (install_2001 == 0)
{
show_bg_new = reg_2001.show_bg;
show_obj_new = reg_2001.show_obj;
}
}
ppur.status.cycle++;
is_even_cycle = !is_even_cycle;

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

@ -27,8 +27,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public int intensity_lsl_6; //an optimization..
public bool PPUON { get { return show_bg || show_obj; } }
public byte Value
{
get
@ -50,6 +48,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
public bool PPUON { get { return show_bg_new || show_obj_new; } }
// this byte is used to simulate open bus reads and writes
// it should be modified by every read and write to a ppu register
public byte ppu_open_bus=0;
@ -345,6 +346,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
//printf("%04x:$%02x, %d\n",A,V,scanline);
reg_2001.Value = value;
install_2001 = 2;
}
byte read_2001() {return ppu_open_bus; }
byte peek_2001() {return ppu_open_bus; }
@ -439,7 +441,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
byte ret;
// behaviour depends on whether things are being rendered or not
if (reg_2001.show_bg || reg_2001.show_obj)
if (PPUON)
{
if (ppur.status.sl < 241)
{
@ -535,7 +537,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
int addr = ppur.get_2007access();
if (ppuphase == PPUPHASE.BG)
{
if (reg_2001.show_bg)
if (show_bg_new)
{
addr = ppur.get_ntread();
}
@ -564,10 +566,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
ppur.increment2007(ppur.status.rendering && reg_2001.PPUON, reg_2000.vram_incr32 != 0);
ppur.increment2007(ppur.status.rendering && PPUON, reg_2000.vram_incr32 != 0);
//see comments in $2006
if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
if (ppur.status.sl == 241 || !PPUON)
nes.Board.AddressPPU(ppur.get_2007access());
}
byte read_2007()
@ -588,10 +590,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
bus_case = 1;
}
ppur.increment2007(ppur.status.rendering && reg_2001.PPUON, reg_2000.vram_incr32 != 0);
ppur.increment2007(ppur.status.rendering && PPUON, reg_2000.vram_incr32 != 0);
//see comments in $2006
if (ppur.status.sl == 241 || (!reg_2001.show_obj && !reg_2001.show_bg))
if (ppur.status.sl == 241 || !PPUON)
nes.Board.AddressPPU(ppur.get_2007access());
// update open bus here
@ -815,4 +817,4 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//Palette Gaps and Mirrors
// 3F04h,3F08h,3F0Ch - Three general purpose 6bit data registers.
// 3F10h,3F14h,3F18h,3F1Ch - Mirrors of 3F00h,3F04h,3F08h,3F0Ch.
// 3F20h-3FFFh - Mirrors of 3F00h-3F1Fh.
// 3F20h-3FFFh - Mirrors of 3F00h-3F1Fh.

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

@ -46,6 +46,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
// installing vram address is delayed after second write to 2006, set this up here
public int install_2006;
public bool race_2006;
public int install_2001;
public bool show_bg_new; //Show background
public bool show_obj_new; //Show sprites
struct TempOAM
{
@ -132,7 +135,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
runppu(1);
if (reg_2001.PPUON)
if (PPUON)
{
ppu_was_on = true;
}
@ -140,13 +143,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
break;
case 7:
race_2006 = false;
runppu(1);
//horizontal scroll clocked at cycle 3 and then
//vertical scroll at 256
if (ppu_was_on)
if (PPUON)
{
ppur.increment_hsc();
if (!race_2006)
ppur.increment_hsc();
if (ppur.status.cycle == 256 && !race_2006)
ppur.increment_vs();
}
@ -181,7 +185,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//Not sure if this is correct. According to Matt Conte and my own tests, it is. Timing is probably off, though.
//NOTE: Not having this here breaks a Super Donkey Kong game.
if (reg_2001.show_obj || reg_2001.show_bg) reg_2003 = 0;
if (PPUON) reg_2003 = 0;
//this was repeatedly finetuned from the fceux days thrugh the old cpu core and into the new one to pass 05-nmi_timing.nes
//note that there is still some leniency. for instance, 4,2 will pass in addition to 3,3
@ -224,7 +228,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
// "If PPUADDR is not less then 8 when rendering starts, the first 8 fights in OAM and written to from
// the current location off PPUADDR"
if (sl == 0 && reg_2001.PPUON && reg_2003 >= 8)
if (sl == 0 && PPUON && reg_2003 >= 8)
{
for (int i = 0; i < 8; i++)
{
@ -252,7 +256,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
spriteHeight = reg_2000.obj_size_16 ? 16 : 8;
//check all the conditions that can cause things to render in these 8px
bool renderspritenow = reg_2001.show_obj && (xt > 0 || reg_2001.show_obj_leftmost);
bool renderspritenow = show_obj_new && (xt > 0 || reg_2001.show_obj_leftmost);
bool renderbgnow;
for (int xp = 0; xp < 8; xp++, rasterpos++)
@ -346,7 +350,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
else if (soam_index>=8)
{
if (yp >= read_value && yp < read_value + spriteHeight && reg_2001.PPUON)
if (yp >= read_value && yp < read_value + spriteHeight && PPUON)
{
Reg2002_objoverflow = true;
}
@ -393,12 +397,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//process the current clock's worth of bg data fetching
//this needs to be split into 8 pieces or else exact sprite 0 hitting wont work due to the cpu not running while the sprite renders below
if (reg_2001.show_obj || reg_2001.show_bg)
if (PPUON)
Read_bgdata(xp, ref bgdata[xt + 2]);
else
runppu(1);
renderbgnow = reg_2001.show_bg && (xt > 0 || reg_2001.show_bg_leftmost);
renderbgnow = show_bg_new && (xt > 0 || reg_2001.show_bg_leftmost);
//bg pos is different from raster pos due to its offsetability.
//so adjust for that here
int bgpos = rasterpos + ppur.fh;
@ -410,7 +414,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//according to qeed's doc, use palette 0 or $2006's value if it is & 0x3Fxx
//at one point I commented this out to fix bottom-left garbage in DW4. but it's needed for full_nes_palette.
//solution is to only run when PPU is actually OFF (left-suppression doesnt count)
if (!reg_2001.show_bg && !reg_2001.show_obj)
if (!PPUON)
{
// if there's anything wrong with how we're doing this, someone please chime in
int addr = ppur.get_2007access();
@ -465,7 +469,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//1. is it sprite#0?
//2. is the bg pixel nonzero?
//then, it is spritehit.
Reg2002_objhit |= (sprite_zero_go && s == 0 && pixel != 0 && rasterpos < 255 && reg_2001.show_bg && reg_2001.show_obj);
Reg2002_objhit |= (sprite_zero_go && s == 0 && pixel != 0 && rasterpos < 255 && show_bg_new && show_obj_new);
//priority handling, if in front of BG:
bool drawsprite = !(((t_oam[s].oam_attr & 0x20) != 0) && ((pixel & 3) != 0));
@ -526,7 +530,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
for (int s = 0; s < 8; s++)
{
bool junksprite = (!reg_2001.PPUON);
bool junksprite = (!PPUON);
t_oam[s].oam_y = soam[s * 4];
t_oam[s].oam_ind = soam[s * 4 + 1];
@ -561,7 +565,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ppubus_read(ppur.get_ntread(), true, true);
if (reg_2001.PPUON)
if (PPUON)
{
if (sl == 0 && ppur.status.cycle == 304)
{
@ -569,7 +573,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
read_value = t_oam[s].oam_y;
runppu(1);
if (reg_2001.PPUON) ppur.install_latches();
if (PPUON) ppur.install_latches();
read_value = t_oam[s].oam_ind;
runppu(1);
@ -591,7 +595,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
//at 257: 3d world runner is ugly if we do this at 256
if (reg_2001.PPUON) ppur.install_h_latches();
if (PPUON) ppur.install_h_latches();
read_value = t_oam[s].oam_ind;
runppu(1);
@ -681,7 +685,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
for (int s = 8; s < soam_index_aux; s++)
{
bool junksprite = (!reg_2001.PPUON);
bool junksprite = (!PPUON);
t_oam[s].oam_y = soam[s * 4];
t_oam[s].oam_ind = soam[s * 4 + 1];
@ -750,9 +754,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
// this sequence is tuned to pass 10-even_odd_timing.nes
runppu(kFetchTime);
bool evenOddDestiny = (reg_2001.show_bg || reg_2001.show_obj);
runppu(kFetchTime);
runppu(1);
runppu(1);
runppu(1);
runppu(1);
bool evenOddDestiny = PPUON;
// After memory access 170, the PPU simply rests for 4 cycles (or the
// equivelant of half a memory access cycle) before repeating the whole
@ -763,7 +769,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
else
runppu(1);
race_2006 = false;
} // scanline loop
ppur.status.sl = 241;
@ -795,7 +800,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
if (ppudead==2)
{
*/
runppu(241 * kLineTime-7*3);
runppu(241 * kLineTime - 3);// -8*3);
/*
} else
{