[kaffe] CVS kaffe (robilad): kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): removed fdlibm and
Kaffe CVS
cvs-commits at kaffe.org
Fri Jan 5 07:04:10 PST 2007
PatchSet 7458
Date: 2007/01/05 15:03:02
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with GNU Classpath up to 2009-09-17
2007-01-05 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): removed fdlibm and
classpath directories.
(libkaffevm_la_DEPENDENCIES) Removed fdlibm and classpath libraries.
This allows libkaffevm to be independent of libclasspath, and
thereby avoids triggering the new JNI_OnLoad function in
libclasspath during bootstrap.
* kaffe/kaffevm/classMethod.c (initialiseSecurity): Added debug
output.
* kaffe/kaffevm/external.c (loadNativeLibrarySymFromLib): New
internal function.
(loadNativeLibrary, loadNativeLibrarySym) Use it.
* kaffe/kaffevm/thread.c (KaffeVM_attachFakedThreadInstance):
Moved jnireferences initialisation to ...
(linkNativeAndJavaThread) ... here, to ensure that each new
thread has jnireferences available.
* kaffe/kaffevm/jni/jni-helpers.c (KaffeJNI_GetDirectBufferAddress):
Return NULL if no directbufferimpladdress is set.
* libraries/clib/native/gnu_classpath_VMSystemProperties.c:
Don't include jcl.h. Include config.h.
* libraries/clib/net/InetAddressImpl.c (inetClass, inetLockInit,
inetLock, java_net_VMInetAddress_lookupInaddrAny, initInetLock,
java_net_VMInetAddress_getLocalHostname): Removed in ordeer to
use the implementation in GNU Classpath.
* libraries/clib/native/java_lang_VMDouble.c,
libraries/clib/native/java_lang_VMSystem.c,
libraries/clib/net/NetworkInterface.c,
libraries/clib/nio/.cvsignore,
libraries/clib/nio/gnu_java_nio_VMSelector.c: Removed.
* libraries/javalib/vmspecific/java/lang/VMSystem.java:
Resynced with GNU Classpath.
* libraries/javalib/external/classpath/ : Resynced with GNU Classpath
up to 2006-09-17.
Members:
ChangeLog:1.4958->1.4959
kaffe/kaffevm/Makefile.am:1.97->1.98
kaffe/kaffevm/Makefile.in:1.257->1.258
kaffe/kaffevm/classMethod.c:1.159->1.160
kaffe/kaffevm/external.c:1.86->1.87
kaffe/kaffevm/thread.c:1.109->1.110
kaffe/kaffevm/jni/jni-helpers.c:1.16->1.17
libraries/clib/native/gnu_classpath_VMSystemProperties.c:1.6->1.7
libraries/clib/native/java_lang_VMDouble.c:1.6->1.7(DEAD)
libraries/clib/native/java_lang_VMSystem.c:1.3->1.4(DEAD)
libraries/clib/net/InetAddressImpl.c:1.34->1.35
libraries/clib/net/NetworkInterface.c:1.15->1.16(DEAD)
libraries/clib/nio/.cvsignore:1.2->1.3(DEAD)
libraries/clib/nio/gnu_java_nio_VMSelector.c:1.17->1.18(DEAD)
libraries/javalib/external/classpath/ChangeLog:1.38->1.39
libraries/javalib/external/classpath/INSTALL:1.8->1.9
libraries/javalib/external/classpath/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/NEWS:1.18->1.19
libraries/javalib/external/classpath/aclocal.m4:1.20->1.21
libraries/javalib/external/classpath/config.guess:1.35->1.36
libraries/javalib/external/classpath/config.sub:1.42->1.43
libraries/javalib/external/classpath/configure:1.35->1.36
libraries/javalib/external/classpath/configure.ac:1.21->1.22
libraries/javalib/external/classpath/depcomp:1.3->1.4
libraries/javalib/external/classpath/install-sh:1.3->1.4
libraries/javalib/external/classpath/missing:1.3->1.4
libraries/javalib/external/classpath/mkinstalldirs:1.3->1.4
libraries/javalib/external/classpath/doc/Makefile.in:1.24->1.25
libraries/javalib/external/classpath/doc/texinfo.tex:1.3->1.4
libraries/javalib/external/classpath/doc/api/Makefile.in:1.25->1.26
libraries/javalib/external/classpath/examples/Makefile.in:1.29->1.30
libraries/javalib/external/classpath/external/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/external/relaxngDatatype/Makefile.in:1.13->1.14
libraries/javalib/external/classpath/external/sax/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.38->1.39
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.38->1.39
libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/gnu/java/net/PlainDatagramSocketImpl.java:1.2->1.3
libraries/javalib/external/classpath/gnu/java/net/PlainSocketImpl.java:1.2->1.3
libraries/javalib/external/classpath/gnu/java/nio/DatagramChannelImpl.java:1.2->1.3
libraries/javalib/external/classpath/gnu/java/nio/DatagramChannelSelectionKey.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/FileChannelImpl.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/java/nio/FileLockImpl.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/KqueueSelectionKeyImpl.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/java/nio/KqueueSelectorImpl.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/java/nio/NIOSocket.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/NIOSocketImpl.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/java/nio/PipeImpl.java:1.2->1.3
libraries/javalib/external/classpath/gnu/java/nio/SelectionKeyImpl.java:1.2->1.3
libraries/javalib/external/classpath/gnu/java/nio/SelectorProviderImpl.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/ServerSocketChannelImpl.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/ServerSocketChannelSelectionKey.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/SocketChannelImpl.java:1.3->1.4
libraries/javalib/external/classpath/gnu/java/nio/SocketChannelSelectionKey.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java:1.1->1.2
libraries/javalib/external/classpath/gnu/java/nio/VMChannelOwner.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/java/nio/channels/FileChannelImpl.java:1.4->1.5(DEAD)
libraries/javalib/external/classpath/gnu/xml/dom/ls/SAXEventSink.java:1.3->1.4
libraries/javalib/external/classpath/gnu/xml/transform/SAXTemplatesHandler.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/xml/transform/SAXTransformerHandler.java:INITIAL->1.1
libraries/javalib/external/classpath/gnu/xml/transform/TransformerFactoryImpl.java:1.2->1.3
libraries/javalib/external/classpath/include/Makefile.am:1.10->1.11
libraries/javalib/external/classpath/include/Makefile.in:1.28->1.29
libraries/javalib/external/classpath/include/config.h.in:1.12->1.13
libraries/javalib/external/classpath/include/gnu_java_net_VMPlainSocketImpl.h:1.2->1.3
libraries/javalib/external/classpath/include/gnu_java_nio_FileChannelImpl.h:INITIAL->1.1
libraries/javalib/external/classpath/include/gnu_java_nio_KqueueSelectorImpl.h:INITIAL->1.1
libraries/javalib/external/classpath/include/gnu_java_nio_VMChannel.h:1.1->1.2
libraries/javalib/external/classpath/include/gnu_java_nio_VMPipe.h:1.1->1.2
libraries/javalib/external/classpath/include/java_net_VMNetworkInterface.h:1.1->1.2
libraries/javalib/external/classpath/java/io/FileDescriptor.java:1.2->1.3
libraries/javalib/external/classpath/java/io/FileInputStream.java:1.1->1.2
libraries/javalib/external/classpath/java/io/FileOutputStream.java:1.1->1.2
libraries/javalib/external/classpath/java/io/RandomAccessFile.java:1.2->1.3
libraries/javalib/external/classpath/java/net/DatagramSocket.java:1.2->1.3
libraries/javalib/external/classpath/java/net/NetworkInterface.java:1.2->1.3
libraries/javalib/external/classpath/java/net/ServerSocket.java:1.3->1.4
libraries/javalib/external/classpath/java/net/Socket.java:1.4->1.5
libraries/javalib/external/classpath/lib/Makefile.in:1.31->1.32
libraries/javalib/external/classpath/native/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.28->1.29
libraries/javalib/external/classpath/native/jawt/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/native/jni/classpath/jcl.c:1.3->1.4
libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.in:1.6->1.7
libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.29->1.30
libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/java-lang/java_lang_VMProcess.c:1.4->1.5
libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c:1.5->1.6
libraries/javalib/external/classpath/native/jni/java-net/java_net_VMNetworkInterface.c:1.2->1.3
libraries/javalib/external/classpath/native/jni/java-nio/Makefile.am:1.4->1.5
libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c:INITIAL->1.1
libraries/javalib/external/classpath/native/jni/java-nio/gnu_java_nio_VMChannel.c:1.1->1.2
libraries/javalib/external/classpath/native/jni/java-nio/gnu_java_nio_VMPipe.c:1.1->1.2
libraries/javalib/external/classpath/native/jni/java-nio/javanio.c:INITIAL->1.1
libraries/javalib/external/classpath/native/jni/java-nio/javanio.h:INITIAL->1.1
libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/native/jni/native-lib/Makefile.in:1.1->1.2
libraries/javalib/external/classpath/native/jni/native-lib/cpnet.c:1.1->1.2
libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/native/plugin/Makefile.in:1.8->1.9
libraries/javalib/external/classpath/native/target/Linux/.cvsignore:1.3->1.4(DEAD)
libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.25->1.26(DEAD)
libraries/javalib/external/classpath/resource/Makefile.in:1.27->1.28
libraries/javalib/external/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties:1.4->1.5
libraries/javalib/external/classpath/scripts/Makefile.in:1.26->1.27
libraries/javalib/external/classpath/scripts/classpath.spec.in:1.38->1.39
libraries/javalib/external/classpath/tools/Makefile.in:1.15->1.16
libraries/javalib/external/classpath/vm/reference/gnu/java/net/VMPlainSocketImpl.java:1.2->1.3
libraries/javalib/external/classpath/vm/reference/gnu/java/nio/VMChannel.java:1.1->1.2
libraries/javalib/external/classpath/vm/reference/gnu/java/nio/VMPipe.java:1.1->1.2
libraries/javalib/external/classpath/vm/reference/java/net/VMNetworkInterface.java:1.2->1.3
libraries/javalib/external/classpath/vm/reference/java/nio/channels/VMChannels.java:1.1->1.2
libraries/javalib/vmspecific/java/lang/VMSystem.java:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4958 kaffe/ChangeLog:1.4959
--- kaffe/ChangeLog:1.4958 Fri Jan 5 02:04:04 2007
+++ kaffe/ChangeLog Fri Jan 5 15:03:02 2007
@@ -1,3 +1,48 @@
+2007-01-05 Dalibor Topic <robilad at kaffe.org>
+
+ * kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): removed fdlibm and
+ classpath directories.
+ (libkaffevm_la_DEPENDENCIES) Removed fdlibm and classpath libraries.
+
+ This allows libkaffevm to be independent of libclasspath, and
+ thereby avoids triggering the new JNI_OnLoad function in
+ libclasspath during bootstrap.
+
+ * kaffe/kaffevm/classMethod.c (initialiseSecurity): Added debug
+ output.
+
+ * kaffe/kaffevm/external.c (loadNativeLibrarySymFromLib): New
+ internal function.
+ (loadNativeLibrary, loadNativeLibrarySym) Use it.
+
+ * kaffe/kaffevm/thread.c (KaffeVM_attachFakedThreadInstance):
+ Moved jnireferences initialisation to ...
+ (linkNativeAndJavaThread) ... here, to ensure that each new
+ thread has jnireferences available.
+
+ * kaffe/kaffevm/jni/jni-helpers.c (KaffeJNI_GetDirectBufferAddress):
+ Return NULL if no directbufferimpladdress is set.
+
+ * libraries/clib/native/gnu_classpath_VMSystemProperties.c:
+ Don't include jcl.h. Include config.h.
+
+ * libraries/clib/net/InetAddressImpl.c (inetClass, inetLockInit,
+ inetLock, java_net_VMInetAddress_lookupInaddrAny, initInetLock,
+ java_net_VMInetAddress_getLocalHostname): Removed in ordeer to
+ use the implementation in GNU Classpath.
+
+ * libraries/clib/native/java_lang_VMDouble.c,
+ libraries/clib/native/java_lang_VMSystem.c,
+ libraries/clib/net/NetworkInterface.c,
+ libraries/clib/nio/.cvsignore,
+ libraries/clib/nio/gnu_java_nio_VMSelector.c: Removed.
+
+ * libraries/javalib/vmspecific/java/lang/VMSystem.java:
+ Resynced with GNU Classpath.
+
+ * libraries/javalib/external/classpath/ : Resynced with GNU Classpath
+ up to 2006-09-17.
+
2007-01-05 Ito Kazumitsu <kaz at maczuka.gcd.org>
* test/regression/InetAddressTest.java,
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.97 kaffe/kaffe/kaffevm/Makefile.am:1.98
--- kaffe/kaffe/kaffevm/Makefile.am:1.97 Wed Jan 3 23:02:09 2007
+++ kaffe/kaffe/kaffevm/Makefile.am Fri Jan 5 15:03:04 2007
@@ -40,9 +40,7 @@
-I$(top_srcdir)/kaffe/kaffevm/jni \
-I$(top_srcdir)/config/$(Khost_cpu) \
-I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \
- $(MAYBE_INTERNAL_ZIP_INCLUDES) \
- -I$(top_srcdir)/libraries/javalib/external/classpath/native/fdlibm \
- -I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath
+ $(MAYBE_INTERNAL_ZIP_INCLUDES)
native_LTLIBRARIES = libkaffevm.la
@@ -79,9 +77,7 @@
verifier/libkaffeverifier.la \
$(GC_NAME)/libkaffegc.la \
jni/libkaffejni.la \
- $(top_builddir)/replace/libreplace.la \
- $(top_builddir)/libraries/javalib/external/classpath/native/fdlibm/libfdlibm.la \
- $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la
+ $(top_builddir)/replace/libreplace.la
libkaffevm_la_LIBADD = \
$(libkaffevm_la_DEPENDENCIES) \
@@ -128,9 +124,7 @@
reflect.c \
reference.c \
binreloc.c \
- $(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c \
$(top_srcdir)/libraries/clib/net/InetAddressImpl.c \
- $(top_srcdir)/libraries/clib/net/NetworkInterface.c \
$(top_srcdir)/libraries/clib/native/AccessController.c \
$(top_srcdir)/libraries/clib/native/java_lang_ref_Reference.c \
$(top_srcdir)/libraries/clib/native/java_lang_reflect_VMArray.c \
@@ -148,9 +142,7 @@
$(top_srcdir)/libraries/clib/native/java_lang_Thread.c \
$(top_srcdir)/libraries/clib/native/Throwable.c \
$(top_srcdir)/libraries/clib/native/gnu_classpath_VMStackWalker.c \
- $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c \
- $(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c \
- $(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c
+ $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
noinst_HEADERS = \
access.h \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.257 kaffe/kaffe/kaffevm/Makefile.in:1.258
--- kaffe/kaffe/kaffevm/Makefile.in:1.257 Wed Jan 3 23:02:09 2007
+++ kaffe/kaffe/kaffevm/Makefile.in Fri Jan 5 15:03:04 2007
@@ -89,9 +89,7 @@
am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(ENGINE_NAME)/libengine.la \
$(am__DEPENDENCIES_2) systems/$(THREAD_SYSTEM)/libkthread.la \
verifier/libkaffeverifier.la $(GC_NAME)/libkaffegc.la \
- jni/libkaffejni.la $(top_builddir)/replace/libreplace.la \
- $(top_builddir)/libraries/javalib/external/classpath/native/fdlibm/libfdlibm.la \
- $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la
+ jni/libkaffejni.la $(top_builddir)/replace/libreplace.la
@COND_SYSTEM_ZLIB_FALSE at am__DEPENDENCIES_4 = \
@COND_SYSTEM_ZLIB_FALSE@ ../../external/gcc/zlib/libz.la
@COND_SYSTEM_ZLIB_TRUE at am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
@@ -112,10 +110,7 @@
libkaffevm_la-javacall.lo libkaffevm_la-thread.lo \
libkaffevm_la-utf8const.lo libkaffevm_la-gcFuncs.lo \
libkaffevm_la-reflect.lo libkaffevm_la-reference.lo \
- libkaffevm_la-binreloc.lo \
- libkaffevm_la-gnu_java_nio_VMSelector.lo \
- libkaffevm_la-InetAddressImpl.lo \
- libkaffevm_la-NetworkInterface.lo \
+ libkaffevm_la-binreloc.lo libkaffevm_la-InetAddressImpl.lo \
libkaffevm_la-AccessController.lo \
libkaffevm_la-java_lang_ref_Reference.lo \
libkaffevm_la-java_lang_reflect_VMArray.lo \
@@ -127,9 +122,7 @@
libkaffevm_la-System.lo libkaffevm_la-java_lang_Thread.lo \
libkaffevm_la-Throwable.lo \
libkaffevm_la-gnu_classpath_VMStackWalker.lo \
- libkaffevm_la-gnu_classpath_VMSystemProperties.lo \
- libkaffevm_la-java_lang_VMDouble.lo \
- libkaffevm_la-java_lang_VMSystem.lo
+ libkaffevm_la-gnu_classpath_VMSystemProperties.lo
nodist_libkaffevm_la_OBJECTS = libkaffevm_la-md.lo
libkaffevm_la_OBJECTS = $(am_libkaffevm_la_OBJECTS) \
$(nodist_libkaffevm_la_OBJECTS)
@@ -397,9 +390,7 @@
-I$(top_srcdir)/kaffe/kaffevm/jni \
-I$(top_srcdir)/config/$(Khost_cpu) \
-I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \
- $(MAYBE_INTERNAL_ZIP_INCLUDES) \
- -I$(top_srcdir)/libraries/javalib/external/classpath/native/fdlibm \
- -I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath
+ $(MAYBE_INTERNAL_ZIP_INCLUDES)
native_LTLIBRARIES = libkaffevm.la
@HAVE_GCJ_SUPPORT_FALSE at libgcj = #
@@ -426,9 +417,7 @@
verifier/libkaffeverifier.la \
$(GC_NAME)/libkaffegc.la \
jni/libkaffejni.la \
- $(top_builddir)/replace/libreplace.la \
- $(top_builddir)/libraries/javalib/external/classpath/native/fdlibm/libfdlibm.la \
- $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la
+ $(top_builddir)/replace/libreplace.la
libkaffevm_la_LIBADD = \
$(libkaffevm_la_DEPENDENCIES) \
@@ -475,9 +464,7 @@
reflect.c \
reference.c \
binreloc.c \
- $(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c \
$(top_srcdir)/libraries/clib/net/InetAddressImpl.c \
- $(top_srcdir)/libraries/clib/net/NetworkInterface.c \
$(top_srcdir)/libraries/clib/native/AccessController.c \
$(top_srcdir)/libraries/clib/native/java_lang_ref_Reference.c \
$(top_srcdir)/libraries/clib/native/java_lang_reflect_VMArray.c \
@@ -495,9 +482,7 @@
$(top_srcdir)/libraries/clib/native/java_lang_Thread.c \
$(top_srcdir)/libraries/clib/native/Throwable.c \
$(top_srcdir)/libraries/clib/native/gnu_classpath_VMStackWalker.c \
- $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c \
- $(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c \
- $(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c
+ $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
noinst_HEADERS = \
access.h \
@@ -614,7 +599,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-Field.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-InetAddressImpl.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-Method.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-NetworkInterface.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-Runtime.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-System.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-Throwable.Plo at am__quote@
@@ -638,15 +622,12 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-gcFuncs.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-gnu_classpath_VMStackWalker.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-gnu_classpath_VMSystemProperties.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-hashtab.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-itypes.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-jar.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_Object.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_String.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_Thread.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_VMDouble.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_VMSystem.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_ref_Reference.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-java_lang_reflect_VMArray.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkaffevm_la-javacall.Plo at am__quote@
@@ -925,13 +906,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-binreloc.lo `test -f 'binreloc.c' || echo '$(srcdir)/'`binreloc.c
-libkaffevm_la-gnu_java_nio_VMSelector.lo: $(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-gnu_java_nio_VMSelector.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Tpo -c -o libkaffevm_la-gnu_java_nio_VMSelector.lo `test -f '$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Tpo $(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c' object='libkaffevm_la-gnu_java_nio_VMSelector.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-gnu_java_nio_VMSelector.lo `test -f '$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c
-
libkaffevm_la-InetAddressImpl.lo: $(top_srcdir)/libraries/clib/net/InetAddressImpl.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-InetAddressImpl.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-InetAddressImpl.Tpo -c -o libkaffevm_la-InetAddressImpl.lo `test -f '$(top_srcdir)/libraries/clib/net/InetAddressImpl.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/net/InetAddressImpl.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libkaffevm_la-InetAddressImpl.Tpo $(DEPDIR)/libkaffevm_la-InetAddressImpl.Plo
@@ -939,13 +913,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-InetAddressImpl.lo `test -f '$(top_srcdir)/libraries/clib/net/InetAddressImpl.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/net/InetAddressImpl.c
-libkaffevm_la-NetworkInterface.lo: $(top_srcdir)/libraries/clib/net/NetworkInterface.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-NetworkInterface.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-NetworkInterface.Tpo -c -o libkaffevm_la-NetworkInterface.lo `test -f '$(top_srcdir)/libraries/clib/net/NetworkInterface.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/net/NetworkInterface.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libkaffevm_la-NetworkInterface.Tpo $(DEPDIR)/libkaffevm_la-NetworkInterface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libraries/clib/net/NetworkInterface.c' object='libkaffevm_la-NetworkInterface.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-NetworkInterface.lo `test -f '$(top_srcdir)/libraries/clib/net/NetworkInterface.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/net/NetworkInterface.c
-
libkaffevm_la-AccessController.lo: $(top_srcdir)/libraries/clib/native/AccessController.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-AccessController.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-AccessController.Tpo -c -o libkaffevm_la-AccessController.lo `test -f '$(top_srcdir)/libraries/clib/native/AccessController.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/native/AccessController.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libkaffevm_la-AccessController.Tpo $(DEPDIR)/libkaffevm_la-AccessController.Plo
@@ -1071,20 +1038,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c' object='libkaffevm_la-gnu_classpath_VMSystemProperties.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-gnu_classpath_VMSystemProperties.lo `test -f '$(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
-
-libkaffevm_la-java_lang_VMDouble.lo: $(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-java_lang_VMDouble.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-java_lang_VMDouble.Tpo -c -o libkaffevm_la-java_lang_VMDouble.lo `test -f '$(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libkaffevm_la-java_lang_VMDouble.Tpo $(DEPDIR)/libkaffevm_la-java_lang_VMDouble.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c' object='libkaffevm_la-java_lang_VMDouble.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-java_lang_VMDouble.lo `test -f '$(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/native/java_lang_VMDouble.c
-
-libkaffevm_la-java_lang_VMSystem.lo: $(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-java_lang_VMSystem.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-java_lang_VMSystem.Tpo -c -o libkaffevm_la-java_lang_VMSystem.lo `test -f '$(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libkaffevm_la-java_lang_VMSystem.Tpo $(DEPDIR)/libkaffevm_la-java_lang_VMSystem.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c' object='libkaffevm_la-java_lang_VMSystem.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-java_lang_VMSystem.lo `test -f '$(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/native/java_lang_VMSystem.c
libkaffevm_la-md.lo: md.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-md.lo -MD -MP -MF $(DEPDIR)/libkaffevm_la-md.Tpo -c -o libkaffevm_la-md.lo `test -f 'md.c' || echo '$(srcdir)/'`md.c
Index: kaffe/kaffe/kaffevm/classMethod.c
diff -u kaffe/kaffe/kaffevm/classMethod.c:1.159 kaffe/kaffe/kaffevm/classMethod.c:1.160
--- kaffe/kaffe/kaffevm/classMethod.c:1.159 Sun Jun 11 23:12:10 2006
+++ kaffe/kaffe/kaffevm/classMethod.c Fri Jan 5 15:03:04 2007
@@ -87,6 +87,8 @@
struct Hjava_lang_Object *permissions;
struct Hjava_lang_Object *allPermission;
+ DBG(INIT, dprintf("initialiseSecurity()\n"); );
+
codeSource = execute_java_constructor ("java/security/CodeSource",
NULL,
NULL,
@@ -114,6 +116,7 @@
"(Ljava/security/CodeSource;Ljava/security/PermissionCollection;)V",
codeSource,
permissions);
+ DBG(INIT, dprintf("initialiseSecurity() done\n"); );
}
#if !defined(ALIGNMENT_OF_SIZE)
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.86 kaffe/kaffe/kaffevm/external.c:1.87
--- kaffe/kaffe/kaffevm/external.c:1.86 Wed Apr 19 23:07:44 2006
+++ kaffe/kaffe/kaffevm/external.c Fri Jan 5 15:03:04 2007
@@ -5,7 +5,7 @@
* Copyright (c) 1996, 1997, 1998, 1999
* Transvirtual Technologies, Inc. All rights reserved.
*
- * Copyright (c) 2004
+ * Copyright (c) 2004, 2007
* Kaffe.org contributors. See ChangeLogs for details. All rights reserved.
*
* See the file "license.terms" for information on usage and redistribution
@@ -180,6 +180,38 @@
}
/*
+ * Get pointer to symbol from symbol name.
+ */
+static
+void*
+loadNativeLibrarySymFromLib(struct _libHandle *lib, const char* name)
+{
+ void* func = NULL;
+
+ lockStaticMutex(&libraryLock);
+
+ func = KaffeLib_GetSymbol(lib->desc, name);
+
+DBG(NATIVELIB,
+ if (func == NULL) {
+ dprintf("Couldn't find %s in library %s.\nError message is %s.\n",
+ name,
+ lib->name,
+ KaffeLib_GetError());
+ }
+ else {
+ dprintf("Found %s in library %s.\n",
+ name,
+ lib->name);
+ }
+);
+
+ unlockStaticMutex(&libraryLock);
+
+ return func;
+}
+
+/*
* Link in a native library. If successful, returns an index >= 0 that
* can be passed to unloadNativeLibrary(). Otherwise, returns -1 and
* fills errbuf (if not NULL) with the error message. Assumes synchronization.
@@ -280,7 +312,7 @@
feedbackLibrary(path, true);
#endif
- func = loadNativeLibrarySym("JNI_OnLoad");
+ func = loadNativeLibrarySymFromLib(lib, "JNI_OnLoad");
if (func != NULL) {
JavaVM *jvm = KaffeJNI_GetKaffeVM();
/* Call JNI_OnLoad */
@@ -337,31 +369,10 @@
int i = 0;
void* func = NULL;
- lockStaticMutex(&libraryLock);
-
while (!func && i < MAXLIBS && libHandle[i].desc!=NULL) {
- func = KaffeLib_GetSymbol(libHandle[i].desc, name);
-
-DBG(NATIVELIB,
- if (func == NULL) {
- dprintf("Couldn't find %s in library handle %d == %s.\nError message is %s.\n",
- name,
- i,
- libHandle[i].name,
- KaffeLib_GetError());
- }
- else {
- dprintf("Found %s in library handle %d == %s.\n",
- name,
- i,
- libHandle[i].name);
- }
-);
-
+ func = loadNativeLibrarySymFromLib(&libHandle[i], name);
++i;
}
-
- unlockStaticMutex(&libraryLock);
return func;
}
Index: kaffe/kaffe/kaffevm/thread.c
diff -u kaffe/kaffe/kaffevm/thread.c:1.109 kaffe/kaffe/kaffevm/thread.c:1.110
--- kaffe/kaffe/kaffevm/thread.c:1.109 Sun Apr 16 07:20:14 2006
+++ kaffe/kaffe/kaffevm/thread.c Fri Jan 5 15:03:04 2007
@@ -88,6 +88,8 @@
static void
linkNativeAndJavaThread(jthread_t thread, Hjava_lang_VMThread *jlThread)
{
+ jnirefs *reftable;
+
threadData *thread_data = KTHREAD(get_data)(thread);
thread_data->jlThread = jlThread;
@@ -97,6 +99,13 @@
thread_data->jniEnv = &Kaffe_JNINativeInterface;
thread_data->needOnStack = STACK_HIGH;
+
+ /* Setup JNI for this newly attached thread */
+ reftable = (jnirefs *)gc_malloc(sizeof(jnirefs) + sizeof(jref) * DEFAULT_JNIREFS_NUMBER,
+ KGC_ALLOC_STATIC_THREADDATA);
+ reftable->frameSize = DEFAULT_JNIREFS_NUMBER;
+ reftable->localFrames = 1;
+ thread_data->jnireferences = reftable;
}
/*
@@ -253,7 +262,6 @@
Hjava_lang_Thread* tid;
jvalue retval;
int i;
- jnirefs *reftable;
DBG(VMTHREAD, dprintf("attachFakedThreadInstance(%s)\n", nm); );
@@ -313,13 +321,6 @@
do_execute_java_method(NULL, unhand(tid)->group, "addThread", "(Ljava/lang/Thread;)V", NULL, 0, tid);
DBG(VMTHREAD, dprintf("attachFakedThreadInstance(%s)=%p done\n", nm, tid); );
-
- /* Setup JNI for this newly attached thread */
- reftable = (jnirefs *)gc_malloc(sizeof(jnirefs) + sizeof(jref) * DEFAULT_JNIREFS_NUMBER,
- KGC_ALLOC_STATIC_THREADDATA);
- reftable->frameSize = DEFAULT_JNIREFS_NUMBER;
- reftable->localFrames = 1;
- THREAD_DATA()->jnireferences = reftable;
}
/*
Index: kaffe/kaffe/kaffevm/jni/jni-helpers.c
diff -u kaffe/kaffe/kaffevm/jni/jni-helpers.c:1.16 kaffe/kaffe/kaffevm/jni/jni-helpers.c:1.17
--- kaffe/kaffe/kaffevm/jni/jni-helpers.c:1.16 Fri Oct 6 18:50:58 2006
+++ kaffe/kaffe/kaffevm/jni/jni-helpers.c Fri Jan 5 15:03:04 2007
@@ -55,7 +55,7 @@
{
jobject buffer_obj = buffer;
jobject address_obj;
- void *address;
+ void *address = NULL;
Hjava_lang_Object *buffer_local;
BEGIN_EXCEPTION_HANDLING(NULL);
@@ -65,11 +65,11 @@
if (!instanceof(javaNioBufferClass, OBJECT_CLASS(buffer_local)))
{
printf("buffer_local is %s\n", OBJECT_CLASS(buffer_local)->name->data);
- address = NULL;
} else
{
address_obj = KNI_GET_FIELD(Hjava_lang_Object *, buffer_local, directByteBufferImplAddress);
- address = KNI_GET_FIELD(void *, address_obj, gnuClasspathPointerAddress);
+ if (NULL != address_obj)
+ address = KNI_GET_FIELD(void *, address_obj, gnuClasspathPointerAddress);
}
END_EXCEPTION_HANDLING();
Index: kaffe/libraries/clib/native/gnu_classpath_VMSystemProperties.c
diff -u kaffe/libraries/clib/native/gnu_classpath_VMSystemProperties.c:1.6 kaffe/libraries/clib/native/gnu_classpath_VMSystemProperties.c:1.7
--- kaffe/libraries/clib/native/gnu_classpath_VMSystemProperties.c:1.6 Mon May 22 15:21:42 2006
+++ kaffe/libraries/clib/native/gnu_classpath_VMSystemProperties.c Fri Jan 5 15:03:04 2007
@@ -5,14 +5,17 @@
* Transvirtual Technologies, Inc. All rights reserved.
* Copyright (c) 2003
* Mark J. Wielaard <mark at klomp.org>
- * Copyright (c) 2004
+ * Copyright (c) 2004, 2007
* Kaffe.org contributors. See ChangeLog for details.
*
* See the file "license.terms" for information on usage and redistribution
* of this file.
*/
-#include <jcl.h>
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
#include <locale.h>
#if defined(HAVE_PWD_H)
#include <pwd.h>
===================================================================
Checking out kaffe/libraries/clib/native/java_lang_VMDouble.c
RCS: /home/cvs/kaffe/kaffe/libraries/clib/native/Attic/java_lang_VMDouble.c,v
VERS: 1.6
***************
--- kaffe/libraries/clib/native/java_lang_VMDouble.c Fri Jan 5 15:04:09 2007
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,465 +0,0 @@
-/* VMDouble.c - java.lang.VMDouble native functions
- Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-#include <assert.h>
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "mprec.h"
-#include "fdlibm.h"
-#include "jcl.h"
-
-#include "java_lang_VMDouble.h"
-
-static jclass clsDouble;
-static jmethodID isNaNID;
-static jdouble NEGATIVE_INFINITY;
-static jdouble POSITIVE_INFINITY;
-static jdouble NaN;
-
-/*
- * Class: java_lang_VMDouble
- * Method: initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_VMDouble_initIDs (JNIEnv * env, jclass cls __attribute__ ((__unused__)))
-{
- jfieldID negInfID;
- jfieldID posInfID;
- jfieldID nanID;
-
- clsDouble = (*env)->FindClass (env, "java/lang/Double");
- if (clsDouble == NULL)
- {
- DBG ("unable to get class java.lang.Double\n") return;
- }
- clsDouble = (*env)->NewGlobalRef(env, clsDouble);
- if (clsDouble == NULL)
- {
- DBG ("unable to register class java.lang.Double as global ref\n") return;
- }
- isNaNID = (*env)->GetStaticMethodID (env, clsDouble, "isNaN", "(D)Z");
- if (isNaNID == NULL)
- {
- DBG ("unable to determine method id of isNaN\n") return;
- }
- negInfID = (*env)->GetStaticFieldID (env, clsDouble, "NEGATIVE_INFINITY", "D");
- if (negInfID == NULL)
- {
- DBG ("unable to determine field id of NEGATIVE_INFINITY\n") return;
- }
- posInfID = (*env)->GetStaticFieldID (env, clsDouble, "POSITIVE_INFINITY", "D");
- if (posInfID == NULL)
- {
- DBG ("unable to determine field id of POSITIVE_INFINITY\n") return;
- }
- nanID = (*env)->GetStaticFieldID (env, clsDouble, "NaN", "D");
- if (posInfID == NULL)
- {
- DBG ("unable to determine field id of NaN\n") return;
- }
- POSITIVE_INFINITY = (*env)->GetStaticDoubleField (env, clsDouble, posInfID);
- NEGATIVE_INFINITY = (*env)->GetStaticDoubleField (env, clsDouble, negInfID);
- NaN = (*env)->GetStaticDoubleField (env, clsDouble, nanID);
-
-#ifdef DEBUG
- fprintf (stderr, "java.lang.Double.initIDs() POSITIVE_INFINITY = %g\n",
- POSITIVE_INFINITY);
- fprintf (stderr, "java.lang.Double.initIDs() NEGATIVE_INFINITY = %g\n",
- NEGATIVE_INFINITY);
- fprintf (stderr, "java.lang.Double.initIDs() NaN = %g\n", NaN);
-#endif
-}
-
-/*
- * Class: java_lang_VMDouble
- * Method: doubleToLongBits
- * Signature: (D)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_VMDouble_doubleToLongBits
- (JNIEnv * env __attribute__ ((__unused__)),
- jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
-{
- jvalue val;
- jlong e, f;
-
- val.d = doubleValue;
-
- e = val.j & 0x7ff0000000000000LL;
- f = val.j & 0x000fffffffffffffLL;
-
- if (e == 0x7ff0000000000000LL && f != 0L)
- val.j = 0x7ff8000000000000LL;
-
- return val.j;
-}
-
-/*
- * Class: java_lang_VMDouble
- * Method: doubleToRawLongBits
- * Signature: (D)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_VMDouble_doubleToRawLongBits
- (JNIEnv * env __attribute__ ((__unused__)),
- jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
-{
- jvalue val;
-
- val.d = doubleValue;
-
- return val.j;
-}
-
-/*
- * Class: java_lang_VMDouble
- * Method: longBitsToDouble
- * Signature: (J)D
- */
-JNIEXPORT jdouble JNICALL
-Java_java_lang_VMDouble_longBitsToDouble
- (JNIEnv * env __attribute__ ((__unused__)),
- jclass cls __attribute__ ((__unused__)), jlong longValue)
-{
- jvalue val;
-
- val.j = longValue;
-
- return val.d;
-}
-
-/**
- * Parse a double from a char array.
- */
-static jdouble
-parseDoubleFromChars(JNIEnv * env, const char * buf)
-{
- char *endptr;
- jdouble val = 0.0;
- const char *p = buf, *end, *last_non_ws, *temp;
- int ok = 1;
-
-#ifdef DEBUG
- fprintf (stderr, "java.lang.VMDouble.parseDouble (%s)\n", buf);
-#endif
-
- /* Trim the buffer, similar to String.trim(). First the leading
- characters. */
- while (*p && *p <= ' ')
- ++p;
-
- /* Find the last non-whitespace character. This method is safe
- even with multi-byte UTF-8 characters. */
- end = p;
- last_non_ws = NULL;
- while (*end)
- {
- if (*end > ' ')
- last_non_ws = end;
- ++end;
- }
-
- if (last_non_ws == NULL)
- last_non_ws = p + strlen (p);
- else
- {
- /* Skip past the last non-whitespace character. */
- ++last_non_ws;
- }
-
- /* Check for infinity and NaN */
- temp = p;
- if (temp[0] == '+' || temp[0] == '-')
- temp++;
- if (strncmp ("Infinity", temp, (size_t) 8) == 0)
- {
- if (p[0] == '-')
- return NEGATIVE_INFINITY;
- return POSITIVE_INFINITY;
- }
- if (strncmp ("NaN", temp, (size_t) 3) == 0)
- return NaN;
-
- /* Skip a trailing `f' or `d'. */
- if (last_non_ws > p
- && (last_non_ws[-1] == 'f'
- || last_non_ws[-1] == 'F'
- || last_non_ws[-1] == 'd' || last_non_ws[-1] == 'D'))
- --last_non_ws;
-
- if (last_non_ws > p)
- {
- struct _Jv_reent reent;
- memset (&reent, 0, sizeof reent);
-
- val = _strtod_r (&reent, p, &endptr);
-
-#ifdef DEBUG
- fprintf (stderr, "java.lang.VMDouble.parseDouble val = %g\n", val);
- fprintf (stderr, "java.lang.VMDouble.parseDouble %i != %i ???\n",
- endptr, last_non_ws);
-#endif
- if (endptr != last_non_ws)
- ok = 0;
- }
- else
- ok = 0;
-
- if (!ok)
- {
- val = 0.0;
- JCL_ThrowException (env,
- "java/lang/NumberFormatException",
- "unable to parse double");
- }
-
- return val;
-}
-
-#define MAXIMAL_DECIMAL_STRING_LENGTH 64
-
-/**
- * Use _dtoa to print a double or a float as a string with the given precision.
- */
-static void
-dtoa_toString
-(char * buffer, jdouble value, jint precision, jboolean isFloat)
-{
- const int DTOA_MODE = 2;
- char result[MAXIMAL_DECIMAL_STRING_LENGTH];
- int decpt, sign;
- char *s, *d;
- int i;
-
- /* use mode 2 to get at the digit stream, all other modes are useless
- *
- * since mode 2 only gives us as many digits as we need in precision, we need to
- * add the digits in front of the floating point to it, if there is more than one
- * to be printed. That's the case if the value is going to be printed using the
- * normal notation, i.e. if it is 0 or >= 1.0e-3 and < 1.0e7.
- */
- int digits_in_front_of_floating_point = ceil(log10(value));
-
- if (digits_in_front_of_floating_point > 1 && digits_in_front_of_floating_point < 7)
- precision += digits_in_front_of_floating_point;
-
- _dtoa (value, DTOA_MODE, precision, &decpt, &sign, NULL, buffer, (int) isFloat);
-
- value = fabs (value);
-
- s = buffer;
- d = result;
-
- /* Handle negative sign */
- if (sign)
- *d++ = '-';
-
- /* Handle normal represenation */
- if ((value >= 1e-3 && value < 1e7) || (value == 0))
- {
- if (decpt <= 0)
- *d++ = '0';
- else
- {
- for (i = 0; i < decpt; i++)
- if (*s)
- *d++ = *s++;
- else
- *d++ = '0';
- }
-
*** Patch too long, truncated ***
More information about the kaffe
mailing list