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

bring some improvements to newppu from bizhawk, and fig vtoggle5/6 back to vtoggle

This commit is contained in:
zeromus 2013-03-19 18:08:03 +00:00
parent 220ad62d79
commit 33e191fbd4
1 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
trunk/src/ppu.cpp
View File

@ -238,7 +238,18 @@ struct PPUREGS {
return (s << 0xC) | (par << 0x4) | fv; return (s << 0xC) | (par << 0x4) | fv;
} }
void increment2007(bool by32) { void increment2007(bool rendering, bool by32) {
if (rendering)
{
//don't do this:
//if (by32) increment_vs();
//else increment_hsc();
//do this instead:
increment_vs(); //yes, even if we're moving by 32
return;
}
//If the VRAM address increment bit (2000.2) is clear (inc. amt. = 1), all the //If the VRAM address increment bit (2000.2) is clear (inc. amt. = 1), all the
//scroll counters are daisy-chained (in the order of HT, VT, H, V, FV) so that //scroll counters are daisy-chained (in the order of HT, VT, H, V, FV) so that
//the carry out of each counter controls the next counter's clock rate. The //the carry out of each counter controls the next counter's clock rate. The
@ -323,8 +334,7 @@ static int deempcnt[8];
void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void); void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void);
void (*PPU_hook)(uint32 A); void (*PPU_hook)(uint32 A);
uint8 vtoggle5 = 0; uint8 vtoggle = 0;
uint8 vtoggle6 = 0;
uint8 XOffset = 0; uint8 XOffset = 0;
uint32 TempAddr = 0, RefreshAddr = 0, DummyRead = 0; uint32 TempAddr = 0, RefreshAddr = 0, DummyRead = 0;
@ -505,7 +515,7 @@ static DECLFR(A2002) {
if (!fceuindbg) if (!fceuindbg)
#endif #endif
{ {
vtoggle5 = vtoggle6 = 0; vtoggle = 0;
PPU_status &= 0x7F; PPU_status &= 0x7F;
PPUGenLatch = ret; PPUGenLatch = ret;
} }
@ -687,7 +697,7 @@ static DECLFR(A2007) {
LogAddress = GetCHRAddress(RefreshAddr); LogAddress = GetCHRAddress(RefreshAddr);
VRAMBuffer = CALL_PPUREAD(RefreshAddr); VRAMBuffer = CALL_PPUREAD(RefreshAddr);
} }
ppur.increment2007(INC32 != 0); ppur.increment2007(ppur.status.sl >= 0 && ppur.status.sl < 241 && PPUON, INC32 != 0);
RefreshAddr = ppur.get_2007access(); RefreshAddr = ppur.get_2007access();
return ret; return ret;
} else { } else {
@ -820,7 +830,7 @@ static DECLFW(B2005) {
uint32 tmp = TempAddr; uint32 tmp = TempAddr;
FCEUPPU_LineUpdate(); FCEUPPU_LineUpdate();
PPUGenLatch = V; PPUGenLatch = V;
if (!vtoggle5) { if (!vtoggle) {
tmp &= 0xFFE0; tmp &= 0xFFE0;
tmp |= V >> 3; tmp |= V >> 3;
XOffset = V & 7; XOffset = V & 7;
@ -834,7 +844,7 @@ static DECLFW(B2005) {
ppur._fv = V & 7; ppur._fv = V & 7;
} }
TempAddr = tmp; TempAddr = tmp;
vtoggle5 ^= 1; vtoggle ^= 1;
} }
@ -842,7 +852,7 @@ static DECLFW(B2006) {
FCEUPPU_LineUpdate(); FCEUPPU_LineUpdate();
PPUGenLatch = V; PPUGenLatch = V;
if (!vtoggle6) { if (!vtoggle) {
TempAddr &= 0x00FF; TempAddr &= 0x00FF;
TempAddr |= (V & 0x3f) << 8; TempAddr |= (V & 0x3f) << 8;
@ -867,7 +877,7 @@ static DECLFW(B2006) {
ppur.install_latches(); ppur.install_latches();
} }
vtoggle6 ^= 1; vtoggle ^= 1;
} }
static DECLFW(B2007) { static DECLFW(B2007) {
@ -877,7 +887,7 @@ static DECLFW(B2007) {
PPUGenLatch = V; PPUGenLatch = V;
RefreshAddr = ppur.get_2007access() & 0x3FFF; RefreshAddr = ppur.get_2007access() & 0x3FFF;
CALL_PPUWRITE(RefreshAddr, V); CALL_PPUWRITE(RefreshAddr, V);
ppur.increment2007(INC32 != 0); ppur.increment2007(ppur.status.sl >= 0 && ppur.status.sl < 241 && PPUON, INC32 != 0);
RefreshAddr = ppur.get_2007access(); RefreshAddr = ppur.get_2007access();
} else { } else {
PPUGenLatch = V; PPUGenLatch = V;
@ -1631,7 +1641,7 @@ void FCEUPPU_Reset(void) {
PPUSPL = 0; PPUSPL = 0;
PPUGenLatch = 0; PPUGenLatch = 0;
RefreshAddr = TempAddr = 0; RefreshAddr = TempAddr = 0;
vtoggle5 = vtoggle6 = 0; vtoggle = 0;
ppudead = 2; ppudead = 2;
kook = 0; kook = 0;
idleSynch = 1; idleSynch = 1;
@ -1806,8 +1816,7 @@ SFORMAT FCEUPPU_STATEINFO[] = {
{ &ppudead, 1, "DEAD" }, { &ppudead, 1, "DEAD" },
{ &PPUSPL, 1, "PSPL" }, { &PPUSPL, 1, "PSPL" },
{ &XOffset, 1, "XOFF" }, { &XOffset, 1, "XOFF" },
{ &vtoggle5, 1, "VTG5" }, { &vtoggle6, 1, "VTGL" },
{ &vtoggle6, 1, "VTG6" },
{ &RefreshAddrT, 2 | FCEUSTATE_RLSB, "RADD" }, { &RefreshAddrT, 2 | FCEUSTATE_RLSB, "RADD" },
{ &TempAddrT, 2 | FCEUSTATE_RLSB, "TADD" }, { &TempAddrT, 2 | FCEUSTATE_RLSB, "TADD" },
{ &VRAMBuffer, 1, "VBUF" }, { &VRAMBuffer, 1, "VBUF" },
@ -2131,11 +2140,6 @@ int FCEUX_PPU_Loop(int skip) {
//todo - think about clearing oams to a predefined value to force deterministic behavior //todo - think about clearing oams to a predefined value to force deterministic behavior
//so.. this is the end of hblank. latch horizontal scroll values
//do it cycle at 251
if (PPUON && sl != 0)
ppur.install_h_latches();
ppuphase = PPUPHASE_OBJ; ppuphase = PPUPHASE_OBJ;
//fetch sprite patterns //fetch sprite patterns
@ -2180,18 +2184,26 @@ int FCEUX_PPU_Loop(int skip) {
patternAddress += line & 7; patternAddress += line & 7;
//garbage nametable fetches //garbage nametable fetches
//reset the scroll counter, happens at cycle 304 int garbage_todo = 2;
if (realSprite) { if (PPUON)
if ((sl == 0) && PPUON) { {
if (ppur.status.cycle == 304) { if (sl == 0 && ppur.status.cycle == 304)
runppu(1); {
ppur.install_latches(); runppu(1);
runppu(1); if (PPUON) ppur.install_latches();
} else runppu(1);
runppu(kFetchTime); garbage_todo = 0;
} else }
runppu(kFetchTime); if ((sl != 0) && ppur.status.cycle == 256)
{
runppu(1);
//at 257: 3d world runner is ugly if we do this at 256
if (PPUON) ppur.install_h_latches();
runppu(1);
garbage_todo = 0;
}
} }
if (realSprite) runppu(garbage_todo);
//Dragon's Lair (Europe version mapper 4) //Dragon's Lair (Europe version mapper 4)
//does not set SpriteON in the beginning but it does //does not set SpriteON in the beginning but it does