From 37405ecefbc0269dd696c0bfd5dd846d04438dfb Mon Sep 17 00:00:00 2001
From: kylon <3252255+kylon@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:35:22 +0100
Subject: [PATCH 1/5] api: get_core_power: clean up

---
 lib/api.c | 179 +++++++-----------------------------------------------
 1 file changed, 22 insertions(+), 157 deletions(-)

diff --git a/lib/api.c b/lib/api.c
index 779e73bc..d4aa5982 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -2074,173 +2074,38 @@ EXP float CALL get_slow_time(ryzen_access ry) {
 }
 
 EXP float CALL get_core_power(ryzen_access ry, uint32_t core) {
-	switch (core)
-	{
-	case 0:
-		switch (ry->table_ver)
-		{
+	u32 baseOffset;
+	
+	switch (ry->table_ver) {
 		case 0x00370000:
 		case 0x00370001:
 		case 0x00370002:
 		case 0x00370003:
 		case 0x00370004:
-			_read_float_value(0x300);
+			baseOffset = 0x300;
+			break;
 		case 0x00370005:
-			_read_float_value(0x31C);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x238); //568
-		case 0x00400001:
-			_read_float_value(0x304); //772
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x320); //800
-	default:
-		break;
-	}
-	case 1:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x304);
-		case 0x00370005:
-			_read_float_value(0x320);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x23C); //572
-		case 0x00400001:
-			_read_float_value(0x308); //776
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x324); //804
-	default:
-		break;
-	}
-	case 2:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x308);
-		case 0x00370005:
-			_read_float_value(0x324);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x240); //576
-		case 0x00400001:
-			_read_float_value(0x30c); //780
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x328); //808
-	default:
-		break;
-	}
-	case 3:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x30c);
-		case 0x00370005:
-			_read_float_value(0x328);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x244); //580
-		case 0x00400001:
-			_read_float_value(0x310); //784
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x32c); //812
-	default:
-		break;
-	}
-	case 4:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x310);
-		case 0x00370005:
-			_read_float_value(0x32c);
-		case 0x00400001:
-			_read_float_value(0x314); //788
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x330); //816
-	default:
-		break;
-	}
-
-	case 5:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x314);
-		case 0x00370005:
-			_read_float_value(0x330);
-		case 0x00400001:
-			_read_float_value(0x318); //792
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x334); //820
-	default:
-		break;
-	}
-	case 6:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x318);
-		case 0x00370005:
-			_read_float_value(0x334);
-		case 0x00400001:
-			_read_float_value(0x31c); //796
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x338); //824
-	default:
-		break;
-	}
-	case 7:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x31c);
-		case 0x00370005:
-			_read_float_value(0x338);
+			baseOffset = 0x31C;
+			break;
+		case 0x003F0000: { // Van Gogh
+			if (core >= 4)
+				return NAN;
+	
+			baseOffset = 0x238;
+		}
+			break;
 		case 0x00400001:
-			_read_float_value(0x320); //800
+			baseOffset = 0x304;
+			break;
 		case 0x00400004:
 		case 0x00400005:
-			_read_float_value(0x33c); //828
-	default:
-		break;
-	}
-	default:
-		break;
+			baseOffset = 0x320;
+			break;
+		default:
+			return NAN;
 	}
-	return NAN;
+	
+	_read_float_value(baseOffset + (core * 4));
 }
 
 EXP float CALL get_core_volt(ryzen_access ry, uint32_t core) {

From e508e31d50b7c96b0e28e8b6c453a265f4117272 Mon Sep 17 00:00:00 2001
From: kylon <3252255+kylon@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:39:16 +0100
Subject: [PATCH 2/5] api: get_core_volt: clean up

---
 lib/api.c | 158 +++++++-----------------------------------------------
 1 file changed, 19 insertions(+), 139 deletions(-)

diff --git a/lib/api.c b/lib/api.c
index d4aa5982..6b995da6 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -2109,155 +2109,35 @@ EXP float CALL get_core_power(ryzen_access ry, uint32_t core) {
 }
 
 EXP float CALL get_core_volt(ryzen_access ry, uint32_t core) {
-	switch (core)
-	{
-	case 0:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x320);
-		case 0x00370005:
-			_read_float_value(0x33C);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x248); //584
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x340); //832
-	default:
-		break;
-	}
-	case 1:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x324);
-		case 0x00370005:
-			_read_float_value(0x340);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x24C); //588
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x344); //836
-	default:
-		break;
-	}
-	case 2:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x328);
-		case 0x00370005:
-			_read_float_value(0x344);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x250); //592
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x348); //840
-	default:
-		break;
-	}
-	case 3:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x32C);
-		case 0x00370005:
-			_read_float_value(0x348);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x254); //596
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x34c); //844
-	default:
-		break;
-	}
-	case 4:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x330);
-		case 0x00370005:
-			_read_float_value(0x34C);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x350); //848
+	u32 baseOffset;
 
-	default:
-		break;
-	}
-	case 5:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x334);
-		case 0x00370005:
-			_read_float_value(0x350);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x354); //852
-	default:
-		break;
-	}
-	case 6:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x338);
-		case 0x00370005:
-			_read_float_value(0x354);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x358); //856
-	default:
-		break;
-	}
-	case 7:
-		switch (ry->table_ver)
-		{
+	switch (ry->table_ver) {
 		case 0x00370000:
 		case 0x00370001:
 		case 0x00370002:
 		case 0x00370003:
 		case 0x00370004:
-			_read_float_value(0x33C);
+			baseOffset = 0x320;
+			break;
 		case 0x00370005:
-			_read_float_value(0x358);
+			baseOffset = 0x33C;
+			break;
+		case 0x003F0000: { // Van Gogh
+			if (core >= 4)
+				return NAN;
+
+			baseOffset = 0x248;
+		}
+			break;
 		case 0x00400004:
 		case 0x00400005:
-			_read_float_value(0x35c); //860
-	default:
-		break;
-	}
+			baseOffset = 0x340;
+			break;
+		default:
+			return NAN;
 	}
-	return NAN;
+
+	_read_float_value(baseOffset + (core * 4));
 }
 
 EXP float CALL get_core_temp(ryzen_access ry, uint32_t core) {

From 8e6a826cbee862e5bb715369f2da139b7c493620 Mon Sep 17 00:00:00 2001
From: kylon <3252255+kylon@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:40:37 +0100
Subject: [PATCH 3/5] api: get_core_temp: clean up

---
 lib/api.c | 161 +++++++-----------------------------------------------
 1 file changed, 20 insertions(+), 141 deletions(-)

diff --git a/lib/api.c b/lib/api.c
index 6b995da6..ef13532e 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -2141,156 +2141,35 @@ EXP float CALL get_core_volt(ryzen_access ry, uint32_t core) {
 }
 
 EXP float CALL get_core_temp(ryzen_access ry, uint32_t core) {
-	switch (core)
-	{
-	case 0:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x340);
-		case 0x00370005:
-			_read_float_value(0x35C);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x258); //600
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x360); //864
-	default:
-		break;
-	}
-	case 1:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x344);
-		case 0x00370005:
-			_read_float_value(0x360);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x25C); //604
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x364); //868
-	default:
-		break;
-	}
-	case 2:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x348);
-		case 0x00370005:
-			_read_float_value(0x364);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x260); //608
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x368); //872
-	default:
-		break;
-	}
-	case 3:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x34C);
-		case 0x00370005:
-			_read_float_value(0x368);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x264); //612
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x36c); //876
-	default:
-		break;
-	}
-	case 4:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x350);
-		case 0x00370005:
-			_read_float_value(0x36C);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x370); //880
-	default:
-		break;
-	}
-	case 5:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x354);
-		case 0x00370005:
-			_read_float_value(0x370);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x374); //884
-	default:
-		break;
-	}
-	case 6:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x358);
-		case 0x00370005:
-			_read_float_value(0x374);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x378); //888
-	default:
-		break;
-	}
-	case 7:
-		switch (ry->table_ver)
-		{
+	u32 baseOffset;
+
+	switch (ry->table_ver) {
 		case 0x00370000:
 		case 0x00370001:
 		case 0x00370002:
 		case 0x00370003:
 		case 0x00370004:
-			_read_float_value(0x35C);
+			baseOffset = 0x340;
+			break;
 		case 0x00370005:
-			_read_float_value(0x378);
+			baseOffset = 0x35C;
+			break;
+		case 0x003F0000: { // Van Gogh
+			if (core >= 4)
+				return NAN;
+
+			baseOffset = 0x258;
+		}
+			break;
 		case 0x00400004:
 		case 0x00400005:
-			_read_float_value(0x37C); //892
-	default:
-		break;
-	}
-	default:
-		break;
+			baseOffset = 0x360;
+			break;
+		default:
+			return NAN;
 	}
-	return NAN;
+
+	_read_float_value(baseOffset + (core * 4));
 }
 
 EXP float CALL get_core_clk(ryzen_access ry, uint32_t core) {

From 1643186c43e70ff6450fcdcefa9247d02db79c9b Mon Sep 17 00:00:00 2001
From: kylon <3252255+kylon@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:44:16 +0100
Subject: [PATCH 4/5] api: get_core_clk: clean up

---
 lib/api.c | 161 +++++++-----------------------------------------------
 1 file changed, 20 insertions(+), 141 deletions(-)

diff --git a/lib/api.c b/lib/api.c
index ef13532e..8735b62f 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -2173,156 +2173,35 @@ EXP float CALL get_core_temp(ryzen_access ry, uint32_t core) {
 }
 
 EXP float CALL get_core_clk(ryzen_access ry, uint32_t core) {
-	switch (core)
-	{
-	case 0:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3A0);
-		case 0x00370005:
-			_read_float_value(0x3BC);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x288); //648
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3c0); //960
-	default:
-		break;
-	}
-	case 1:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3A4);
-		case 0x00370005:
-			_read_float_value(0x3C0);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x2C8); //652
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3c4); //964
-	default:
-		break;
-	}
-	case 2:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3A8);
-		case 0x00370005:
-			_read_float_value(0x3C4);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x290); //656
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3c8); //968
-	default:
-		break;
-	}
-	case 3:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3AC);
-		case 0x00370005:
-			_read_float_value(0x3C8);
-		case 0x003F0000: // Van Gogh
-			_read_float_value(0x294); //660
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3cc); //972
-	default:
-		break;
-	}
-	case 4:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3B0);
-		case 0x00370005:
-			_read_float_value(0x3CC);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3d0); //976
-	default:
-		break;
-	}
-	case 5:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3B4);
-		case 0x00370005:
-			_read_float_value(0x3D0);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3d4); //980
-	default:
-		break;
-	}
-	case 6:
-		switch (ry->table_ver)
-		{
-		case 0x00370000:
-		case 0x00370001:
-		case 0x00370002:
-		case 0x00370003:
-		case 0x00370004:
-			_read_float_value(0x3B8);
-		case 0x00370005:
-			_read_float_value(0x3D4);
-		case 0x00400004:
-		case 0x00400005:
-			_read_float_value(0x3d8); //984
-	default:
-		break;
-	}
-	case 7:
-		switch (ry->table_ver)
-		{
+	u32 baseOffset;
+
+	switch (ry->table_ver) {
 		case 0x00370000:
 		case 0x00370001:
 		case 0x00370002:
 		case 0x00370003:
 		case 0x00370004:
-			_read_float_value(0x3BC);
+			baseOffset = 0x3A0;
+			break;
 		case 0x00370005:
-			_read_float_value(0x3D8);
+			baseOffset = 0x3BC;
+			break;
+		case 0x003F0000: { // Van Gogh
+			if (core >= 4)
+				return NAN;
+			
+			baseOffset = 0x288;
+		}
+			break;
 		case 0x00400004:
 		case 0x00400005:
-			_read_float_value(0x3dc); //988
-	default:
-		break;
-	}
-	default:
-		break;
+			baseOffset = 0x3c0;
+			break;
+		default:
+			return NAN;
 	}
-	return NAN;
+
+	_read_float_value(baseOffset + (core *4));
 }
 
 EXP float CALL get_l3_clk(ryzen_access ry) {

From eecb42b86f8e9523b00e0dc51b012d34f2026427 Mon Sep 17 00:00:00 2001
From: kylon <3252255+kylon@users.noreply.github.com>
Date: Mon, 20 Jan 2025 18:47:38 +0100
Subject: [PATCH 5/5] add missing check, ops

---
 lib/api.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/api.c b/lib/api.c
index 8735b62f..705f5795 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -2074,6 +2074,9 @@ EXP float CALL get_slow_time(ryzen_access ry) {
 }
 
 EXP float CALL get_core_power(ryzen_access ry, uint32_t core) {
+	if (core > 7)
+		return NAN;
+	
 	u32 baseOffset;
 	
 	switch (ry->table_ver) {
@@ -2109,6 +2112,9 @@ EXP float CALL get_core_power(ryzen_access ry, uint32_t core) {
 }
 
 EXP float CALL get_core_volt(ryzen_access ry, uint32_t core) {
+	if (core > 7)
+		return NAN;
+	
 	u32 baseOffset;
 
 	switch (ry->table_ver) {
@@ -2141,6 +2147,9 @@ EXP float CALL get_core_volt(ryzen_access ry, uint32_t core) {
 }
 
 EXP float CALL get_core_temp(ryzen_access ry, uint32_t core) {
+	if (core > 7)
+		return NAN;
+	
 	u32 baseOffset;
 
 	switch (ry->table_ver) {
@@ -2173,6 +2182,9 @@ EXP float CALL get_core_temp(ryzen_access ry, uint32_t core) {
 }
 
 EXP float CALL get_core_clk(ryzen_access ry, uint32_t core) {
+	if (core > 7)
+		return NAN;
+	
 	u32 baseOffset;
 
 	switch (ry->table_ver) {