From cb3f7fa1345fa5526e6d3c77b987caa5556dbe8b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 31 Aug 2023 22:47:43 +0300
Subject: [PATCH] Remove hacky timer hacks

---
 include/kernel/kernel.hpp  | 9 ---------
 src/core/kernel/kernel.cpp | 2 --
 src/core/kernel/timers.cpp | 2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp
index e0021541..3d4b6917 100644
--- a/include/kernel/kernel.hpp
+++ b/include/kernel/kernel.hpp
@@ -36,7 +36,6 @@ class Kernel {
 	std::vector<KernelObject> objects;
 	std::vector<Handle> portHandles;
 	std::vector<Handle> mutexHandles;
-	std::vector<Handle> timerHandles;
 
 	// Thread indices, sorted by priority
 	std::vector<int> threadIndices;
@@ -187,14 +186,6 @@ public:
 	void requireReschedule() { needReschedule = true; }
 
 	void evalReschedule() {
-		for (auto handle : timerHandles) {
-			const auto object = getObject(handle, KernelObjectType::Timer);
-			if (object != nullptr) {
-				Timer* timer = object->getData<Timer>();
-				updateTimer(handle, timer);
-			}
-		}
-
 		if (needReschedule) {
 			needReschedule = false;
 			rescheduleThreads();
diff --git a/src/core/kernel/kernel.cpp b/src/core/kernel/kernel.cpp
index 72af8dd2..5eb3cddb 100644
--- a/src/core/kernel/kernel.cpp
+++ b/src/core/kernel/kernel.cpp
@@ -7,7 +7,6 @@ Kernel::Kernel(CPU& cpu, Memory& mem, GPU& gpu, const EmulatorConfig& config)
 	: cpu(cpu), regs(cpu.regs()), mem(mem), handleCounter(0), serviceManager(regs, mem, gpu, currentProcess, *this, config) {
 	objects.reserve(512); // Make room for a few objects to avoid further memory allocs later
 	mutexHandles.reserve(8);
-	timerHandles.reserve(8);
 	portHandles.reserve(32);
 	threadIndices.reserve(appResourceLimits.maxThreads);
 
@@ -149,7 +148,6 @@ void Kernel::reset() {
 	}
 	objects.clear();
 	mutexHandles.clear();
-	timerHandles.clear();
 	portHandles.clear();
 	threadIndices.clear();
 	serviceManager.reset();
diff --git a/src/core/kernel/timers.cpp b/src/core/kernel/timers.cpp
index 5d021679..1f5fefaf 100644
--- a/src/core/kernel/timers.cpp
+++ b/src/core/kernel/timers.cpp
@@ -9,7 +9,7 @@ Handle Kernel::makeTimer(ResetType type) {
 		Helpers::panic("Created pulse timer");
 	}
 
-	timerHandles.push_back(ret);
+	// timerHandles.push_back(ret);
 	return ret;
 }