Author: nextgens
Date: 2006-02-03 21:46:40 +0000 (Fri, 03 Feb 2006)
New Revision: 7996
Added:
branches/freenet-freejvms/run-bench.sh
branches/freenet-freejvms/run.sh
Removed:
branches/freenet-freejvms/Makefile
branches/freenet-freejvms/src/freenet/support/CPUInformation/
Modified:
branches/freenet-freejvms/build.xml
branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
Log:
build 305 works here with GCJ
Deleted: branches/freenet-freejvms/Makefile
===================================================================
--- branches/freenet-freejvms/Makefile 2006-02-03 01:52:31 UTC (rev 7995)
+++ branches/freenet-freejvms/Makefile 2006-02-03 21:46:40 UTC (rev 7996)
@@ -1,17 +0,0 @@
-CC = gcj
-CFLAGS += -g -Wall -pedantic
-LDFLAGS = -L lib/linux/x68 -lfec8 -l fec16
-
-FREENET_SRCS = freenet-cvs-snapshot.jar freenet-ext.jar
-FREENET_OBJS = ${FREENET_SRCS:.c=.o}
-
-PROGS = freenet
-
-all: $(PROGS)
-
-freenet: $(FREENET_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o freenet $(FREENET_OBJS)
-
-clean:
- rm -f *.o $(PROGS) Makefile.bak *~ core
-
Modified: branches/freenet-freejvms/build.xml
===================================================================
--- branches/freenet-freejvms/build.xml 2006-02-03 01:52:31 UTC (rev 7995)
+++ branches/freenet-freejvms/build.xml 2006-02-03 21:46:40 UTC (rev 7996)
@@ -22,8 +22,9 @@
<javac srcdir="${src}" destdir="${build}" source="1.4" debug="on"
optimize="on">
<classpath>
<pathelement location="freenet-ext.jar"/>
- <pathelement location="gnu-crypto-der.jar"/>
<pathelement location="gnu-crypto.jar"/>
+ <pathelement location="javax-security.jar"/>
+ <pathelement location="javax-crypto.jar"/>
</classpath>
<!-- following a very temporary list of files to be build -->
<include name="*.class"/>
@@ -32,9 +33,7 @@
<include name="com/onionnetworks/**/*.class"/>
<include name="freenet/**/*.java"/>
<include name="net/i2p/util/*.java"/>
- <include name="gnu/crypto/hash/*" />
<exclude name="org/**/MersenneTwisterTest.java"/>
- <exclude name="gnu/crypto/" />
</javac>
</target>
Added: branches/freenet-freejvms/run-bench.sh
===================================================================
--- branches/freenet-freejvms/run-bench.sh 2006-02-03 01:52:31 UTC (rev
7995)
+++ branches/freenet-freejvms/run-bench.sh 2006-02-03 21:46:40 UTC (rev
7996)
@@ -0,0 +1,3 @@
+gcj -c -O3 -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o bench-freenet-ext.o freenet-ext.jar
+gcj -c -O3 -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o bench-freenet.o
freenet-cvs-snapshot.jar
+gcj -fjni -combine -O3 -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar --main=net.i2p.util.NativeBigInteger -o
bench -Lbin/lib/linux/x86/ -Lbin/net/i2p/util/ -lfec16 -lfec8
-ljbigi-linux-athlon -lgmp bench-freenet-ext.o bench-freenet.o
Added: branches/freenet-freejvms/run.sh
===================================================================
--- branches/freenet-freejvms/run.sh 2006-02-03 01:52:31 UTC (rev 7995)
+++ branches/freenet-freejvms/run.sh 2006-02-03 21:46:40 UTC (rev 7996)
@@ -0,0 +1,3 @@
+gcj -c -g -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o freenet-ext.o freenet-ext.jar
+gcj -c -g -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o freenet.o freenet-cvs-snapshot.jar
+gcj -fjni -combine -g -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar --main=freenet.node.Node -o freenet
-Lbin/lib/linux/x86/ -Lbin/net/i2p/util/ -lfec16 -lfec8 -ljbigi-linux-athlon
-lgmp freenet-ext.o freenet.o
Modified: branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
===================================================================
--- branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
2006-02-03 01:52:31 UTC (rev 7995)
+++ branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
2006-02-03 21:46:40 UTC (rev 7996)
@@ -19,11 +19,6 @@
import java.io.File;
import freenet.support.HexUtil;
-import freenet.support.CPUInformation.AMDCPUInfo;
-import freenet.support.CPUInformation.CPUID;
-import freenet.support.CPUInformation.CPUInfo;
-import freenet.support.CPUInformation.IntelCPUInfo;
-import freenet.support.CPUInformation.UnknownCPUException;
/**
* <p>BigInteger that takes advantage of the jbigi library for the modPow
operation,
@@ -125,37 +120,7 @@
* @return A string containing the CPU-type or null if CPU type is
unknown
*/
private static String resolveCPUType() {
- try {
- CPUInfo c = CPUID.getInfo();
- if (c instanceof AMDCPUInfo) {
- AMDCPUInfo amdcpu = (AMDCPUInfo) c;
- 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;
- } catch (UnknownCPUException e) {
- return null; //TODO: Log something here maybe..
- }
+ return JBIGI_OPTIMIZATION_ATHLON;
}
/**
