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

X86Emitter: Use __rdtsc define on non-msvc compilers

This commit is contained in:
Ty Lamontagne 2021-07-24 13:12:22 -04:00 committed by Kojin
parent 87ee413141
commit f1b4bee88f
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/x86emitter/cpudetect.cpp
View File

@ -1,5 +1,5 @@
/* Cpudetection lib /* Cpudetection lib
* Copyright (C) 2002-2010 PCSX2 Dev Team * Copyright (C) 2002-2021 PCSX2 Dev Team
* *
* PCSX2 is free software: you can redistribute it and/or modify it under the terms * 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- * of the GNU Lesser General Public License as published by the Free Software Found-
@ -112,35 +112,14 @@ s64 x86capabilities::_CPUSpeedHz(u64 time) const
// Align the cpu execution to a cpuTick boundary. // Align the cpu execution to a cpuTick boundary.
// GCC 4.8 has __rdtsc but apparently it causes a crash. Only known working on MSVC
do { do {
timeStart = GetCPUTicks(); timeStart = GetCPUTicks();
#ifdef _MSC_VER
startCycle = __rdtsc(); startCycle = __rdtsc();
#elif defined(_M_X86_64)
unsigned long long low, high;
__asm__ __volatile__("rdtsc"
: "=a"(low), "=d"(high));
startCycle = low | (high << 32);
#else
__asm__ __volatile__("rdtsc"
: "=A"(startCycle));
#endif
} while (GetCPUTicks() == timeStart); } while (GetCPUTicks() == timeStart);
do { do {
timeStop = GetCPUTicks(); timeStop = GetCPUTicks();
#ifdef _MSC_VER
endCycle = __rdtsc(); endCycle = __rdtsc();
#elif defined(_M_X86_64)
unsigned long long low, high;
__asm__ __volatile__("rdtsc"
: "=a"(low), "=d"(high));
endCycle = low | (high << 32);
#else
__asm__ __volatile__("rdtsc"
: "=A"(endCycle));
#endif
} while ((timeStop - timeStart) < time); } while ((timeStop - timeStart) < time);
s64 cycleCount = endCycle - startCycle; s64 cycleCount = endCycle - startCycle;