/hg/icedtea6: 7 new changesets
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Wed Jan 18 04:04:10 PST 2012
changeset fc7a57de5179 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc7a57de5179
author: aph
date: Fri Jan 13 10:07:43 2012 -0500
Fix bytecode numbering of return_register_finalizer in
safe_dispatch_table. 2012-01-13 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/tools/mkbc.c (writeouttable): Add
numbering comments to bytecode output.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return):
Move safepoint before monitor is unlocked.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(safe_dispatch_table): Add comment. Correct order of
do_return_register_finalizer. Add numbering comments.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE):
New macro.
changeset 291293b66f4e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=291293b66f4e
author: aph
date: Fri Jan 13 15:14:21 2012 +0000
merge
changeset 2bbcc83417ae in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2bbcc83417ae
author: aph
date: Mon Jan 16 13:25:01 2012 -0500
2012-01-16 Andrew Haley <aph at redhat.com>
* Makefile.am (check-jdk): Restore the --samevm line that
was deleted by mistake in an earlier merge.
changeset f57f03c70b52 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f57f03c70b52
author: aph
date: Mon Jan 16 13:28:17 2012 -0500
2012-01-16 Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(asm_method_table): Add entry for
java.dyn.MethodHandles::invoke. (asm_generate_method_entry):
Replace constant 14 with calculation based on the size of
asm_method_table. Add some comments.
changeset 8d8dc4529419 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8d8dc4529419
author: aph
date: Tue Jan 17 10:41:44 2012 -0500
allow vm_fatal_error to be used as an entry point in
asm_method_table. 2012-01-17 Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(vm_fatal_error): Add an extra entry point at vm_fatal_error +
CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry
point in asm_method_table.
(putstatic_volatile_dw): Re-order register operands to
silence warning.
changeset 6c3ccf66f01b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6c3ccf66f01b
author: aph
date: Wed Jan 18 11:57:33 2012 +0000
Re-order register operands to silence warning. 2012-01-18 Xerxes
Ranby <xerxes at zafena.se>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(putstatic_volatile_dw): Re-order register operands to silence
warning.
changeset 876219858298 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=876219858298
author: aph
date: Wed Jan 18 12:03:17 2012 +0000
merge
diffstat:
ChangeLog | 72 +
Makefile.am | 8 +-
NEWS | 38 +-
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 4 +
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 580 +++++----
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 4 +-
arm_port/hotspot/tools/mkbc.c | 6 +-
patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 91 +
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 40 +
patches/openjdk/683768-System-tray-icon.patch | 79 -
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 +
11 files changed, 646 insertions(+), 369 deletions(-)
diffs (truncated from 1206 to 500 lines):
diff -r 79014132e844 -r 876219858298 ChangeLog
--- a/ChangeLog Tue Jan 10 16:47:52 2012 +0000
+++ b/ChangeLog Wed Jan 18 12:03:17 2012 +0000
@@ -1,3 +1,75 @@
+2012-01-18 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (putstatic_volatile_dw): Re-order register operands to silence
+ warning.
+
+2012-01-17 Andrew Haley <aph at redhat.com>
+
+ * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (vm_fatal_error): Add an extra entry point at vm_fatal_error +
+ CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry
+ point in asm_method_table.
+
+ (putstatic_volatile_dw): Re-order register operands to silence warning.
+
+2012-01-16 Andrew Haley <aph at redhat.com>
+
+ * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table):
+ Add entry for java.dyn.MethodHandles::invoke.
+ (asm_generate_method_entry): Replace constant 14 with calculation
+ based on the size of asm_method_table.
+ Add some comments.
+
+2012-01-16 Andrew Haley <aph at redhat.com>
+
+ * Makefile.am (check-jdk): Restore the --samevm line that was
+ deleted by mistake in an earlier merge.
+
+2012-01-13 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering
+ comments to bytecode output.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return):
+ Move safepoint before monitor is unlocked.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (safe_dispatch_table): Add comment.
+ Correct order of do_return_register_finalizer.
+ Add numbering comments.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE):
+ New macro.
+
+2012-01-17 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Mention backport.
+ * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch:
+ Backport of 6761072: new krb5 tests fail on multiple platforms
+
+2012-01-12 Danesh Dadachanji <ddadacha at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with
+ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch
+ * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it.
+ * patches/openjdk/683768-System-tray-icon.patch: Removed.
+ * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch:
+ New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows.
+
+2012-01-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add 1.10.5, 1.9.12 and 1.8.12
+ release notes. Remove duplicates from 1.11.
+
+2012-01-12 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Mention backport.
+ * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch:
+ Backport of 6764553:
+ com.sun.org.apache.xml.internal.security.utils.IdResolver is not
+ thread safe.
+
2012-01-10 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
diff -r 79014132e844 -r 876219858298 Makefile.am
--- a/Makefile.am Tue Jan 10 16:47:52 2012 +0000
+++ b/Makefile.am Wed Jan 18 12:03:17 2012 +0000
@@ -399,12 +399,14 @@
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
patches/openjdk/7103224-glibc_name_collision.patch \
patches/arm-debug.patch \
- patches/openjdk/683768-System-tray-icon.patch \
+ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/7102369-7094468-rmiregistry.patch \
patches/openjdk/6851973-kerberos.patch \
patches/openjdk/7091528-javadoc_class_files.patch \
patches/openjdk/7103725-ssl_beast_regression.patch \
- patches/openjdk/6706974-krb5_test_infrastructure.patch
+ patches/openjdk/6706974-krb5_test_infrastructure.patch \
+ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
+ patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -2171,7 +2173,7 @@
$${XVFB_RUN} \
$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/jdk/JTwork -r:test/jdk/JTreport \
- \
+ $${ICEDTEA_JTREG_OTHERVM:--samevm} \
-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
-exclude:$(abs_top_srcdir)/$(JTREG_DIR)/excludelist.jdk.jtx \
$(ICEDTEA_JTREG_OPTIONS) \
diff -r 79014132e844 -r 876219858298 NEWS
--- a/NEWS Tue Jan 10 16:47:52 2012 +0000
+++ b/NEWS Wed Jan 18 12:03:17 2012 +0000
@@ -14,6 +14,8 @@
* Backports
- 6706974: Add krb5 test infrastructure
+ - 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
+ - 6761072: new krb5 tests fail on multiple platforms
New in release 1.11 (2012-XX-XX):
@@ -27,7 +29,6 @@
- PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
- RH727195: Japanese font mappings are broken
- LP862286: Fix exception on trying to start PulseAudio playback
- - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell
- PR719: make distcheck should work in IcedTea6
* Import of OpenJDK6 b24
- S7099148: increment build number of hs20.0 to b12
@@ -348,8 +349,6 @@
- S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal
- S6708580: Java applications slow when EXA enabled
- S6986968: Crash on XIM server restart
- - S7034464: Support transparent large pages on Linux
- - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used
- S7018387: Xrender pipeline may leak GC's
- S7036754: Stroked quads sometimes contain NaN
- S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails.
@@ -385,11 +384,7 @@
- S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false"
- S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types
- S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
- - S7102369: remove java.rmi.server.codebase property parsing from registyimpl
- - S7094468: rmiregistry clean up
- - S6851973: ignore incoming channel binding if acceptor does not set one
- - S7091528: javadoc attempts to parse .class files
- - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
+ - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set
* ARM Port
- Ported to the EABI hard-fp model
- Locking for multi-core operation added.
@@ -457,6 +452,33 @@
- PR690: Shark fails to JIT using hs20.
- PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20.
+New in release 1.10.5 (2012-01-11):
+
+* Backports
+ - S7034464: Support transparent large pages on Linux
+ - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used
+ - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl
+ - S7094468, RH751203: rmiregistry clean up
+ - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
+ - S6851973, PR830: ignore incoming channel binding if acceptor does not set one
+ - S7091528: javadoc attempts to parse .class files
+
+New in release 1.9.12 (2012-01-11):
+
+* Backports
+ - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl
+ - S7094468, RH751203: rmiregistry clean up
+ - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
+ - S6851973, PR830: ignore incoming channel binding if acceptor does not set one
+
+New in release 1.8.12 (2012-01-11):
+
+* Backports
+ - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl
+ - S7094468, RH751203: rmiregistry clean up
+ - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
+ - S6851973, PR830: ignore incoming channel binding if acceptor does not set one
+
New in release 1.9.11 (2011-11-08):
* Security fixes
diff -r 79014132e844 -r 876219858298 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Tue Jan 10 16:47:52 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Wed Jan 18 12:03:17 2012 +0000
@@ -29,6 +29,10 @@
#define FAST_BYTECODES
#endif
+/* WARNING: If you change any of these bytecodes, you must also
+ change the safe_dispatch_table in cppInterpreter_arm.S to make it
+ match. */
+
nop = 0x00, 1
aconst_null = 0x01, 1
iconst_m1 = 0x02, 1
diff -r 79014132e844 -r 876219858298 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 10 16:47:52 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jan 18 12:03:17 2012 +0000
@@ -483,6 +483,19 @@
.set dispatch_state, dispatch_state + 1
.endm
+ @ This macro calls a user-supplied my_trace routine. It
+ @ passes the current JPC as argument zero. It can be safely
+ @ inserted at any point in the interpreter.
+ .macro TRACE
+ stmfd sp!, {r0, r1, r2, r3, r4, lr}
+ mrs r4, cpsr
+ mov r0, jpc
+ ldr r2, =my_trace
+ blx r2
+ msr cpsr, r4
+ ldmfd sp!, {r0, r1, r2, r3, r4, lr}
+ .endm
+
.macro DISPATCH_FINISH
.if dispatch_state == 0
.error "DISPATCH_FINISH without a DISPATCH_START or DISPATCH_STATE"
@@ -769,28 +782,35 @@
cmp r2, #0
bne 1f
- cmp r3, #14
+ cmp r3, #((3f-2f)/4) // i.e. sizeof asm_method_table
adrcc ip, asm_method_table
ldrcc r0, [ip, r3, lsl #2]
#endif // PRODUCT
1:
bx lr
+
+// This table must be kept in sync with
+// AbstractInterpreter::MethodKind. Note that every entry must have a
+// corresponding fast entry point at addr + CODE_ALIGN_SIZE.
asm_method_table:
- .word normal_entry
- .word normal_entry_synchronized
- .word native_entry
- .word native_entry_synchronized
- .word empty_entry
- .word accessor_entry
- .word normal_entry @ abstract entry
- .word normal_entry @ java_lang_math_sin
- .word normal_entry @ java_lang_math_cos
- .word normal_entry @ java_lang_math_tan
- .word normal_entry @ java_lang_math_abs
- .word normal_entry @ java_lang_math_sqrt
- .word normal_entry @ java_lang_math_log
- .word normal_entry @ java_lang_math_log10
-
+2:
+ .word normal_entry // method needs locals initialization
+ .word normal_entry_synchronized // method needs locals initialization & is synchronized
+ .word native_entry // native method
+ .word native_entry_synchronized // native method & is synchronized
+ .word empty_entry // empty method (code: _return)
+ .word accessor_entry // accessor method (code: _aload_0, _getfield, _(a|i)return)
+ .word normal_entry // abstract method (throws an AbstractMethodException)
+ .word vm_fatal_error // java.dyn.MethodHandles::invoke
+ .word normal_entry // implementation of java.lang.Math.sin (x)
+ .word normal_entry // implementation of java.lang.Math.cos (x)
+ .word normal_entry // implementation of java.lang.Math.tan (x)
+ .word normal_entry // implementation of java.lang.Math.abs (x)
+ .word normal_entry // implementation of java.lang.Math.sqrt (x)
+ .word normal_entry // implementation of java.lang.Math.log (x)
+ .word normal_entry // implementation of java.lang.Math.log10 (x)
+3:
+
ALIGN_CODE
native_entry_synchronized:
b fast_native_entry_synchronized
@@ -2137,11 +2157,11 @@
putstatic_volatile_dw:
DISPATCH_START 3
add ip, r2, r3
- POP tmp1, tmp2
+ POP tmp2, tmp1
DISPATCH_NEXT
StoreStoreBarrier
#ifndef __ARM_ARCH_7A__
- stm ip, {tmp1, tmp2}
+ stm ip, {tmp2, tmp1}
#else
// Data in tmp1 & tmp2, address in ip, r2 & r3 scratch
0: ldrexd r2, r3, [ip]
@@ -2501,6 +2521,7 @@
CACHE_CP
DISPATCH 1
+ ALIGN_CODE
vm_fatal_error:
adr r0, .fatal_filename
mov r1, #99
@@ -2508,6 +2529,13 @@
b breakpoint
.fatal_filename:
.ascii "[Optimsed Assembler Interpreter Loop]\000"
+
+// This extra entry point for vm_fatal_error (at vm_fatal_error +
+// CODE_ALIGN_SIZE) allows vm_fatal_error to be used as an entry point
+// in the asm_method_table.
+ ALIGN_CODE
+ b vm_fatal_error
+
ALIGN_WORD
Opcode aastore
@@ -4753,262 +4781,266 @@
#ifdef NOTICE_SAFEPOINTS
safe_dispatch_table:
- .word do_nop
- .word do_u4const_0
- .word do_iconst_N
- .word do_iconst_N
- .word do_iconst_N
- .word do_iconst_N
- .word do_iconst_N
- .word do_iconst_N
- .word do_iconst_N
- .word do_u8const_0
- .word do_lconst_1
- .word do_u4const_0
- .word do_fconst_1
- .word do_fconst_2
- .word do_u8const_0
- .word do_dconst_1
- .word do_bipush
- .word do_sipush
- .word do_ldc
- .word do_ldc_w
- .word do_ldc2_w
- .word do_u4load
- .word do_u8load
- .word do_u4load
- .word do_u8load
- .word do_u4load
- .word do_iload_0
- .word do_iload_0
- .word do_iload_0
- .word do_iload_0
- .word do_u8load_0
- .word do_u8load_1
- .word do_u8load_2
- .word do_u8load_3
- .word do_fload_0
- .word do_fload_0
- .word do_fload_0
- .word do_fload_0
- .word do_u8load_0
- .word do_u8load_1
- .word do_u8load_2
- .word do_u8load_3
- .word do_aload_0
- .word do_aload_0
- .word do_aload_0
- .word do_aload_0
- .word do_u4aload
- .word do_u8aload
- .word do_u4aload
- .word do_u8aload
- .word do_u4aload
- .word do_baload
- .word do_caload
- .word do_saload
- .word do_u4store
- .word do_u8store
- .word do_u4store
- .word do_u8store
- .word do_u4store
- .word do_u4store_0
- .word do_u4store_1
- .word do_u4store_2
- .word do_u4store_3
- .word do_u8store_0
- .word do_u8store_1
- .word do_u8store_2
- .word do_u8store_3
- .word do_u4store_0
- .word do_u4store_1
- .word do_u4store_2
- .word do_u4store_3
- .word do_u8store_0
- .word do_u8store_1
- .word do_u8store_2
- .word do_u8store_3
- .word do_u4store_0
- .word do_u4store_1
- .word do_u4store_2
- .word do_u4store_3
- .word do_u4astore
- .word do_u8astore
- .word do_u4astore
- .word do_u8astore
- .word do_aastore
- .word do_bastore
- .word do_u2astore
- .word do_u2astore
- .word do_jpop
- .word do_jpop2
- .word do_dup
- .word do_dup_x1
- .word do_dup_x2
- .word do_dup2
- .word do_dup2_x1
- .word do_dup2_x2
- .word do_swap
- .word do_iadd
- .word do_ladd
- .word do_fadd
- .word do_dadd
- .word do_isub
- .word do_lsub
- .word do_fsub
- .word do_dsub
- .word do_imul
- .word do_lmul
- .word do_fmul
- .word do_dmul
- .word do_idiv
- .word do_ldiv
- .word do_fdiv
- .word do_ddiv
- .word do_irem
- .word do_lrem
- .word do_frem
- .word do_drem
- .word do_ineg
- .word do_lneg
- .word do_fneg
- .word do_dneg
- .word do_ishl
- .word do_lshl
- .word do_ishr
- .word do_lshr
- .word do_iushr
- .word do_lushr
- .word do_iand
- .word do_land
- .word do_ior
- .word do_lor
- .word do_ixor
- .word do_lxor
- .word do_iinc
- .word do_i2l
- .word do_i2f
- .word do_i2d
- .word do_l2i
- .word do_l2f
- .word do_l2d
- .word do_f2i
- .word do_f2l
- .word do_f2d
- .word do_d2i
- .word do_d2l
- .word do_d2f
- .word do_i2b
- .word do_i2c
- .word do_i2s
- .word do_lcmp
- .word do_fcmpl
- .word do_fcmpg
- .word do_dcmpl
- .word do_dcmpg
- .word do_ifeq
- .word do_ifne
- .word do_iflt
- .word do_ifge
- .word do_ifgt
- .word do_ifle
- .word do_if_icmpeq
- .word do_if_icmpne
- .word do_if_icmplt
- .word do_if_icmpge
- .word do_if_icmpgt
- .word do_if_icmple
- .word do_if_icmpeq
- .word do_if_icmpne
- .word do_goto
- .word do_jsr
- .word do_ret
- .word do_tableswitch
- .word do_lookupswitch
- .word do_ireturn
- .word do_lreturn
- .word do_ireturn
- .word do_lreturn
- .word do_ireturn
- .word do_return
- .word do_getstatic
- .word do_putstatic
- .word do_getfield
- .word do_putfield
- .word do_invokevirtual
- .word do_invokespecial
- .word do_invokestatic
- .word do_invokeinterface
- .word do_undefined
More information about the distro-pkg-dev
mailing list