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

Quick cleanup of my prev commit -- changed some u32's to u64's, and deleted some code made obsolete by the new cpu detection. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1307 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-06-03 01:28:19 +00:00
parent 074a87eadc
commit 510a23f190
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/PrecompiledHeader.h
View File

@ -103,13 +103,6 @@ typedef int BOOL;
# define __declspec(x)
# endif
static __forceinline u32 timeGetTime()
{
struct timeb t;
ftime(&t);
return (u32)(t.time*1000+t.millitm);
}
# ifndef strnicmp
# define strnicmp strncasecmp
# endif

19
pcsx2/x86/ix86/ix86_cpudetect.cpp
View File

@ -131,7 +131,7 @@ extern s32 iCpuId( u32 cmd, u32 *regs )
#endif // _MSC_VER
}
u64 GetCPUTick( void )
u64 GetRdtsc( void )
{
#if defined (_MSC_VER) && _MSC_VER >= 1400
@ -152,7 +152,7 @@ u64 GetCPUTick( void )
//////////////////////////////////////////////////////////////////////////////////////////
// Note: This function doesn't support GCC/Linux. Looking online it seems the only
// way to simulate the Micrsoft SEH model is to use unix signals, and the 'sigaction'
// way to simulate the Microsoft SEH model is to use unix signals, and the 'sigaction'
// function specifically. Maybe a project for a linux developer at a later date. :)
#ifdef _MSC_VER
static bool _test_instruction( void* pfnCall )
@ -182,9 +182,9 @@ static char* bool_to_char( bool testcond )
//////////////////////////////////////////////////////////////////////////////////////////
//
s64 CPUSpeedHz( int time )
s64 CPUSpeedHz( u64 time )
{
int timeStart,
u64 timeStart,
timeStop;
s64 startTick,
endTick;
@ -194,23 +194,22 @@ s64 CPUSpeedHz( int time )
return 0; //check if function is supported
}
// Align the cpu execution to a timeGetTime boundary.
// Without this the result could be skewed by up to several milliseconds.
// Align the cpu execution to a cpuTick boundary.
do { timeStart = GetCPUTicks();
} while( timeGetTime( ) == timeStart );
} while( GetCPUTicks() == timeStart );
do
{
timeStop = GetCPUTicks( );
startTick = GetCPUTick( );
startTick = GetRdtsc( );
} while( ( timeStop - timeStart ) == 0 );
timeStart = timeStop;
do
{
timeStop = GetCPUTicks();
endTick = GetCPUTick();
endTick = GetRdtsc();
}
while( ( timeStop - timeStart ) < time );
@ -367,7 +366,7 @@ void cpudetectInit()
cpucaps.hasStreamingSIMD4ExtensionsA = ( cpuinfo.x86EFlags2 >> 6 ) & 1; //INSERTQ / EXTRQ / MOVNT
InitCPUTicks();
uint span = GetTickFrequency();
u64 span = GetTickFrequency();
if( (span % 1000) < 400 ) // helps minimize rounding errors
cpuinfo.cpuspeed = (u32)( CPUSpeedHz( span / 1000 ) / 1000 );

1
pcsx2/x86/ix86/ix86_legacy_internal.h
View File

@ -49,5 +49,4 @@ extern void SibSB( uint ss, uint index, uint base );
extern void SET8R( int cc, int to );
extern u8* J8Rel( int cc, int to );
extern u32* J32Rel( int cc, u32 to );
extern u64 GetCPUTick( void );