midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4897 from zhaowenlan1779/warning-core-timing

Browse Source 
core_timing: Silence sign comparison warnings
This commit is contained in:
Weiyi Wang 2019-09-03 16:06:27 -04:00 committed by GitHub
commit 42d3d563b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core_timing.h
View File

@ -56,11 +56,11 @@ inline s64 usToCycles(int us) {
} }
inline s64 usToCycles(s64 us) { inline s64 usToCycles(s64 us) {
if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) { if (us / 1000000 > static_cast<s64>(MAX_VALUE_TO_MULTIPLY)) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value"); LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max(); return std::numeric_limits<s64>::max();
} }
if (us > MAX_VALUE_TO_MULTIPLY) { if (us > static_cast<s64>(MAX_VALUE_TO_MULTIPLY)) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding"); LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE_ARM11 * (us / 1000000); return BASE_CLOCK_RATE_ARM11 * (us / 1000000);
} }
@ -88,11 +88,11 @@ inline s64 nsToCycles(int ns) {
} }
inline s64 nsToCycles(s64 ns) { inline s64 nsToCycles(s64 ns) {
if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) { if (ns / 1000000000 > static_cast<s64>(MAX_VALUE_TO_MULTIPLY)) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value"); LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max(); return std::numeric_limits<s64>::max();
} }
if (ns > MAX_VALUE_TO_MULTIPLY) { if (ns > static_cast<s64>(MAX_VALUE_TO_MULTIPLY)) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding"); LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE_ARM11 * (ns / 1000000000); return BASE_CLOCK_RATE_ARM11 * (ns / 1000000000);
} }