From 2624b1eae6df88c99d08dc5bb13dab35943d3fa2 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 22 Aug 2020 20:20:55 -0400
Subject: core_timing: Resolve sign conversion warning

This constant is only ever assigned to downcount, which is a s64, not a
u64.
---
 src/core/core_timing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 71af26ec5..d987a2cfc 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -14,7 +14,7 @@
 
 namespace Core::Timing {
 
-constexpr u64 MAX_SLICE_LENGTH = 4000;
+constexpr s64 MAX_SLICE_LENGTH = 4000;
 
 std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callback) {
     return std::make_shared<EventType>(std::move(callback), std::move(name));
@@ -136,7 +136,7 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
 
 void CoreTiming::AddTicks(u64 ticks) {
     this->ticks += ticks;
-    downcount -= ticks;
+    downcount -= static_cast<s64>(ticks);
 }
 
 void CoreTiming::Idle() {
-- 
cgit v1.2.3


From 25cd5d9ddac522a53619b7f6cb3a329a4c2003dd Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 22 Aug 2020 20:24:25 -0400
Subject: core_timing: Move clock initializer into constructor initializer list

Same behavior, minus unnecessary zeroing out of the pointer.
---
 src/core/core_timing.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index d987a2cfc..86a01342d 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -37,10 +37,8 @@ struct CoreTiming::Event {
     }
 };
 
-CoreTiming::CoreTiming() {
-    clock =
-        Common::CreateBestMatchingClock(Core::Hardware::BASE_CLOCK_RATE, Core::Hardware::CNTFREQ);
-}
+CoreTiming::CoreTiming()
+    : clock{Common::CreateBestMatchingClock(Hardware::BASE_CLOCK_RATE, Hardware::CNTFREQ)} {}
 
 CoreTiming::~CoreTiming() = default;
 
-- 
cgit v1.2.3


From 79504f1a39a52284f4533fdf93a4773f629f1660 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 22 Aug 2020 20:27:31 -0400
Subject: core_timing: Remove unused header

---
 src/core/core_timing.cpp      | 2 +-
 src/core/core_timing_util.cpp | 1 +
 src/core/core_timing_util.h   | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 86a01342d..e6c8461a5 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -7,10 +7,10 @@
 #include <string>
 #include <tuple>
 
-#include "common/assert.h"
 #include "common/microprofile.h"
 #include "core/core_timing.h"
 #include "core/core_timing_util.h"
+#include "core/hardware_properties.h"
 
 namespace Core::Timing {
 
diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp
index aefc63663..8ce8e602e 100644
--- a/src/core/core_timing_util.cpp
+++ b/src/core/core_timing_util.cpp
@@ -8,6 +8,7 @@
 #include <limits>
 #include "common/logging/log.h"
 #include "common/uint128.h"
+#include "core/hardware_properties.h"
 
 namespace Core::Timing {
 
diff --git a/src/core/core_timing_util.h b/src/core/core_timing_util.h
index 2ed979e14..e4a046bf9 100644
--- a/src/core/core_timing_util.h
+++ b/src/core/core_timing_util.h
@@ -6,7 +6,6 @@
 
 #include <chrono>
 #include "common/common_types.h"
-#include "core/hardware_properties.h"
 
 namespace Core::Timing {
 
-- 
cgit v1.2.3