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

CDLOGGER: avoid to log VRAM access

This commit is contained in:
CaH4e3 2012-09-23 15:03:38 +00:00
parent 2524abbb3c
commit 7dfd0d6242
2 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/drivers/win/cdlogger.cpp
View File

@ -47,20 +47,15 @@ extern uint8 *trainerpoo;
extern volatile int rendercount, vromreadcount, undefinedvromcount;
extern unsigned char *cdloggervdata;
extern int newppu;
extern uint32 VROM_size;
int CDLogger_wndx=0, CDLogger_wndy=0;
//extern uint8 *ROM;
//extern uint8 *VROM;
extern uint8 *NSFDATA;
extern int NSFMaxBank;
static uint8 NSFLoadLow;
static uint8 NSFLoadHigh;
//volatile int loggingcodedata;
//int cdlogger_open;
HWND hCDLogger;
char loadedcdfile[1024];
@ -117,11 +112,14 @@ BOOL CALLBACK CDLoggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
hCDLogger = hwndDlg;
codecount = datacount = rendercount = vromreadcount = 0;
undefinedcount = PRGsize[0];
undefinedvromcount = CHRsize[0];
cdloggerdata = (unsigned char*)malloc(PRGsize[0]); //mbg merge 7/18/06 added cast
cdloggervdata = (unsigned char*)malloc(CHRsize[0]);
ZeroMemory(cdloggerdata,PRGsize[0]);
if(VROM_size)
{
undefinedvromcount = CHRsize[0];
cdloggervdata = (unsigned char*)malloc(CHRsize[0]);
ZeroMemory(cdloggervdata,CHRsize[0]);
}
break;
case WM_CLOSE:
case WM_QUIT:
@ -147,9 +145,12 @@ MB_OK);
case BTN_CDLOGGER_RESET:
codecount = datacount = rendercount = vromreadcount = 0;
undefinedcount = PRGsize[0];
undefinedvromcount = CHRsize[0];
ZeroMemory(cdloggerdata,PRGsize[0]);
if(VROM_size)
{
undefinedvromcount = CHRsize[0];
ZeroMemory(cdloggervdata,CHRsize[0]);
}
UpdateCDLogger();
break;
case BTN_CDLOGGER_LOAD:
@ -228,6 +229,8 @@ void LoadCDLog (const char* nameo)
cdloggerdata[i] |= j;
}
if(VROM_size)
{
for(i = 0;i < (int)CHRsize[0];i++){
j = fgetc(FP);
if(j == EOF)break;
@ -236,6 +239,7 @@ void LoadCDLog (const char* nameo)
if((j & 3) && !(cdloggervdata[i] & 3))undefinedvromcount--; //the appropriate counter.
cdloggervdata[i] |= j;
}
}
fclose(FP);
UpdateCDLogger();
@ -261,10 +265,7 @@ void LoadCDLogFile(){
}
void SaveCDLogFileAs(){
//don't be stupid
const char filter[]="Code Data Log File (*.CDL)\0*.cdl\0All Files (*.*)\0*.*\0\0";
//this feature not for select desired file extension for saved filename
//this feature only for filter file list only for desired file extension.
char nameo[2048];
OPENFILENAME ofn;
memset(&ofn,0,sizeof(ofn));
@ -273,23 +274,12 @@ void SaveCDLogFileAs(){
ofn.lpstrTitle="Save Code Data Log File As...";
ofn.lpstrFilter=filter;
strcpy(nameo,GetRomName());
//don't be stupid,
ofn.lpstrDefExt = "cdl";
//do this automatically with system function, it is doing exactly what it written for
//why do you need to do this one more time? All we need here, filled extension in dialog window
//BEFORE saving it, there is no other options.
ofn.lpstrFile=nameo;
ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
ofn.hwndOwner = hCDLogger;
//after that we will get complete file with ext added automatically from DefExt string
//change ext in Save Dialog and it will be saved
if(!GetSaveFileName(&ofn))return;
//there is bad if something is written AFTER i selectdesired file extension in Save Dialog
//when I want NOT to have any extension, it will write me default one, that is stupid,
//in addition, this is silently forcing default extension to file, but user didn't know about it at all
//that's all what needed to work. I checked this and it works exactly what it should
strcpy(loadedcdfile,nameo);
SaveCDLogFile();
return;
@ -297,8 +287,6 @@ void SaveCDLogFileAs(){
void SaveCDLogFile(){ //todo make this button work before you've saved as
FILE *FP;
//if(loadedcdfile[0] == 0)SaveCDLogFileAs();
//FCEUD_PrintError(loadedcdfile);
FP = fopen(loadedcdfile,"wb");
if(FP == NULL){
@ -306,6 +294,7 @@ void SaveCDLogFile(){ //todo make this button work before you've saved as
return;
}
fwrite(cdloggerdata,PRGsize[0],1,FP);
if(VROM_size)
fwrite(cdloggervdata,CHRsize[0],1,FP);
fclose(FP);
return;
@ -317,17 +306,12 @@ void DoCDLogger()
FCEUD_PrintError("You must have a game loaded before you can use the Code Data Logger.");
return;
}
//if (GameInfo->type==GIT_NSF) { //todo: NSF support!
// FCEUD_PrintError("Sorry, you can't yet use the Code Data Logger with NSFs.");
// return;
//}
if(!hCDLogger)
{
CreateDialog(fceu_hInstance,"CDLOGGER",NULL,CDLoggerCallB);
} else
{
//SetWindowPos(hCDLogger,HWND_TOP,0,0,0,0,SWP_NOSIZE|SWP_NOMOVE|SWP_NOOWNERZORDER);
ShowWindow(hCDLogger, SW_SHOWNORMAL);
SetForegroundWindow(hCDLogger);
}
@ -344,7 +328,7 @@ void UpdateCDLogger(){
float fundefinedcount = undefinedcount;
float fundefinedvromcount = undefinedvromcount;
float fromsize = PRGsize[0];
float fvromsize = CHRsize[0];
float fvromsize = VROM_size ? CHRsize[0] : 1;
sprintf(str,"0x%06x %.2f%%",codecount,fcodecount/fromsize*100);
SetDlgItemText(hCDLogger,LBL_CDLOGGER_CODECOUNT,str);
@ -441,7 +425,7 @@ void SaveStrippedRom(int invert){ //this is based off of iNesSave()
fwrite(trainerpoo,512,1,fp);
}
for(i = 0;i < head.ROM_size*0x4000;i++){
for(i = 0; i < (int)PRGsize[0]; i++){
unsigned char pchar;
if(cdloggerdata[i] & 3)
pchar = invert?0:ROM[i];
@ -450,7 +434,9 @@ void SaveStrippedRom(int invert){ //this is based off of iNesSave()
fputc(pchar, fp);
}
for(i = 0;i < head.VROM_size*0x2000;i++){
if(VROM_size)
{
for(i = 0; i < (int)CHRsize[0]; i++){
unsigned char vchar;
if(cdloggervdata[i] & 1)
vchar = invert?0:VROM[i];
@ -459,6 +445,7 @@ void SaveStrippedRom(int invert){ //this is based off of iNesSave()
fputc(vchar, fp);
}
}
}
fclose(fp);
}

2
src/ppu.cpp
View File

@ -438,10 +438,12 @@ inline void FFCEUX_PPUWrite_Default(uint32 A, uint8 V) {
volatile int rendercount, vromreadcount, undefinedvromcount, LogAddress = -1;
unsigned char *cdloggervdata;
extern uint32 VROM_size;
int GetCHRAddress(int A){
int result;
if((A > 0x1fff))return -1;
if(!VROM_size)return -1;
result = &VPage[A>>10][A]-CHRptr[0];
if((result > (int)CHRsize[0]) || (result < 0))return -1;
else return result;