From 11d8a43bd8af8576074526eeb7afd844abaeef60 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <gponiris2004@gmail.com>
Date: Tue, 20 Sep 2022 01:30:45 +0300
Subject: [PATCH] [Kernel] More address arbiter stuff

---
 include/kernel/kernel_types.hpp     | 29 ++++++++++++-----------------
 src/core/kernel/address_arbiter.cpp | 27 ++++++++++++++++++++++++---
 src/core/kernel/events.cpp          |  6 +++---
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp
index f4ae210f..26d6a7a5 100644
--- a/include/kernel/kernel_types.hpp
+++ b/include/kernel/kernel_types.hpp
@@ -28,24 +28,19 @@ enum class ResourceLimitCategory : int {
     Misc = 3
 };
 
-enum ResourceTypes {
-    PRIORITY = 0,
-    COMMIT = 1,
-    THREAD = 2,
-    EVENT = 3,
-    MUTEX = 4,
-    SEMAPHORE = 5,
-    TIMER = 6,
-    SHARED_MEMORY = 7,
-    ADDRESS_ARBITER = 8,
-    CPU_TIME = 9
+// Reset types (for use with events and timers)
+enum class ResetType {
+    OneShot = 0, // When the primitive is signaled, it will wake up exactly one thread and will clear itself automatically.
+    Sticky = 1, // When the primitive is signaled, it will wake up all threads and it won't clear itself automatically.
+    Pulse = 2, // Only meaningful for timers: same as ONESHOT but it will periodically signal the timer instead of just once.
 };
 
-// Reset types (for use with events and timers)
-enum ResetType {
-    RESET_ONESHOT = 0, // When the primitive is signaled, it will wake up exactly one thread and will clear itself automatically.
-    RESET_STICKY = 1, // When the primitive is signaled, it will wake up all threads and it won't clear itself automatically.
-    RESET_PULSE = 2, // Only meaningful for timers: same as ONESHOT but it will periodically signal the timer instead of just once.
+enum class ArbitrationType {
+    Signal = 0,
+    WaitIfLess = 1,
+    DecrementAndWaitIfLess = 2,
+    WaitIfLessTimeout = 3,
+    DecrementAndWaitIfLessTimeout = 4
 };
 
 struct AddressArbiter {
@@ -64,7 +59,7 @@ struct Process {
 };
 
 struct Event {
-    ResetType resetType = RESET_ONESHOT;
+    ResetType resetType = ResetType::OneShot;
 
     Event(ResetType resetType) : resetType(resetType) {}
 };
diff --git a/src/core/kernel/address_arbiter.cpp b/src/core/kernel/address_arbiter.cpp
index a87d545e..a89d31c3 100644
--- a/src/core/kernel/address_arbiter.cpp
+++ b/src/core/kernel/address_arbiter.cpp
@@ -1,6 +1,17 @@
 #include "kernel.hpp"
 #include "resource_limits.hpp"
 
+static const char* arbitrationTypeToString(u32 type) {
+	switch (type) {
+		case 0: return "Signal";
+		case 1: return "Wait if less";
+		case 2: return "Decrement and wait if less";
+		case 3: return "Wait if less with timeout";
+		case 4: return "Decrement and wait if less with timeout";
+		default: return "Unknown arbitration type";
+	}
+}
+
 Handle Kernel::makeArbiter() {
 	if (arbiterCount >= appResourceLimits.maxAddressArbiters) {
 		Helpers::panic("Overflowed the number of address arbiters");
@@ -26,8 +37,8 @@ void Kernel::arbitrateAddress() {
 	const u32 value = regs[3];
 	const s64 ns = s64(u64(regs[4]) | (u64(regs[5]) << 32));
 
-	printf("ArbitrateAddress(Handle = %X, address = %08X, type = %d, value = %d, ns = %lld)\n", handle, address, type,
-		value, ns);
+	printf("ArbitrateAddress(Handle = %X, address = %08X, type = %s, value = %d, ns = %lld)\n", handle, address,
+		arbitrationTypeToString(type), value, ns);
 
 	const auto arbiter = getObject(handle, KernelObjectType::AddressArbiter);
 	if (arbiter == nullptr) [[unlikely]] {
@@ -35,6 +46,16 @@ void Kernel::arbitrateAddress() {
 		return;
 	}
 
-	Helpers::panic("My balls\n");
+	if (value > 4) {
+		Helpers::panic("ArbitrateAddress: invalid arbitration type");
+	}
+
+	switch (static_cast<ArbitrationType>(type)) {
+		case ArbitrationType::WaitIfLess:
+			Helpers::panic("Uwu");
+		default:
+			Helpers::panic("ArbitrateAddress: Unimplemented type %s", arbitrationTypeToString(type));
+	}
+
 	regs[0] = SVCResult::Success;
 }
\ No newline at end of file
diff --git a/src/core/kernel/events.cpp b/src/core/kernel/events.cpp
index 024240d9..188edd81 100644
--- a/src/core/kernel/events.cpp
+++ b/src/core/kernel/events.cpp
@@ -2,9 +2,9 @@
 
 const char* Kernel::resetTypeToString(u32 type) {
 	switch (type) {
-		case 0: return "RESET_ONESHOT";
-		case 1: return "RESET_STICKY";
-		case 2: return "RESET_PULSE";
+		case 0: return "One shot";
+		case 1: return "Sticky";
+		case 2: return "Pulse";
 		default: return "Invalid";
 	}
 }