Author: nextgens
Date: 2006-01-31 17:19:58 +0000 (Tue, 31 Jan 2006)
New Revision: 7972
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/net/i2p/util/NativeBigInteger.java
Log:
419:
We don't load JCPUID if we are on a x86_64
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-31 16:58:46 UTC (rev
7971)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-31 17:19:58 UTC (rev
7972)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 418;
+ private static final int buildNumber = 419;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 403;
Modified: trunk/freenet/src/net/i2p/util/NativeBigInteger.java
===================================================================
--- trunk/freenet/src/net/i2p/util/NativeBigInteger.java 2006-01-31
16:58:46 UTC (rev 7971)
+++ trunk/freenet/src/net/i2p/util/NativeBigInteger.java 2006-01-31
17:19:58 UTC (rev 7972)
@@ -128,32 +128,37 @@
*/
private static String resolveCPUType() {
try {
- CPUInfo c = CPUID.getInfo();
- if (c instanceof AMDCPUInfo) {
- AMDCPUInfo amdcpu = (AMDCPUInfo) c;
- if (amdcpu.IsAthlon64Compatible())
- return JBIGI_OPTIMISATION_X86_64;
- if (amdcpu.IsAthlonCompatible())
- return JBIGI_OPTIMIZATION_ATHLON;
- if (amdcpu.IsK6_3_Compatible())
- return JBIGI_OPTIMIZATION_K6_3;
- if (amdcpu.IsK6_2_Compatible())
- return JBIGI_OPTIMIZATION_K6_2;
- if (amdcpu.IsK6Compatible())
- return JBIGI_OPTIMIZATION_K6;
- } else {
- if (c instanceof IntelCPUInfo) {
- IntelCPUInfo intelcpu = (IntelCPUInfo)
c;
- if (intelcpu.IsPentium4Compatible())
- return
JBIGI_OPTIMIZATION_PENTIUM4;
- if (intelcpu.IsPentium3Compatible())
- return
JBIGI_OPTIMIZATION_PENTIUM3;
- if (intelcpu.IsPentium2Compatible())
- return
JBIGI_OPTIMIZATION_PENTIUM2;
- if (intelcpu.IsPentiumMMXCompatible())
- return
JBIGI_OPTIMIZATION_PENTIUMMMX;
- if (intelcpu.IsPentiumCompatible())
- return
JBIGI_OPTIMIZATION_PENTIUM;
+
if(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)")){
+ System.out.println("Detected x86_64!");
+ return JBIGI_OPTIMISATION_X86_64;
+ }else{
+ CPUInfo c = CPUID.getInfo();
+ if (c instanceof AMDCPUInfo) {
+ AMDCPUInfo amdcpu = (AMDCPUInfo) c;
+ if (amdcpu.IsAthlon64Compatible())
+ return
JBIGI_OPTIMISATION_X86_64;
+ if (amdcpu.IsAthlonCompatible())
+ return
JBIGI_OPTIMIZATION_ATHLON;
+ if (amdcpu.IsK6_3_Compatible())
+ return JBIGI_OPTIMIZATION_K6_3;
+ if (amdcpu.IsK6_2_Compatible())
+ return JBIGI_OPTIMIZATION_K6_2;
+ if (amdcpu.IsK6Compatible())
+ return JBIGI_OPTIMIZATION_K6;
+ } else {
+ if (c instanceof IntelCPUInfo) {
+ IntelCPUInfo intelcpu =
(IntelCPUInfo) c;
+ if
(intelcpu.IsPentium4Compatible())
+ return
JBIGI_OPTIMIZATION_PENTIUM4;
+ if
(intelcpu.IsPentium3Compatible())
+ return
JBIGI_OPTIMIZATION_PENTIUM3;
+ if
(intelcpu.IsPentium2Compatible())
+ return
JBIGI_OPTIMIZATION_PENTIUM2;
+ if
(intelcpu.IsPentiumMMXCompatible())
+ return
JBIGI_OPTIMIZATION_PENTIUMMMX;
+ if
(intelcpu.IsPentiumCompatible())
+ return
JBIGI_OPTIMIZATION_PENTIUM;
+ }
}
}
return null;
