/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 10 05:49:13 PST 2009
changeset cee288574c85 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cee288574c85
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 23 13:37:20 2009 +0000
Reorganise Makefile.am to give a more logical and clear structure.
2009-11-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Reorganise to match IcedTea7 layout.
Add FIXMEs for targets which still need to be moved across.
changeset ac0296b09732 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ac0296b09732
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 23 13:38:58 2009 +0000
Merge
changeset bd7b2c162084 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bd7b2c162084
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 10 13:51:41 2009 +0000
Merge
diffstat:
173 files changed, 4545 insertions(+), 32442 deletions(-)
.hgignore | 1
ChangeLog | 266
HACKING | 27
Makefile.am | 2287 ++++----
acinclude.m4 | 132
configure.ac | 2
contrib/jck/compile-native-code.sh | 2
generated/sun/misc/Version.java | 4
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 131
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 1058 ---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 617 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 281 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java | 128
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 76
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 310 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java | 109
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java | 448 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java | 351 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java | 150
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java | 122
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 63
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 80
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java | 1287 ----
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 74
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 2695 ----------
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java | 748 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java | 45
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java | 44
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 120
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/LICENSE | 347 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java | 126
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java | 200
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 329 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 281 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java | 50
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 135
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java | 117
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java | 36
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java | 46
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java | 169
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java | 136
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 52
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 62
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java | 44
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java | 48
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java | 52
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java | 143
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java | 109
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 86
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 139
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java | 35
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java | 49
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt | 402 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 43
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 44
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java | 332 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java | 365 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 33
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java | 911 ---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 43
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java | 78
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 43
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java | 97
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java | 167
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java | 216
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java | 973 ---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 73
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java | 196
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java | 145
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 390 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 104
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java | 48
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 92
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 1556 -----
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 202
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 337 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java | 36
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 87
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 298 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 616 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java | 82
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 277 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 118
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java | 191
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 70
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 108
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 130
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 1029 ---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 214
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java | 539 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 522 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 259
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 529 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 66
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 519 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java | 775 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java | 63
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java | 41
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java | 51
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java | 83
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java | 35
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java | 38
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java | 515 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java | 58
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java | 139
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 1179 ----
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java | 256
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 851 ---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 339 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 166
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 147
patches/ecj/icedtea-hotspot.patch | 16
patches/icedtea-arch.patch | 10
patches/icedtea-bytecodeInterpreter.patch | 11
patches/icedtea-cc-interp-backedge.patch | 30
patches/icedtea-cc-interp-jvmti.patch | 13
patches/icedtea-core-build-hotspot.patch | 108
patches/icedtea-core-build.patch | 81
patches/icedtea-ia64-bugfix.patch | 16
patches/icedtea-ia64-fdlibm.patch | 12
patches/icedtea-libraries.patch | 4
patches/icedtea-linker-options.patch | 48
patches/icedtea-s390-serialize.patch | 15
patches/icedtea-shark-build-hotspot.patch | 213
patches/icedtea-shark-build.patch | 49
patches/icedtea-shark.patch | 20
patches/icedtea-signature-iterator.patch | 44
patches/icedtea-static-libstdc++.patch | 16
patches/icedtea-test-atomic-operations.patch | 25
patches/icedtea-uname.patch | 20
patches/icedtea-zero-build-hotspot.patch | 129
patches/icedtea-zero-build.patch | 205
patches/icedtea-zero.patch | 229
patches/zero/6890308.patch | 760 ++
patches/zero/6891677.patch | 418 +
patches/zero/6896043.patch | 113
patches/zero/6903453.patch | 38
platform_zero.in | 17
plugin/icedtea/sun/applet/PluginAppletViewer.java | 36
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 365 +
plugin/icedteanp/IcedTeaJavaRequestProcessor.h | 53
plugin/icedteanp/IcedTeaNPPlugin.cc | 4
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 652 --
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 1
plugin/icedteanp/IcedTeaPluginUtils.cc | 272 -
plugin/icedteanp/IcedTeaPluginUtils.h | 56
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 258
plugin/icedteanp/IcedTeaScriptablePluginObject.h | 12
plugin/icedteanp/java/netscape/javascript/JSObject.java | 7
plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 139
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 103
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 104
ports/hotspot/build/linux/makefiles/shark.make | 32
ports/hotspot/build/linux/makefiles/zero.make | 74
ports/hotspot/make/linux/makefiles/shark.make | 32
ports/hotspot/make/linux/makefiles/zero.make | 32
ports/hotspot/make/linux/makefiles/zeroshark.make | 76
ports/hotspot/make/linux/platform_zero.in | 17
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 5
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 93
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 12
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 5
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 2
ports/hotspot/src/share/vm/includeDB_zero | 55
rt/net/sourceforge/jnlp/JNLPFile.java | 8
rt/net/sourceforge/jnlp/Launcher.java | 2
rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 31
rt/net/sourceforge/jnlp/runtime/Boot.java | 5
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 2
rt/net/sourceforge/jnlp/util/XDesktopEntry.java | 5
diffs (truncated from 39495 to 500 lines):
diff -r d5f77a4c9214 -r bd7b2c162084 .hgignore
--- a/.hgignore Wed Nov 18 10:56:39 2009 -0500
+++ b/.hgignore Thu Dec 10 13:51:41 2009 +0000
@@ -31,7 +31,6 @@ rt-source-files.txt
rt-source-files.txt
hotspot-tools-source-files.txt
tools-source-files.txt
-platform_zero
jvm.cfg
ergo.c
tapset/hotspot.stp
diff -r d5f77a4c9214 -r bd7b2c162084 ChangeLog
--- a/ChangeLog Wed Nov 18 10:56:39 2009 -0500
+++ b/ChangeLog Thu Dec 10 13:51:41 2009 +0000
@@ -1,3 +1,269 @@ 2009-11-18 Gary Benson <gbenson at redhat
+2009-11-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Reorganise to match IcedTea7 layout.
+ Add FIXMEs for targets which still need
+ to be moved across.
+
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_SHARK_BUILD): Set to "yes" instead of "true".
+ (ICEDTEA_ENV): Replaced ICEDTEA_SHARK_BUILD with SHARK_BUILD.
+ (ICEDTEA_ENV_ECJ): Likewise.
+ * patches/icedtea-shark-build.patch: Changed to reflect the above.
+ * patches/icedtea-shark-build-hotspot.patch: Likewise.
+
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/platform_zero.in: New file.
+ * .hgignore: Updated.
+
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * HACKING: Updated.
+
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * patches/zero/6903453.patch: New file.
+ * patches/icedtea-ia64-fdlibm.patch: Removed.
+ * patches/icedtea-uname.patch: Fixed up.
+ * Makefile.am (ICEDTEA_PATCHES): Updated.
+
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * patches/zero/6896043.patch: New file.
+ * patches/icedtea-cc-interp-backedge.patch: Removed.
+ * patches/icedtea-cc-interp-jvmti.patch: Likewise.
+ * patches/icedtea-ia64-bugfix.patch: Likewise.
+ * patches/icedtea-s390-serialize.patch: Likewise.
+ * patches/icedtea-test-atomic-operations.patch: Likewise.
+ * Makefile.am (ICEDTEA_PATCHES): Updated.
+
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_CORE_BUILD): Removed.
+ (ICEDTEA_ZERO_BUILD): Set to "yes" instead of "true".
+ (ICEDTEA_ENV): Removed ICEDTEA_CORE_BUILD, replaced
+ ICEDTEA_ZERO_BUILD with ZERO_BUILD, and replaced ZERO_BITSPERWORD
+ with ARCH_DATA_MODEL.
+ (ICEDTEA_ENV_ECJ): Likewise.
+ (stamps/ports.stamp): Updated paths, and don't make jvm.cfg or
+ ergo_$arch.c for Zero.
+ (ICEDTEA_PATCHES): Added new patches and removed old ones.
+
+ * acinclude.m4
+ (ENABLE_ZERO_BUILD): Removed old CORE_BUILD stuff.
+ (SET_CORE_OR_SHARK_BUILD): Replaced with...
+ (SET_SHARK_BUILD): New macro.
+
+ * configure.ac: Use SET_SHARK_BUILD before ENABLE_ZERO_BUILD in
+ place of SET_CORE_OR_SHARK_BUILD after it.
+
+ * patches/zero/6890308.patch: New file.
+ * patches/zero/6891677.patch: Likewise.
+
+ * patches/icedtea-core-build.patch: Removed.
+ * patches/icedtea-core-build-hotspot.patch: Likewise.
+ * patches/icedtea-linker-options.patch: Likewise.
+ * patches/icedtea-signature-iterator.patch: Likewise.
+ * patches/icedtea-static-libstdc++.patch: Likewise.
+ * patches/icedtea-zero.patch: Likewise.
+ * patches/icedtea-zero-build.patch: Likewise.
+ * patches/icedtea-zero-build-hotspot.patch: Likewise.
+
+ * patches/ecj/icedtea-hotspot.patch: Updated.
+ * patches/icedtea-shark-build.patch: Likewise.
+ * patches/icedtea-shark-build-hotspot.patch: Likewise.
+
+ * patches/icedtea-arch.patch: Fixed up.
+ * patches/icedtea-libraries.patch: Likewise.
+ * patches/icedtea-shark.patch: Likewise.
+
+ * ports/hotspot/build/linux/makefiles/shark.make: Moved to...
+ * ports/hotspot/make/linux/makefiles/shark.make: New file.
+
+ * ports/hotspot/build/linux/makefiles/zero.make: Moved to...
+ * ports/hotspot/make/linux/makefiles/zeroshark.make: New file.
+
+ * ports/hotspot/make/linux/makefiles/zero.make: New file.
+ * ports/hotspot/src/share/vm/includeDB_zero: Likewise.
+
+ * ports/hotspot/make/linux/platform_zero.in: Removed.
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Sync with upstream.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Fixed up.
+
+2009-12-07 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/416:
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+ (CppInterpreter::native_entry): Always unlock synchronized
+ native methods prior to returning.
+
+2009-12-03 Man Lung Wong <mwong at redhat.com>
+
+ * rt/net/sourceforge/jnlp/JNLPFile.java
+ (JNLPFile): Download the jnlp file from the webspace it originated, if
+ it exists.
+ * rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+ (initialize): Enable desktop element and revise the list of fixme.
+ (addMenuAndDesktopEntries): No longer errors out when shortcut tag not
+ specified.
+ * rt/net/sourceforge/jnlp/runtime/Boot.java
+ (getFile): Launches the original jnlp file (i.e. if the file was
+ downloaded from http://icedtea.classpath.org, then it will launch the
+ one from http://icedtea.classpath.org).
+ * rt/net/sourceforge/jnlp/util/XDesktopEntry.java
+ (getContentsAsReader): Shortcut uses jnlp file in cache and launches
+ with system preferred javaws.
+
+2009-12-03 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-core-build.patch: Remove a very old workaround.
+
+2009-12-03 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-bytecodeInterpreter.patch: Removed.
+ * Makefile.am (ICEDTEA_PATCHES): Don't apply the above.
+ * HACKING: Document the above.
+
+2009-12-03 Gary Benson <gbenson at redhat.com>
+
+ * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/:
+ Removed.
+
+2009-12-02 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (newMessageOnBus): Fix error handling code. Add support for NewArray,
+ GetValue, and literal returns (primitives).
+ (getValue): New function. Requests the value of a field from Java,
+ converted to literal for primitives/boxable types.
+ (setSlot): Bypass NPVariant creation.
+ (newArray): New function, creates an array of given type on Java side.
+ (set): Use value directly instead of NPVariant.
+ (setStaticField): Same.
+ (getArrayTypeForJava): New function. Given a variant, returns what type of
+ array should be created to store that variant on Java side.
+ (createJavaObjectFromVariant): Added support for arrays.
+ (callStaticMethod): use direct values instead of NPVariants.
+ (callMethod): Same.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Updates as needed by
+ changes to IcedTeaJavaRequestProcessor.cc.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (GCJ_Destroy): Invalidate all NPObjects related to an instance.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (sendWindow): Use NPVariant address to store windows info on Java side,
+ rather than the corresponding NPObject address.
+ (call): Use IcedTeaPluginUtilities::javaResultToNPVariant for java var to
+ NPVariant conversion, rather than custom conversion.
+ (sendString): Use new AyncCallThreadData struct and
+ pluginthreadasynccall() for calls that need to be in main thread.
+ (setMember): Send value information directly to _setMember, and let it
+ sort out how to set values.
+ (convertToNPVariant): Moved to utilities class.
+ (sendMember): Deal with NPVariants instead of NPObjects.
+ (queue_processor): Add case for GetSlot (WIP).
+ (storeVariantInJava): Remove deprecated function.
+ (_setMember): Use javaResultToNPVariant to get a value loaded into a
+ variant. Deal with NPVariants instead of NPObjects.
+ (_getMember): Deal with NPVariants instead of NPObjects.
+ (_getString): New function. Returns toString values for variables.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Declare new _getString
+ function.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: Move object map from the plugin
+ request processor class.
+ (strSplit): For efficiency, reserve enough space for strings beforehand.
+ (getUTF8String): Same.
+ (printStringVector): Run only if in debug.
+ (removeInstanceID): New function to remove mapping between an object and
+ an instance.
+ (invalidateInstance): New function. Removes all mappings from objects to
+ the given instance.
+ (getNPObjectFromJavaKey): New function. Given a java object key, returns
+ the corresponding JS object, if any.
+ (storeObjectMapping): New function. Stores a mapping between Java
+ objects and JS objects (peering).
+ (removeObjectMapping): New function. Removes peering between JS object and
+ Java object.
+ (printStringPtrVector): Run only if in debug.
+ (printNPVariant): Same.
+ (NPVariantToString): Store result in provided parameter.
+ (javaResultToNPVariant): New function, moved from
+ IcedTeaScriptablePluginObject.
+ (isObjectJSArray): New function. Returns if given NPObject represents an
+ array.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Misc. changes as needed by
+ updates to IcedTeaPluginUtils.cc.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Move object_map to
+ utilities class.
+ (getProperty): Supply instance id to findClass.
+ (get_scriptable_java_object): Use the new
+ getNPObjectFromJavaKey/storeObjectMapping functions in the utilities
+ class. Also, create object asynchronously.
+ (_createAndRetainJavaObject): New function. Creates a scriptable Java
+ object and increments reference count.
+ (is_valid_java_object): New function. Returns if the given object is still
+ valid.
+ (invalidate): Remove instance and Java side object mapping for given
+ object.
+ (javaResultToNPVariant): Moved to utilities class.
+ (invoke): Create variants peer on Java side before calling
+ callMethod/callStaticMethod.
+ (setProperty): Create variant peers on Java side before calling
+ setField/setStaticField.
+ (construct): Create variant peers on Java side before calling the
+ constructor.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Misc. changes as
+ needed by updates to IcedTeaScriptablePluginObject.cc.
+ * plugin/icedteanp/java/netscape/javascript/JSObject.java: Added a new
+ string constructor.
+ * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
+ (getCostAndCastedObject): Add support for array type parameters.
+ (isNum): Return true for boolean (booleans are convertible to int as per
+ spec).
+ (getNum): Remove case for char/Character.
+ (getArrayAsString): New function. For debug only.
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+ (handleMessage): Add support for getValue. Wire in array creaion support.
+ Support a '[System]' source for privileged calls.
+ (isInt): New function. Returns if given object is an integer/convertible to
+ an int.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (setMember): Send primitive/boxable values as literals.
+ (setSlot): Same.
+ (getWindow): Fortify condition for wait for panel initialization.
+ (parse): Handle nested objected tags, don't allow parameter value
+ overwrite.
+
+2009-11-27 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java
+ (getWindow): Fortify condition for wait for panel initialization.
+ (parse): Handle nested objected tags, don't allow parameter value
+ overwrite.
+ * rt/net/sourceforge/jnlp/Launcher.java
+ (createApplet): Set context classloader for the thread to the applet's
+ classloader, so that getContextClassLoader calls succeed.
+
+2009-11-25 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
+ (ZeroEntry::entry_point): Removed explicit inline.
+ (ZeroEntry::invoke): Likewise.
+ (ZeroEntry::invoke_osr): Likewise.
+
+2009-11-23 Gary Benson <gbenson at redhat.com>
+
+ * contrib/jck/compile-native-code.sh: Support s390x.
+
2009-11-18 Gary Benson <gbenson at redhat.com>
* patches/icedtea-shark.patch
diff -r d5f77a4c9214 -r bd7b2c162084 HACKING
--- a/HACKING Wed Nov 18 10:56:39 2009 -0500
+++ b/HACKING Thu Dec 10 13:51:41 2009 +0000
@@ -19,7 +19,6 @@ The following patches are currently appl
* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
-* icedtea-core-build.patch: Add support for building IcedTea core VM.
* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
* icedtea-demos.patch: Fix building of JVMTI demo.
* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
@@ -28,7 +27,6 @@ The following patches are currently appl
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
-* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
* icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files.
* icedtea-javafiles.patch: Add missing Java files to list.
* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
@@ -36,7 +34,6 @@ The following patches are currently appl
* icedtea-lcms-2.patch: Temporary fix for https://bugs.openjdk.java.net/show_bug.cgi?id=100050.
* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
* icedtea-libraries.patch: Use system JPEG and zlib libraries.
-* icedtea-linker-options.patch: Add -Xlinker option when linking.
* icedtea-memory-limits.patch: Increase default memory limits.
* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
@@ -47,7 +44,6 @@ The following patches are currently appl
* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
-* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
@@ -55,7 +51,6 @@ The following patches are currently appl
* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
* icedtea-webservices.patch: Add applet support.
-* icedtea-zero-build.patch: Add support for the zero assembler build.
* icedtea-shark-build.patch: Add support for building the Shark JIT.
* icedtea-alpha-fixes.patch: Fix build issues on alpha-linux.
* icedtea-arch.patch: Add support for additional architectures.
@@ -74,14 +69,12 @@ The following patches are currently appl
* icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
* icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
* icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
-* icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
* icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo.
* icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings.
* icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot when DISABLE_PRECOMPILED_HEADER is set.
* icedtea-includedb.patch: Add missing include files.
* icedtea-awt-window-size.patch: Fix X11 window size calculation (S6721088).
* icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344).
-* icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS.
* icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295).
* icedtea-jtreg-6592792.patch: Fix jtreg test for bug 6592792 so that it compiles.
* icedtea-s390-noinline.patch: Add special flags for javac on s390 to work around a VM problem with bad code generation during inlining.
@@ -99,14 +92,7 @@ The following patches are currently appl
* icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier when building with GCC 4.4 (cacao PR129).
-
-* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
-* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
-* icedtea-signature-iterator.patch: Add zero-specific signature handling.
-* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
-* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
* icedtea-shark.patch: Add support for the Shark JIT.
-* icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390.
* icedtea-xshm.patch: Support newer X11 headers for awt_GraphicsEnv.h.
The following patches are only applied to OpenJDK6 in IcedTea6:
@@ -177,3 +163,16 @@ changes to the OpenJDK code base and/or
* icedtea-core-zero-build.patch: Not required with HS14.
* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14.
* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14.
+* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. Not required with HS14.
+* icedtea-signature-iterator.patch: Add zero-specific signature handling. Obsoleted by zero/6890308.patch.
+* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64. Obsoleted by zero/6890308.patch.
+* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts. Obsoleted by zero/6890308.patch.
+* icedtea-core-build.patch: Add support for building IcedTea core VM. Obsoleted by zero/6891677.patch.
+* icedtea-linker-options.patch: Add -Xlinker option when linking. Obsoleted by zero/6891677.patch.
+* icedtea-zero-build.patch: Add support for the zero assembler build. Obsoleted by zero/6891677.patch.
+* icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS. Obsoleted by zero/6896043.patch.
+* icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter. Obsoleted by zero/6896043.patch.
+* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. Obsoleted by zero/6896043.patch.
+* icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390. Obsoleted by zero/6896043.patch.
+* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works. Obsoleted by zero/6896043.patch.
+* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64. Obsoleted by zero/6903453.patch.
diff -r d5f77a4c9214 -r bd7b2c162084 Makefile.am
--- a/Makefile.am Wed Nov 18 10:56:39 2009 -0500
+++ b/Makefile.am Thu Dec 10 13:51:41 2009 +0000
@@ -1,13 +1,116 @@ OPENJDK_DATE = 14_oct_2009
+# Dependencies
+
OPENJDK_DATE = 14_oct_2009
OPENJDK_MD5SUM = 078fe0ab744c98694decc77f2456c560
OPENJDK_VERSION = b17
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = c5e6525c5212ddbb6026e4a7cde37ca6
+CACAO_BASE_URL = http://www.complang.tuwien.ac.at
+CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380
+NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
+NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz
+
VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
-
+VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/
+VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
+
+OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
+
+# Build directories
+
+OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
+BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR)
+ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/build/$(OS_DIR)
+ICEDTEA_BUILD_DIR = \
+ $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
+# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
+# name is completely irrelevant; only contains the plugs to build IcedTea.
+ICEDTEA_RT = \
+ $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+ICEDTEA_CLS_DIR = \
+ $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
+ICEDTEA_BOOT_DIR= \
+ $(abs_top_builddir)/bootstrap/jdk1.6.0
+ICEDTEA_ENDORSED_DIR = \
+ $(ICEDTEA_BOOT_DIR)/lib/endorsed
+ICEDTEA_BUILD_DIR_ECJ = \
+ $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/
+ICEDTEA_CLS_DIR_ECJ = \
+ $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/classes
+SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
+BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+
+# Source directories
+
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
+LANGTOOLS = openjdk/langtools/src/share/classes
+JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
+JAXWS = openjdk/jaxws/src/share/classes
+
+# FIXME (netx): NetX source directories go here
+
+OPENJDK_SOURCEPATH_DIRS = \
+ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+
+ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
+
+# Sources copied from OpenJDK.
+ICEDTEA_COPY_DIRS = \
+ com/sun/jdi \
+ com/sun/jdi/connect \
+ com/sun/jdi/connect/spi \
+ com/sun/jdi/event \
+ com/sun/jdi/request \
+ com/sun/jmx/snmp/agent \
+ com/sun/tools/jdi \
+ java/io \
+ java/util \
+ java/rmi \
+ sun/awt/ \
+ javax/net/ssl \
+ javax/script
+
+# FIXME (javac): Settings for javac go here
+
+# Conditional defintions
+
+if USE_ALT_OPENJDK_SRC_ZIP
+ OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
+else
+if USE_HG
+ OPENJDK_SRC_ZIP =
+else
+ OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+endif
+endif
+
+if USE_ALT_HOTSPOT_SRC_ZIP
+ HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP)
+else
+ HOTSPOT_SRC_ZIP = hotspot.tar.gz
+endif
+
+if USE_ALT_CACAO_SRC_ZIP
+ CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
+else
+if USE_ALT_CACAO_SRC_DIR
+ CACAO_SRC_ZIP = "not needed"
+else
+ CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+endif
+endif
+
+# FIXME (HotSpot): HotSpot changeset logic goes here
+
+# FIXME (plugin): LIVECONNECT_DIR becomes sun/applet netscape
+# FIXME (plugin): NPPLUGIN_DIR becomes PLUGIN_DIR
if ENABLE_NPPLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
@@ -58,469 +161,45 @@ PULSE_JAVA_CLASS_DIR =
PULSE_JAVA_CLASS_DIR =
endif
+# FIXME (HotSpot): no longer needed
More information about the distro-pkg-dev
mailing list