From b335ded1d255291d78d60ce502c217b503e90c95 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 24 Mar 2017 13:08:56 +0000
Subject: [PATCH] CPUID: Recognize Ryzen

---
 .../support/CPUInformation/AMDInfoImpl.java   | 24 +++++++++++++++++++
 history.txt                                   | 11 +++++++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
index 11e3777b1..da71628ee 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
@@ -453,6 +453,30 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
             modelString = "Jaguar";
           }
           break;
+
+        //Ryzen 7 (model 1), Ryzen 5 TBD
+        // untested
+          case 23: {
+            // Quote wikipedia:
+            // Zen is a clean sheet design that differs from the long-standing Bulldozer architecture.
+            // All models support: x87, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AES, CLMUL,
+            // AVX, AVX2, FMA, CVT16/F16C, ABM, BMI1, BMI2, SHA.
+            isK6Compatible = true;
+            isK6_2_Compatible = true;
+            isK6_3_Compatible = true;
+            isAthlonCompatible = true;
+            isAthlon64Compatible = true;
+            // Pending testing of the bulldozer jbigi
+            //isPiledriverCompatible = true;
+            //isSteamrollerCompatible = true;
+            //isExcavatorCompatible = true;
+            //isBulldozerCompatible = true;
+            if (model == 1)
+               modelString = "Ryzen 7";
+            else
+               modelString = "Ryzen model " + model;
+          }
+          break;
         }
         return modelString;
     }
diff --git a/history.txt b/history.txt
index b69c945ac..112eadc12 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,16 @@
+2017-03-24 zzz
+ * Addressbook: Remove static reference, hide implementation
+ * CPUID: Recognize Ryzen
+
+2017-03-23 zzz
+ * Plugins:
+   - Blacklist i2pbote and BwSchedule
+   - Translate exceptions thrown from PluginStarter
+   - Add version number to console messages when installing/starting
+
 2017-03-21 zzz
  * i2psnark: Enhancement to support RPC plugin
+ * Context: New ClientAppManagerImpl in AppContext, so registration works
 
 2017-03-20 zzz
  * i2psnark: Enhancements to support RPC plugin
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2522cd4e..7ca1a3ec2 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 9;
+    public final static long BUILD = 10;
 
     /** for example "-test" */
     public final static String EXTRA = "";