summaryrefslogtreecommitdiff
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorGravatar James Rowe2018-07-02 10:13:26 -0600
committerGravatar bunnei2018-07-02 21:45:47 -0400
commit638956aa81de255bf4bbd4e69a717eabf4ceadb9 (patch)
tree5783dda790575e047fa757d8c56e11f3fffe7646 /src/core/core_timing.cpp
parentMerge pull request #608 from Subv/depth (diff)
downloadyuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.gz
yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.xz
yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.zip
Rename logging macro back to LOG_*
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index dc1d8668f..50d1e3fc9 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -74,11 +74,11 @@ static void EmptyTimedCallback(u64 userdata, s64 cyclesLate) {}
74 74
75s64 usToCycles(s64 us) { 75s64 usToCycles(s64 us) {
76 if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) { 76 if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) {
77 NGLOG_ERROR(Core_Timing, "Integer overflow, use max value"); 77 LOG_ERROR(Core_Timing, "Integer overflow, use max value");
78 return std::numeric_limits<s64>::max(); 78 return std::numeric_limits<s64>::max();
79 } 79 }
80 if (us > MAX_VALUE_TO_MULTIPLY) { 80 if (us > MAX_VALUE_TO_MULTIPLY) {
81 NGLOG_DEBUG(Core_Timing, "Time very big, do rounding"); 81 LOG_DEBUG(Core_Timing, "Time very big, do rounding");
82 return BASE_CLOCK_RATE * (us / 1000000); 82 return BASE_CLOCK_RATE * (us / 1000000);
83 } 83 }
84 return (BASE_CLOCK_RATE * us) / 1000000; 84 return (BASE_CLOCK_RATE * us) / 1000000;
@@ -86,11 +86,11 @@ s64 usToCycles(s64 us) {
86 86
87s64 usToCycles(u64 us) { 87s64 usToCycles(u64 us) {
88 if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) { 88 if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) {
89 NGLOG_ERROR(Core_Timing, "Integer overflow, use max value"); 89 LOG_ERROR(Core_Timing, "Integer overflow, use max value");
90 return std::numeric_limits<s64>::max(); 90 return std::numeric_limits<s64>::max();
91 } 91 }
92 if (us > MAX_VALUE_TO_MULTIPLY) { 92 if (us > MAX_VALUE_TO_MULTIPLY) {
93 NGLOG_DEBUG(Core_Timing, "Time very big, do rounding"); 93 LOG_DEBUG(Core_Timing, "Time very big, do rounding");
94 return BASE_CLOCK_RATE * static_cast<s64>(us / 1000000); 94 return BASE_CLOCK_RATE * static_cast<s64>(us / 1000000);
95 } 95 }
96 return (BASE_CLOCK_RATE * static_cast<s64>(us)) / 1000000; 96 return (BASE_CLOCK_RATE * static_cast<s64>(us)) / 1000000;
@@ -98,11 +98,11 @@ s64 usToCycles(u64 us) {
98 98
99s64 nsToCycles(s64 ns) { 99s64 nsToCycles(s64 ns) {
100 if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) { 100 if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) {
101 NGLOG_ERROR(Core_Timing, "Integer overflow, use max value"); 101 LOG_ERROR(Core_Timing, "Integer overflow, use max value");
102 return std::numeric_limits<s64>::max(); 102 return std::numeric_limits<s64>::max();
103 } 103 }
104 if (ns > MAX_VALUE_TO_MULTIPLY) { 104 if (ns > MAX_VALUE_TO_MULTIPLY) {
105 NGLOG_DEBUG(Core_Timing, "Time very big, do rounding"); 105 LOG_DEBUG(Core_Timing, "Time very big, do rounding");
106 return BASE_CLOCK_RATE * (ns / 1000000000); 106 return BASE_CLOCK_RATE * (ns / 1000000000);
107 } 107 }
108 return (BASE_CLOCK_RATE * ns) / 1000000000; 108 return (BASE_CLOCK_RATE * ns) / 1000000000;
@@ -110,11 +110,11 @@ s64 nsToCycles(s64 ns) {
110 110
111s64 nsToCycles(u64 ns) { 111s64 nsToCycles(u64 ns) {
112 if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) { 112 if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) {
113 NGLOG_ERROR(Core_Timing, "Integer overflow, use max value"); 113 LOG_ERROR(Core_Timing, "Integer overflow, use max value");
114 return std::numeric_limits<s64>::max(); 114 return std::numeric_limits<s64>::max();
115 } 115 }
116 if (ns > MAX_VALUE_TO_MULTIPLY) { 116 if (ns > MAX_VALUE_TO_MULTIPLY) {
117 NGLOG_DEBUG(Core_Timing, "Time very big, do rounding"); 117 LOG_DEBUG(Core_Timing, "Time very big, do rounding");
118 return BASE_CLOCK_RATE * (static_cast<s64>(ns) / 1000000000); 118 return BASE_CLOCK_RATE * (static_cast<s64>(ns) / 1000000000);
119 } 119 }
120 return (BASE_CLOCK_RATE * static_cast<s64>(ns)) / 1000000000; 120 return (BASE_CLOCK_RATE * static_cast<s64>(ns)) / 1000000000;
HIC SVNT DRACONES