INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-14 02:48:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

core/core_timing_utils: Simplify overload set

Browse Source 
Removes unused overloads, simplifying the overall interface,
deduplicating some code.
This commit is contained in:
Lioncash
2019-06-04 19:41:48 -04:00
parent 55f8111543
commit 79189c7e3e
2 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/core_timing_util.cpp
View File

@ -26,15 +26,7 @@ s64 usToCycles(s64 us) {
}
s64 usToCycles(u64 us) {
if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max();
}
if (us > MAX_VALUE_TO_MULTIPLY) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE * static_cast<s64>(us / 1000000);
}
return (BASE_CLOCK_RATE * static_cast<s64>(us)) / 1000000;
return usToCycles(static_cast<s64>(us));
}
s64 nsToCycles(s64 ns) {
@ -50,15 +42,7 @@ s64 nsToCycles(s64 ns) {
}
s64 nsToCycles(u64 ns) {
if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max();
}
if (ns > MAX_VALUE_TO_MULTIPLY) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE * (static_cast<s64>(ns) / 1000000000);
}
return (BASE_CLOCK_RATE * static_cast<s64>(ns)) / 1000000000;
return nsToCycles(static_cast<s64>(ns));
}
u64 CpuCyclesToClockCycles(u64 ticks) {