From 074a87eadcf9f78a75655b18d1b1cd46dfe87fdb Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 3 Jun 2009 01:06:26 +0000
Subject: [PATCH] Improved the cpu speed/ghz detection.  It should be a bit
 more accurate, and is faster (pcsx2 startup times are near instantaneous
 now).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1306 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/x86/ix86/ix86_cpudetect.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pcsx2/x86/ix86/ix86_cpudetect.cpp b/pcsx2/x86/ix86/ix86_cpudetect.cpp
index 6e211619f3..4de1fd1123 100644
--- a/pcsx2/x86/ix86/ix86_cpudetect.cpp
+++ b/pcsx2/x86/ix86/ix86_cpudetect.cpp
@@ -196,20 +196,20 @@ s64 CPUSpeedHz( int time )
 	
 	// Align the cpu execution to a timeGetTime boundary.
 	// Without this the result could be skewed by up to several milliseconds.
-	
-	do { timeStart = timeGetTime( );
+
+	do { timeStart = GetCPUTicks();
 	} while( timeGetTime( ) == timeStart );
 
 	do
 	{
-		timeStop = timeGetTime( );
+		timeStop = GetCPUTicks( );
 		startTick = GetCPUTick( );
-	} while( ( timeStop - timeStart ) < 1 );
+	} while( ( timeStop - timeStart ) == 0 );
 
 	timeStart = timeStop;
 	do
 	{
-		timeStop = timeGetTime();
+		timeStop = GetCPUTicks();
 		endTick = GetCPUTick();
 	}
 	while( ( timeStop - timeStart ) < time );
@@ -364,10 +364,15 @@ void cpudetectInit()
 	cpucaps.hasAMD64BitArchitecture                      = ( cpuinfo.x86EFlags >> 29 ) & 1; //64bit cpu
 	cpucaps.has3DNOWInstructionExtensionsExt             = ( cpuinfo.x86EFlags >> 30 ) & 1; //3dnow+
 	cpucaps.has3DNOWInstructionExtensions                = ( cpuinfo.x86EFlags >> 31 ) & 1; //3dnow   
-	cpucaps.hasStreamingSIMD4ExtensionsA               = ( cpuinfo.x86EFlags2 >> 6 ) & 1; //INSERTQ / EXTRQ / MOVNT
+	cpucaps.hasStreamingSIMD4ExtensionsA                 = ( cpuinfo.x86EFlags2 >> 6 ) & 1; //INSERTQ / EXTRQ / MOVNT
 
+	InitCPUTicks();
+	uint span = GetTickFrequency();
 
-	cpuinfo.cpuspeed = (u32)(CPUSpeedHz( 400 ) / 400000 );
+	if( (span % 1000) < 400 )	// helps minimize rounding errors
+		cpuinfo.cpuspeed = (u32)( CPUSpeedHz( span / 1000 ) / 1000 );
+	else
+		cpuinfo.cpuspeed = (u32)( CPUSpeedHz( span / 500 ) / 2000 );
 
 	// --> SSE3 / SSSE3 / SSE4.1 / SSE 4.2 detection <--