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

try to give more granular accounting of scanline and dot for debugger

This commit is contained in:
zeromus 2015-11-04 18:49:40 +00:00
parent 8efa68b7af
commit 0708f60a7c
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/src/drivers/win/debugger.cpp
View File

@ -26,6 +26,7 @@
#include "../../fceu.h" #include "../../fceu.h"
#include "../../debug.h" #include "../../debug.h"
#include "../../nsf.h" #include "../../nsf.h"
#include "../../ppu.h"
#include "../../cart.h" #include "../../cart.h"
#include "../../ines.h" #include "../../ines.h"
#include "../../asm.h" #include "../../asm.h"
@ -891,6 +892,13 @@ void UpdateDebugger(bool jump_to_pc)
sprintf(str, "%d", scanline); sprintf(str, "%d", scanline);
sprintf(str2, "%d", ppupixel); sprintf(str2, "%d", ppupixel);
} }
if(newppu)
{
sprintf(str,"%d",newppu_get_scanline());
sprintf(str2,"%d",newppu_get_dot());
}
SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_SLINE, str); SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_SLINE, str);
SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_PPUPIXEL, str2); SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_PPUPIXEL, str2);

21
trunk/src/ppu.cpp
View File

@ -276,6 +276,9 @@ struct PPUREGS {
} }
} ppur; } ppur;
int newppu_get_scanline() { return ppur.status.sl; }
int newppu_get_dot() { return ppur.status.cycle; }
static void makeppulut(void) { static void makeppulut(void) {
int x; int x;
int y; int y;
@ -2024,12 +2027,20 @@ int FCEUX_PPU_Loop(int skip) {
ppur.status.sl = 241; //for sprite reads ppur.status.sl = 241; //for sprite reads
runppu(delay); //X6502_Run(12); //formerly: runppu(delay);
for(int dot=0;dot<delay;dot++)
runppu(1);
if (VBlankON) TriggerNMI(); if (VBlankON) TriggerNMI();
if (PAL) int sltodo = PAL?70:20;
runppu(70 * (kLineTime) - delay);
else //formerly: runppu(20 * (kLineTime) - delay);
runppu(20 * (kLineTime) - delay); for(int S=0;S<sltodo;S++)
{
for(int dot=(S==0?delay:0);dot<kLineTime;dot++)
runppu(1);
ppur.status.sl++;
}
//this seems to run just before the dummy scanline begins //this seems to run just before the dummy scanline begins
PPU_status = 0; PPU_status = 0;

3
trunk/src/ppu.h
View File

@ -9,6 +9,9 @@ void FCEUPPU_SetVideoSystem(int w);
extern void (*PPU_hook)(uint32 A); extern void (*PPU_hook)(uint32 A);
extern void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void); extern void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void);
int newppu_get_scanline();
int newppu_get_dot();
/* For cart.c and banksw.h, mostly */ /* For cart.c and banksw.h, mostly */
extern uint8 NTARAM[0x800], *vnapage[4]; extern uint8 NTARAM[0x800], *vnapage[4];
extern uint8 PPUNTARAM; extern uint8 PPUNTARAM;