diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index e194c5dd65..b003dccf80 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -151,7 +151,6 @@ set(pcsx2Sources Sio.cpp SourceLog.cpp SPR.cpp - Stats.cpp System.cpp Vif0_Dma.cpp Vif1_Dma.cpp @@ -215,7 +214,6 @@ set(pcsx2Headers Sio.h sio_internal.h SPR.h - Stats.h SysForwardDefs.h System.h Vif_Dma.h diff --git a/pcsx2/Stats.cpp b/pcsx2/Stats.cpp deleted file mode 100644 index a840469ae0..0000000000 --- a/pcsx2/Stats.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - - -#include "PrecompiledHeader.h" - -#include - -#include "IopCommon.h" -#include "Stats.h" - -void statsOpen() { - stats.vsyncCount = 0; - stats.vsyncTime = time(NULL); - stats.eeCycles = 0; - stats.eeSCycle = 0; - stats.iopCycles = 0; - stats.iopSCycle = 0; -} - -void statsClose() { -/* - time_t t; - FILE *f; - - t = time(NULL) - stats.vsyncTime; -#ifdef _WIN32 - f = fopen(LOGS_DIR "\\stats.txt", "w"); -#else - f = fopen(LOGS_DIR "/stats.txt", "w"); -#endif - if (!f) { Console.WriteLn("Can't open stats.txt"); return; } - fprintf(f, "-- PCSX2 v%s statics--\n\n", PCSX2_VERSION); - fprintf(f, "Ran for %d seconds\n", t); - fprintf(f, "Total VSyncs: %d (%s)\n", stats.vsyncCount, Config.PsxType ? "PAL" : "NTSC"); - fprintf(f, "VSyncs per Seconds: %g\n", (double)stats.vsyncCount / t); - fprintf(f, "Total EE Instructions Executed: %lld\n", stats.eeCycles); - fprintf(f, "Total IOP Instructions Executed: %lld\n", stats.iopCycles); - if (!CHECK_EEREC) fprintf(f, "Interpreter Mode\n"); - else fprintf(f, "Recompiler Mode: VUrec1 %s, VUrec0 %s\n", - CHECK_VU1REC ? "Enabled" : "Disabled", CHECK_VU0REC ? "Enabled" : "Disabled"); - fclose(f); -*/ -} - -void statsVSync() { - //static u64 accum = 0, accumvu1 = 0; - //static u32 frame = 0; - - stats.eeCycles+= cpuRegs.cycle - stats.eeSCycle; - stats.eeSCycle = cpuRegs.cycle; - stats.iopCycles+= psxRegs.cycle - stats.iopSCycle; - stats.iopSCycle = psxRegs.cycle; - stats.vsyncCount++; - stats.vif1count = 0; - stats.vu1count = 0; -} diff --git a/pcsx2/Stats.h b/pcsx2/Stats.h deleted file mode 100644 index fa23e50347..0000000000 --- a/pcsx2/Stats.h +++ /dev/null @@ -1,41 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef __STATS_H__ -#define __STATS_H__ - -#include - -struct Stats { - time_t vsyncTime; - u32 vsyncCount; - u32 eeCycles; - u32 eeSCycle; - u32 iopCycles; - u32 iopSCycle; - - u32 ticko; - u32 framecount; - u32 vu1count; - u32 vif1count; -}; - -Stats stats; - -void statsOpen(); -void statsClose(); -void statsVSync(); - -#endif /* __STATS_H__ */ diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index fbba854177..5b4090e3ff 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -468,7 +468,6 @@ - @@ -745,7 +744,6 @@ - diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters index 1c8b19b232..bbe93e39e8 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters @@ -245,9 +245,6 @@ System - - System - System @@ -906,9 +903,6 @@ System\Include - - System\Include - System\Include diff --git a/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj b/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj index 4c2fba59fa..46ae535d4f 100644 --- a/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj @@ -454,7 +454,6 @@ - @@ -732,7 +731,6 @@ - diff --git a/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj.filters index eafc541e54..8997c22363 100644 --- a/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj.filters @@ -242,9 +242,6 @@ System - - System - System @@ -903,9 +900,6 @@ System\Include - - System\Include - System\Include diff --git a/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj b/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj index 4c7d0c698b..05d470e0d0 100644 --- a/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj @@ -454,7 +454,6 @@ - @@ -732,7 +731,6 @@ - diff --git a/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj.filters index 1039046828..e5cbeb543c 100644 --- a/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj.filters @@ -242,9 +242,6 @@ System - - System - System @@ -903,9 +900,6 @@ System\Include - - System\Include - System\Include