From 25e944f519398fb1f14a7c3a80af7746961bd79c Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Tue, 1 Dec 2020 13:08:47 -0800
Subject: [PATCH] kern: remove more of clc

---
 .../arch/arm64/kern_k_hardware_timer.hpp         |  2 +-
 .../mesosphere/kern_k_core_local_region.hpp      | 12 ------------
 .../source/arch/arm64/kern_k_hardware_timer.cpp  |  4 ++--
 libraries/libmesosphere/source/kern_kernel.cpp   | 16 ++--------------
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp
index a7ebf8463..2f805ca54 100644
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp
@@ -26,7 +26,7 @@ namespace ams::kern::arch::arm64 {
             constexpr KHardwareTimer() : KInterruptTask(), KHardwareTimerBase(), maximum_time(std::numeric_limits<s64>::max()) { /* ... */ }
         public:
             /* Public API. */
-            NOINLINE void Initialize(s32 core_id);
+            NOINLINE void Initialize();
             NOINLINE void Finalize();
 
             static s64 GetTick() {
diff --git a/libraries/libmesosphere/include/mesosphere/kern_k_core_local_region.hpp b/libraries/libmesosphere/include/mesosphere/kern_k_core_local_region.hpp
index a70d886ab..9a6861356 100644
--- a/libraries/libmesosphere/include/mesosphere/kern_k_core_local_region.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_core_local_region.hpp
@@ -27,18 +27,6 @@ namespace ams::kern {
 
     struct KCoreLocalContext {
         KCurrentContext current;
-        /* Everything after this point is for debugging. */
-        /* Retail kernel doesn't even consistently update these fields. */
-        u64 num_sw_interrupts;
-        u64 num_hw_interrupts;
-        std::atomic<u64> num_svc;
-        u64 num_process_switches;
-        u64 num_thread_switches;
-        u64 num_fpu_switches;
-        u64 num_scheduler_updates;
-        u64 num_invoked_scheduler_updates;
-        std::atomic<u64> num_specific_svc[0x80];
-        u32 perf_counters[6];
     };
     static_assert(sizeof(KCoreLocalContext) < PageSize);
 
diff --git a/libraries/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp b/libraries/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp
index 280a66f88..fa42d6768 100644
--- a/libraries/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp
+++ b/libraries/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp
@@ -17,7 +17,7 @@
 
 namespace ams::kern::arch::arm64 {
 
-    void KHardwareTimer::Initialize(s32 core_id) {
+    void KHardwareTimer::Initialize() {
         /* Setup the global timer for the core. */
         InitializeGlobalTimer();
 
@@ -25,7 +25,7 @@ namespace ams::kern::arch::arm64 {
         this->maximum_time = static_cast<s64>(std::min<u64>(std::numeric_limits<s64>::max(), cpu::CounterTimerPhysicalTimerCompareValueRegisterAccessor().GetCompareValue()));
 
         /* Bind the interrupt task for this core. */
-        Kernel::GetInterruptManager().BindHandler(std::addressof(Kernel::GetHardwareTimer(core_id)), KInterruptName_NonSecurePhysicalTimer, core_id, KInterruptController::PriorityLevel_Timer, true, true);
+        Kernel::GetInterruptManager().BindHandler(this, KInterruptName_NonSecurePhysicalTimer, GetCurrentCoreId(), KInterruptController::PriorityLevel_Timer, true, true);
     }
 
     void KHardwareTimer::Finalize() {
diff --git a/libraries/libmesosphere/source/kern_kernel.cpp b/libraries/libmesosphere/source/kern_kernel.cpp
index e56321c71..35ba1c3e9 100644
--- a/libraries/libmesosphere/source/kern_kernel.cpp
+++ b/libraries/libmesosphere/source/kern_kernel.cpp
@@ -49,22 +49,10 @@ namespace ams::kern {
         /* Initialize current context. */
         clc->current.current_thread = nullptr;
         clc->current.current_process = nullptr;
+        clc->current.core_id = core_id;
         clc->current.scheduler = std::addressof(Kernel::GetScheduler());
         clc->current.interrupt_task_manager = std::addressof(Kernel::GetInterruptTaskManager());
-        clc->current.core_id = core_id;
         clc->current.exception_stack_top = GetVoidPointer(KMemoryLayout::GetExceptionStackTopAddress(core_id) - sizeof(KThread::StackParameters));
-
-        /* Clear debugging counters. */
-        clc->num_sw_interrupts = 0;
-        clc->num_hw_interrupts = 0;
-        clc->num_svc = 0;
-        clc->num_process_switches = 0;
-        clc->num_thread_switches = 0;
-        clc->num_fpu_switches = 0;
-
-        for (size_t i = 0; i < util::size(clc->perf_counters); i++) {
-            clc->perf_counters[i] = 0;
-        }
     }
 
     void Kernel::InitializeMainAndIdleThreads(s32 core_id) {
@@ -84,7 +72,7 @@ namespace ams::kern {
 
         /* Initialize the interrupt manager, hardware timer, and scheduler */
         GetInterruptManager().Initialize(core_id);
-        GetHardwareTimer().Initialize(core_id);
+        GetHardwareTimer().Initialize();
         GetScheduler().Initialize(idle_thread);
     }