From 5ee65a30f8683589ede68a37a1013db678c42832 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Thu, 25 Jul 2024 09:19:39 -0400
Subject: [PATCH] Util: Add new processors for CPUID

---
 .../java/src/freenet/support/CPUInformation/AMDInfoImpl.java | 5 +++--
 .../src/freenet/support/CPUInformation/IntelInfoImpl.java    | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
index 3c3da8d82..5f53c1dca 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
@@ -3,7 +3,8 @@ package freenet.support.CPUInformation;
 /**
  *  Moved out of CPUID.java
  *
- *  Ref: http://en.wikipedia.org/wiki/List_of_AMD_CPU_microarchitectures
+ *  Ref: https://en.wikipedia.org/wiki/List_of_AMD_CPU_microarchitectures
+ *  Ref: https://gmplib.org/repo/gmp/file/tip/config.guess
  *
  *  @since 0.8.7
  */
@@ -468,7 +469,7 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
           }
           break;
 
-        // Zen / Zen+ / Zen2 / Zen3 / Ryzen 3/5/7/9/Threadripper / EPYC
+        // Zen / Zen+ / Zen2 / Zen3 / Zen4 / Ryzen 3/5/7/9/Threadripper / EPYC
         // untested
           case 23:
           case 25: {
diff --git a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
index f474bff4b..e0951d454 100644
--- a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
@@ -4,7 +4,8 @@ package freenet.support.CPUInformation;
  *  Moved out of CPUID.java
  *
  *  Ref: https://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers
- *  Ref: http://en.wikipedia.org/wiki/List_of_Intel_CPU_microarchitectures
+ *  Ref: https://en.wikipedia.org/wiki/List_of_Intel_CPU_microarchitectures
+ *  Ref: https://gmplib.org/repo/gmp/file/tip/config.guess
  *
  *  @since 0.8.7
  */
@@ -521,6 +522,8 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
                     case 0xa7: // Rocket Lake
                     case 0x97: // Alder Lake
                     case 0x9a: // Alder Lake
+                    case 0xba: // Raptor Lake
+                    case 0xb7: // Raptor Lake
                                {
                         CPUIDCPUInfo c = new CPUIDCPUInfo();
                         if (c.hasAVX2() && c.hasBMI1()  && c.hasBMI2() &&