marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Changed compability flags for Intel Family-6 Model-11 to not be Pentium M compatible.

Browse Source 
Beefed up CPUID.Main ot output more info.
Formatting.
This commit is contained in:
dev
2011-09-24 15:44:22 +00:00
parent 1fe8dbb00e
commit 05a92cd8e6
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/java/src/freenet/support/CPUInformation/CPUID.java
View File

@ -210,7 +210,7 @@ public class CPUID {
if(!_nativeOk){ if(!_nativeOk){
System.out.println("**Failed to retrieve CPUInfo. Please verify the existence of jcpuid dll/so**"); System.out.println("**Failed to retrieve CPUInfo. Please verify the existence of jcpuid dll/so**");
} }
System.out.println("**CPUInfo**"); System.out.println(" **CPUInfo**");
System.out.println("CPU Vendor: " + getCPUVendorID()); System.out.println("CPU Vendor: " + getCPUVendorID());
System.out.println("CPU Family: " + getCPUFamily()); System.out.println("CPU Family: " + getCPUFamily());
System.out.println("CPU Model: " + getCPUModel()); System.out.println("CPU Model: " + getCPUModel());
@ -218,29 +218,35 @@ public class CPUID {
System.out.println("CPU Flags: 0x" + Integer.toHexString(getEDXCPUFlags())); System.out.println("CPU Flags: 0x" + Integer.toHexString(getEDXCPUFlags()));
CPUInfo c = getInfo(); CPUInfo c = getInfo();
System.out.println(" **More CPUInfo**"); System.out.println("\n **More CPUInfo**");
System.out.println(" CPU model string: " + c.getCPUModelString()); System.out.println("CPU model string: " + c.getCPUModelString());
System.out.println(" CPU has MMX: " + c.hasMMX()); System.out.println("CPU has MMX: " + c.hasMMX());
System.out.println(" CPU has SSE: " + c.hasSSE()); System.out.println("CPU has SSE: " + c.hasSSE());
System.out.println(" CPU has SSE2: " + c.hasSSE2()); System.out.println("CPU has SSE2: " + c.hasSSE2());
System.out.println(" CPU has SSE3: " + c.hasSSE3()); System.out.println("CPU has SSE3: " + c.hasSSE3());
System.out.println(" CPU has SSE4.1: " + c.hasSSE41()); System.out.println("CPU has SSE4.1: " + c.hasSSE41());
System.out.println(" CPU has SSE4.2: " + c.hasSSE42()); System.out.println("CPU has SSE4.2: " + c.hasSSE42());
System.out.println(" CPU has SSE4A: " + c.hasSSE4A()); System.out.println("CPU has SSE4A: " + c.hasSSE4A());
if(c instanceof IntelCPUInfo){ if(c instanceof IntelCPUInfo){
System.out.println(" **Intel-info**"); System.out.println("\n **Intel-info**");
System.out.println(" Is pII-compatible: "+((IntelCPUInfo)c).IsPentium2Compatible()); System.out.println("Is PII-compatible: "+((IntelCPUInfo)c).IsPentium2Compatible());
System.out.println(" Is pIII-compatible: "+((IntelCPUInfo)c).IsPentium3Compatible()); System.out.println("Is PIII-compatible: "+((IntelCPUInfo)c).IsPentium3Compatible());
System.out.println(" Is pIV-compatible: "+((IntelCPUInfo)c).IsPentium4Compatible()); System.out.println("Is PIV-compatible: "+((IntelCPUInfo)c).IsPentium4Compatible());
System.out.println(" Is atom-compatible: "+((IntelCPUInfo)c).IsAtomCompatible()); System.out.println("Is Atom-compatible: "+((IntelCPUInfo)c).IsAtomCompatible());
System.out.println(" Is core2-compatible: "+((IntelCPUInfo)c).IsCore2Compatible()); System.out.println("Is Pentium M compatible: "+((IntelCPUInfo)c).IsPentiumMCompatible());
System.out.println(" Is corei-compatible: "+((IntelCPUInfo)c).IsCoreiCompatible()); System.out.println("Is Core2-compatible: "+((IntelCPUInfo)c).IsCore2Compatible());
System.out.println("Is Corei-compatible: "+((IntelCPUInfo)c).IsCoreiCompatible());
} }
if(c instanceof AMDCPUInfo){ if(c instanceof AMDCPUInfo){
System.out.println(" **AMD-info**"); System.out.println("\n **AMD-info**");
System.out.println(" Is Athlon-compatible: "+((AMDCPUInfo)c).IsAthlonCompatible()); System.out.println("Is K6-compatible: "+((AMDCPUInfo)c).IsK6Compatible());
System.out.println("Is K6_2-compatible: "+((AMDCPUInfo)c).IsK6_2_Compatible());
System.out.println("Is K6_3-compatible: "+((AMDCPUInfo)c).IsK6_3_Compatible());
System.out.println("Is K6-compatible: "+((AMDCPUInfo)c).IsGeodeCompatible());
System.out.println("Is Athlon-compatible: "+((AMDCPUInfo)c).IsAthlonCompatible());
System.out.println("Is Athlon64-compatible: "+((AMDCPUInfo)c).IsAthlon64Compatible());
System.out.println("Is Bobcat-compatible: "+((AMDCPUInfo)c).IsBobcatCompatible());
} }
} }
/** /**

13
core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
View File

@ -150,7 +150,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
case 9: case 9:
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentiumMCompatible = true; isPentiumMCompatible = true;
isX64 = true; isX64 = true;
modelString = "Pentium M (Banias)"; modelString = "Pentium M (Banias)";
break; break;
@ -162,20 +162,19 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
case 11: case 11:
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentiumMCompatible = true;
modelString = "Pentium III (130 nm)"; modelString = "Pentium III (130 nm)";
break; break;
case 13: case 13:
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentiumMCompatible = true; isPentiumMCompatible = true;
isX64 = true; isX64 = true;
modelString = "Core (Yonah)"; modelString = "Core (Yonah)";
break; break;
case 14: case 14:
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentiumMCompatible = true; isPentiumMCompatible = true;
isCore2Compatible = true; isCore2Compatible = true;
isX64 = true; isX64 = true;
modelString = "Core 2 (Conroe)"; modelString = "Core 2 (Conroe)";
@ -183,7 +182,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
case 15: case 15:
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentiumMCompatible = true; isPentiumMCompatible = true;
isCore2Compatible = true; isCore2Compatible = true;
isX64 = true; isX64 = true;
modelString = "Core 2 (Conroe)"; modelString = "Core 2 (Conroe)";
@ -195,7 +194,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentium4Compatible = true; isPentium4Compatible = true;
isPentiumMCompatible = true; isPentiumMCompatible = true;
isCore2Compatible = true; isCore2Compatible = true;
isX64 = true; isX64 = true;
switch(CPUID.getCPUModel()){ switch(CPUID.getCPUModel()){
@ -228,7 +227,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
isPentium2Compatible = true; isPentium2Compatible = true;
isPentium3Compatible = true; isPentium3Compatible = true;
isPentium4Compatible = true; isPentium4Compatible = true;
isPentiumMCompatible = true; isPentiumMCompatible = true;
isCore2Compatible = true; isCore2Compatible = true;
isCoreiCompatible = true; isCoreiCompatible = true;
isX64 = true; isX64 = true;