Attachment #128652 for bug #141626

Lines 959-965 Link Here

(-)orig/pcsx2/Interpreter.c (+2 lines)
959		959
960	extern void iDumpVU0Registers();	960	extern void iDumpVU0Registers();
961	extern void iDumpVU1Registers();	961	extern void iDumpVU1Registers();
		962	#ifdef PCSX2_DEVBUILD
962	extern u32 vudump;	963	extern u32 vudump;
		964	#endif
963	extern int vu0branch, vu1branch;	965	extern int vu0branch, vu1branch;
964		966
965	void intExecuteVU0Block() {	967	void intExecuteVU0Block() {

Lines 91-97 Link Here

(-)orig/pcsx2/Linux/Config.c (+5 lines)
91	GetValuel("SafeCnts", Config.SafeCnts);	91	GetValuel("SafeCnts", Config.SafeCnts);
92		92
93	GetValuel("Patch", Config.Patch);	93	GetValuel("Patch", Config.Patch);
		94
		95	#ifdef PCSX2_DEVBUILD
94	GetValuel("varLog", varLog);	96	GetValuel("varLog", varLog);
		97	#endif
95		98
96	free(data);	99	free(data);
97		100
Lines 138-144 Link Here
138	SetValuel("SafeCnts", Config.SafeCnts);	141	SetValuel("SafeCnts", Config.SafeCnts);
139	// misc	142	// misc
140	SetValuel("Patch", Config.Patch);	143	SetValuel("Patch", Config.Patch);
		144	#ifdef PCSX2_DEVBUILD
141	SetValuel("varLog", varLog);	145	SetValuel("varLog", varLog);
		146	#endif
142		147
143	fclose(f);	148	fclose(f);
144		149

Lines 1208-1215 Link Here

(-)orig/pcsx2/Linux/GtkGui.c (-1 / +7 lines)
1208	UpdateDebugger();	1208	UpdateDebugger();
1209	}	1209	}
1210		1210
		1211
1211	void OnDebug_Log(GtkButton *button, gpointer user_data) {	1212	void OnDebug_Log(GtkButton *button, gpointer user_data) {
1212	Log = 1 - Log;	1213	#ifdef PCSX2_DEVBUILD
		1214	Log = 1 - Log;
		1215	#endif
1213	}	1216	}
1214		1217
1215	void OnDebug_EEMode(GtkToggleButton *togglebutton, gpointer user_data) {	1218	void OnDebug_EEMode(GtkToggleButton *togglebutton, gpointer user_data) {
Lines 1293-1298 Link Here
1293	}	1296	}
1294		1297
1295	void OnLogging_Ok(GtkButton *button, gpointer user_data) {	1298	void OnLogging_Ok(GtkButton *button, gpointer user_data) {
		1299
		1300	#ifdef PCSX2_DEVBUILD
1296	GtkWidget *Btn;	1301	GtkWidget *Btn;
1297	char str[32];	1302	char str[32];
1298	int i, ret;	1303	int i, ret;
Lines 1323-1328 Link Here
1323		1328
1324	Btn = lookup_widget(LogDlg, "Log");	1329	Btn = lookup_widget(LogDlg, "Log");
1325	Log = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));	1330	Log = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));
		1331	#endif
1326		1332
1327	SaveConfig();	1333	SaveConfig();
1328		1334




#include <glib/gthread.h>
#include <unistd.h>


#include "Common.h"
#include "PsxCommon.h"
#include "Linux.h"

				"\t-numimages [num] {after hitting frame, this many images will be captures every 20 frames}\n"
                "\t-test {Triggers testing mode (only for dev builds)}\n"
                "\n"
#endif

                "Load Plugins:\n"
                "\t-cdvd [dllpath] {specify the dll load path of the CDVD plugin}\n"
                "\t-gs [dllpath] {specify the dll load path of the GS plugin}\n"
                "-pad [tsxcal] {specify to hold down on the triangle, square, circle, x, start, select buttons}\n"
                "\t-spu [dllpath] {specify the dll load path of the SPU2 plugin}\n"
#endif
                "\n";

			//SysMessage(phelpmsg);

		}
        else if( stricmp(token, "-nogui") == 0 ) {
            UseGui = 0;

        }
	else if( stricmp(token, "-loadgs") == 0 ) {
		g_pRunGSState = argv[i++];
	}
	else if( stricmp(token, "-pad") == 0 ) {
		token = argv[i++];
		printf("-pad ignored\n");
	}
#ifdef PCSX2_DEVBUILD
	else if( stricmp(token, "-numimages") == 0 ) {
		token = argv[i++];
		if( token != NULL ) {
			g_TestRun.numimages = atoi(token);
				if( token[0] == '0' && token[1] == 'x' ) token += 2;
				sscanf(token, "%x", &varLog);
			}
		}
		else if( stricmp(token, "-pad") == 0 ) {
			token = argv[i++];
			printf("-pad ignored\n");
		}
		else if( stricmp(token, "-frame") == 0 ) {
			token = argv[i++];
			if( token != NULL ) {
				g_TestRun.frame = atoi(token);
			}
		}
		else if( stricmp(token, "-numimages") == 0 ) {
			token = argv[i++];
			if( token != NULL ) {
				g_TestRun.numimages = atoi(token);
			}
		}
		else if( stricmp(token, "-jpg") == 0 ) {
			g_TestRun.jpgcapture = 1;
		}
		else if( stricmp(token, "-gs") == 0 ) {
			token = argv[i++];
			g_TestRun.pgsdll = token;
		}
		else if( stricmp(token, "-cdvd") == 0 ) {
			token = argv[i++];
			g_TestRun.pcdvddll = token;
		}
	}
	else if( stricmp(token, "-gs") == 0 ) {
		token = argv[i++];
		g_TestRun.pgsdll = token;
	}
	else if( stricmp(token, "-cdvd") == 0 ) {
		token = argv[i++];
		g_TestRun.pcdvddll = token;
	}
	else if( stricmp(token, "-spu") == 0 ) {
		token = argv[i++];
		g_TestRun.pspudll = token;
	}
	else if( stricmp(token, "-loadgs") == 0 ) {
		token = argv[i++];
		g_pRunGSState = token;
	}
	else if( stricmp(token, "-image") == 0 ) {
		g_TestRun.pimagename = argv[i++];
	}
	else if( stricmp(token, "-log") == 0 ) {
		g_TestRun.plogname = argv[i++];
	}
	else if( stricmp(token, "-logopt") == 0 ) {
		token = argv[i++];
		if( token != NULL ) {
			if( token[0] == '0' && token[1] == 'x' ) token += 2;
			sscanf(token, "%x", &varLog);
		}
	}
	else if( stricmp(token, "-frame") == 0 ) {
		token = argv[i++];
		if( token != NULL ) {
			g_TestRun.frame = atoi(token);
		}
	}
	else if( stricmp(token, "-jpg") == 0 ) {
		g_TestRun.jpgcapture = 1;
	}
        else if( stricmp(token, "-test") == 0 ) {
            g_TestRun.enabled = 1;
        }
#endif
	else {
            file = token;
            printf("opening file %s\n", file);
		}




#include "iVUzerorec.h"

// temporary externs
#ifdef PCSX2_DEVBUILD
extern u32 vudump;
#endif
extern void iDumpVU0Registers();
extern void iDumpVU1Registers();


//    VU1.VF[7].F[2] = vuDouble(VU1.VF[7].UL[2]);
//    VU1.VF[7].F[3] = vuDouble(VU1.VF[7].UL[3]);

#ifdef PCSX2_DEVBUILD
    if( ((vudump&8) && g_curdebugvu) || ((vudump&0x80) && !g_curdebugvu) ) { //&& g_vu1lastrec != g_vu1last ) {

		if( skipparent != g_vu1lastrec ) {


		g_vu1lastrec = s_svulast;
	}
#endif

#if defined(_MSC_VER) && !defined(__x86_64__)
	__asm {




	push %ecx

	rdtsc
#ifdef PCSX2_DEVBUILD
	mov dword ptr [lbase], %eax
	mov dword ptr [lbase + 4], %edx
#endif

	pop %ecx
	pop %ebx


	rdtsc

#ifdef PCSX2_DEVBUILD
	sub %eax, dword ptr [lbase]
	sbb %edx, dword ptr [lbase + 4]
#endif
	mov %ecx, s_pCurBlock_ltime
	add %eax, dword ptr [%ecx]
	adc %edx, dword ptr [%ecx + 4]

Return to bug 141626

Lines 35-41 Link Here

(-)orig/pcsx2/Linux/LnxMain.c (-51 / +53 lines)
35	#include <glib/gthread.h>	35	#include <glib/gthread.h>
36	#include <unistd.h>	36	#include <unistd.h>
37		37
38
39	#include "Common.h"	38	#include "Common.h"
40	#include "PsxCommon.h"	39	#include "PsxCommon.h"
41	#include "Linux.h"	40	#include "Linux.h"
Lines 112-124 Link Here
112	"\t-numimages [num] {after hitting frame, this many images will be captures every 20 frames}\n"	111	"\t-numimages [num] {after hitting frame, this many images will be captures every 20 frames}\n"
113	"\t-test {Triggers testing mode (only for dev builds)}\n"	112	"\t-test {Triggers testing mode (only for dev builds)}\n"
114	"\n"	113	"\n"
115	#endif
116		114
117	"Load Plugins:\n"	115	"Load Plugins:\n"
118	"\t-cdvd [dllpath] {specify the dll load path of the CDVD plugin}\n"	116	"\t-cdvd [dllpath] {specify the dll load path of the CDVD plugin}\n"
119	"\t-gs [dllpath] {specify the dll load path of the GS plugin}\n"	117	"\t-gs [dllpath] {specify the dll load path of the GS plugin}\n"
120	"-pad [tsxcal] {specify to hold down on the triangle, square, circle, x, start, select buttons}\n"	118	"-pad [tsxcal] {specify to hold down on the triangle, square, circle, x, start, select buttons}\n"
121	"\t-spu [dllpath] {specify the dll load path of the SPU2 plugin}\n"	119	"\t-spu [dllpath] {specify the dll load path of the SPU2 plugin}\n"
		120	#endif
122	"\n";	121	"\n";
123		122
124	//SysMessage(phelpmsg);	123	//SysMessage(phelpmsg);
Lines 132-193 Link Here
132	}	131	}
133	else if( stricmp(token, "-nogui") == 0 ) {	132	else if( stricmp(token, "-nogui") == 0 ) {
134	UseGui = 0;	133	UseGui = 0;
		134
135	}	135	}
136	else if( stricmp(token, "-image") == 0 ) {	136	else if( stricmp(token, "-loadgs") == 0 ) {
137	g_TestRun.pimagename = argv[i++];	137	g_pRunGSState = argv[i++];
138	}	138	}
139	else if( stricmp(token, "-loadgs") == 0 ) {	139	else if( stricmp(token, "-pad") == 0 ) {
140	g_pRunGSState = argv[i++];	140	token = argv[i++];
141	}	141	printf("-pad ignored\n");
142	else if( stricmp(token, "-log") == 0 ) {	142	}
143	g_TestRun.plogname = argv[i++];	143	#ifdef PCSX2_DEVBUILD
144	}	144	else if( stricmp(token, "-numimages") == 0 ) {
145	else if( stricmp(token, "-logopt") == 0 ) {	145	token = argv[i++];
146	token = argv[i++];	146	if( token != NULL ) {
147	if( token != NULL ) {	147	g_TestRun.numimages = atoi(token);
148	if( token[0] == '0' && token[1] == 'x' ) token += 2;
149	sscanf(token, "%x", &varLog);
150	}
151	}
152	else if( stricmp(token, "-pad") == 0 ) {
153	token = argv[i++];
154	printf("-pad ignored\n");
155	}
156	else if( stricmp(token, "-frame") == 0 ) {
157	token = argv[i++];
158	if( token != NULL ) {
159	g_TestRun.frame = atoi(token);
160	}
161	}
162	else if( stricmp(token, "-numimages") == 0 ) {
163	token = argv[i++];
164	if( token != NULL ) {
165	g_TestRun.numimages = atoi(token);
166	}
167	}
168	else if( stricmp(token, "-jpg") == 0 ) {
169	g_TestRun.jpgcapture = 1;
170	}
171	else if( stricmp(token, "-gs") == 0 ) {
172	token = argv[i++];
173	g_TestRun.pgsdll = token;
174	}
175	else if( stricmp(token, "-cdvd") == 0 ) {
176	token = argv[i++];
177	g_TestRun.pcdvddll = token;
178	}	148	}
179	else if( stricmp(token, "-spu") == 0 ) {	149	}
180	token = argv[i++];	150	else if( stricmp(token, "-gs") == 0 ) {
181	g_TestRun.pspudll = token;	151	token = argv[i++];
		152	g_TestRun.pgsdll = token;
		153	}
		154	else if( stricmp(token, "-cdvd") == 0 ) {
		155	token = argv[i++];
		156	g_TestRun.pcdvddll = token;
		157	}
		158	else if( stricmp(token, "-spu") == 0 ) {
		159	token = argv[i++];
		160	g_TestRun.pspudll = token;
		161	}
		162	else if( stricmp(token, "-loadgs") == 0 ) {
		163	token = argv[i++];
		164	g_pRunGSState = token;
		165	}
		166	else if( stricmp(token, "-image") == 0 ) {
		167	g_TestRun.pimagename = argv[i++];
		168	}
		169	else if( stricmp(token, "-log") == 0 ) {
		170	g_TestRun.plogname = argv[i++];
		171	}
		172	else if( stricmp(token, "-logopt") == 0 ) {
		173	token = argv[i++];
		174	if( token != NULL ) {
		175	if( token[0] == '0' && token[1] == 'x' ) token += 2;
		176	sscanf(token, "%x", &varLog);
182	}	177	}
183	else if( stricmp(token, "-loadgs") == 0 ) {	178	}
184	token = argv[i++];	179	else if( stricmp(token, "-frame") == 0 ) {
185	g_pRunGSState = token;	180	token = argv[i++];
		181	if( token != NULL ) {
		182	g_TestRun.frame = atoi(token);
186	}	183	}
		184	}
		185	else if( stricmp(token, "-jpg") == 0 ) {
		186	g_TestRun.jpgcapture = 1;
		187	}
187	else if( stricmp(token, "-test") == 0 ) {	188	else if( stricmp(token, "-test") == 0 ) {
188	g_TestRun.enabled = 1;	189	g_TestRun.enabled = 1;
189	}	190	}
190	else {	191	#endif
		192	else {
191	file = token;	193	file = token;
192	printf("opening file %s\n", file);	194	printf("opening file %s\n", file);
193	}	195	}

Lines 60-66 Link Here

(-)orig/pcsx2/x86/iVUzerorec.cpp (+4 lines)
60	#include "iVUzerorec.h"	60	#include "iVUzerorec.h"
61		61
62	// temporary externs	62	// temporary externs
		63	#ifdef PCSX2_DEVBUILD
63	extern u32 vudump;	64	extern u32 vudump;
		65	#endif
64	extern void iDumpVU0Registers();	66	extern void iDumpVU0Registers();
65	extern void iDumpVU1Registers();	67	extern void iDumpVU1Registers();
66		68
Lines 2513-2518 Link Here
2513	// VU1.VF[7].F[2] = vuDouble(VU1.VF[7].UL[2]);	2515	// VU1.VF[7].F[2] = vuDouble(VU1.VF[7].UL[2]);
2514	// VU1.VF[7].F[3] = vuDouble(VU1.VF[7].UL[3]);	2516	// VU1.VF[7].F[3] = vuDouble(VU1.VF[7].UL[3]);
2515		2517
		2518	#ifdef PCSX2_DEVBUILD
2516	if( ((vudump&8) && g_curdebugvu) \|\| ((vudump&0x80) && !g_curdebugvu) ) { //&& g_vu1lastrec != g_vu1last ) {	2519	if( ((vudump&8) && g_curdebugvu) \|\| ((vudump&0x80) && !g_curdebugvu) ) { //&& g_vu1lastrec != g_vu1last ) {
2517		2520
2518	if( skipparent != g_vu1lastrec ) {	2521	if( skipparent != g_vu1lastrec ) {
Lines 2534-2539 Link Here
2534		2537
2535	g_vu1lastrec = s_svulast;	2538	g_vu1lastrec = s_svulast;
2536	}	2539	}
		2540	#endif
2537		2541
2538	#if defined(_MSC_VER) && !defined(__x86_64__)	2542	#if defined(_MSC_VER) && !defined(__x86_64__)
2539	__asm {	2543	__asm {

Lines 185-192 Link Here

(-)orig/pcsx2/x86/ix86-32/aR5900-32.S (+4 lines)
185	push %ecx	185	push %ecx
186		186
187	rdtsc	187	rdtsc
		188	#ifdef PCSX2_DEVBUILD
188	mov dword ptr [lbase], %eax	189	mov dword ptr [lbase], %eax
189	mov dword ptr [lbase + 4], %edx	190	mov dword ptr [lbase + 4], %edx
		191	#endif
190		192
191	pop %ecx	193	pop %ecx
192	pop %ebx	194	pop %ebx
Lines 203-210 Link Here
203		205
204	rdtsc	206	rdtsc
205		207
		208	#ifdef PCSX2_DEVBUILD
206	sub %eax, dword ptr [lbase]	209	sub %eax, dword ptr [lbase]
207	sbb %edx, dword ptr [lbase + 4]	210	sbb %edx, dword ptr [lbase + 4]
		211	#endif
208	mov %ecx, s_pCurBlock_ltime	212	mov %ecx, s_pCurBlock_ltime
209	add %eax, dword ptr [%ecx]	213	add %eax, dword ptr [%ecx]
210	adc %edx, dword ptr [%ecx + 4]	214	adc %edx, dword ptr [%ecx + 4]