From c6a2e99a0d7fe8a9c5e52c0183a5198e89319b6f Mon Sep 17 00:00:00 2001
From: dev <dev@robertfoss.se>
Date: Tue, 11 Jan 2011 17:51:29 +0000
Subject: [PATCH] Added Intel Atom as (pentium3) as prescribed by the libgmp
configure scripts.
---
.../freenet/support/CPUInformation/CPUID.java | 35 ++++++++++++-------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index e3712e4ad8..d8f8967fba 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -324,8 +324,16 @@ public class CPUID {
return getCPUFamily() > 6 || (getCPUFamily() == 6 && getCPUModel() >=3);
}
public boolean IsPentium3Compatible()
- {
- return getCPUFamily() > 6 || (getCPUFamily() == 6 && getCPUModel() >=7);
+ {
+ // Atom
+ if (getCPUExtendedModel() == 1 && (getCPUFamily() == 6 && (getCPUModel() == 10))){
+ return true;
+ // ??
+ } else if (getCPUFamily() > 6 || (getCPUFamily() == 6 && getCPUModel() >=7)){
+ return true;
+ } else {
+ return false;
+ }
}
public boolean IsPentium4Compatible()
{
@@ -417,17 +425,18 @@ public class CPUID {
case 15:
return "Core 2 (Conroe)";
}
- }
- if (getCPUExtendedModel() == 1){
- switch(getCPUModel()){
- case 10:
- return "Core i7";
- case 12:
- return "Atom";
- case 13:
- return "Xeon MP";
- }
- }
+ } else {
+ if (getCPUExtendedModel() == 1){
+ switch(getCPUModel()){
+ case 10:
+ return "Core i7";
+ case 12:
+ return "Atom";
+ case 13:
+ return "Xeon MP";
+ }
+ }
+ }
}
if(getCPUFamily() == 7){
switch(getCPUModel()){
--
GitLab