/hg/icedtea6-hg: 17 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 15 07:52:32 PST 2012
changeset 7783ee7c13b2 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7783ee7c13b2
author: aph
date: Thu Jan 19 07:16:03 2012 -0500
Pass stackdepth to Thumb2_Safepoint. 2012-01-19 Andrew Haley
<aph at redhat.com>
* openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_Safepoint): Add comment. (Thumb2_Return): Pass
stackdepth to Thumb2_Safepoint. (Thumb2_codegen): Pass
stackdepth to Thumb2_Return.
changeset abd30eaff5fc in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=abd30eaff5fc
author: Xerxes Ranby <xerxes at zafena.se>
date: Thu Jan 19 17:33:20 2012 +0100
Disable T2-JIT on unsupported targets like armv5.
2012-01-19 Xerxes R?nby <xerxes at zafena.se> Andrew
Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5.
changeset fee509c4b992 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fee509c4b992
author: aph
date: Fri Jan 20 10:51:50 2012 -0500
Rewrite disassembler to use the OpenJDK hsdis framework. 2012-01-20
Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Whole
file): use PrintAssembly rather than t2ee_print_disass.
(t2ee_print_disass): Delete. (class Hsdis):Rename. (Was
class Opcodes.) Rewrite to use the OpenJDK hsdis framework.
(Thumb2_disass): move Hsdis here from global scope. Rewrite
to use the OpenJDK hsdis framework.
* patches/arm-hsdis.patch: New file.
* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-hsdis.patch.
changeset 1471221c3104 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1471221c3104
author: aph
date: Fri Jan 20 14:04:34 2012 -0500
Return NULL to fix disassembler. 2012-01-20 Andrew Haley
<aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
(print_address): Return NULL;
changeset 825402ba63cb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=825402ba63cb
author: aph
date: Mon Jan 23 09:49:12 2012 -0500
Minor tweaks to ARM hsdis patch. 2012-01-23 Andrew Haley
<aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_disass): Minor tidying.
* patches/arm-hsdis.patch: Make test for ARM more generic.
changeset 6179ebaffe6b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6179ebaffe6b
author: aph
date: Mon Jan 23 16:43:01 2012 +0000
Add cast to silence warning. 2012-01-23 Andrew Haley
<aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
(print_address): Add cast to silence warning.
changeset 80c34531aba3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=80c34531aba3
author: aph
date: Thu Jan 26 07:27:15 2012 -0500
ARM: Fix safepoints in backward branches. 2012-01-25 Andrew Haley
<aph at redhat.com>
* openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_Branch): Remove safepoint code.
(Thumb2_Cond_Safepoint): New function. (Thumb2_codegen):
Call Thumb2_Cond_Safepoint() from two places.
changeset ddca483b3ed9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ddca483b3ed9
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Jan 30 18:26:56 2012 -0500
Fixed build with GCC 4.7
changeset 845a28acf5c9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=845a28acf5c9
author: aph
date: Tue Jan 31 07:17:17 2012 -0500
2012-01-27 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis):
Set decode_instructions = NULL.
changeset e9550af57b57 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e9550af57b57
author: aph
date: Tue Jan 31 07:19:24 2012 -0500
DECACHE_JPC in return_check_monitors 2012-01-31 Andrew Haley
<aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(return_check_monitors): DECACHE_JPC so that the saved bytecode
pointer is correct for the GC.
changeset efaffd693af8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=efaffd693af8
author: aph
date: Tue Jan 31 12:21:44 2012 +0000
merge
changeset b442e48932cf in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b442e48932cf
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 01 15:15:10 2012 +0000
Sync 1.11 NEWS with 1.11 branch.
2012-02-01 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Sync with 1.11 branch.
changeset 1b4551008907 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1b4551008907
author: Omair Majid <omajid at redhat.com>
date: Thu Feb 02 11:08:59 2012 -0500
PR865 - Patching fails with patches/ecj/jaxws-getdtdtype.patch
Changeset 380a9db76b36 removed the security patch from the list of
patches to apply but did not update this patch.
2012-02-02 Omair Majid <omajid at redhat.com>
PR865 - Patching fails with patches/ecj/jaxws-getdtdtype.patch
* NEWS: Update with fix.
* patches/ecj/jaxws-getdtdtype.patch: Update to apply correctly.
changeset 3c02d4ef4cdd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3c02d4ef4cdd
author: Omair Majid <omajid at redhat.com>
date: Tue Feb 14 17:23:54 2012 -0500
Add NEWS updates from 1.11.1
changeset 732c38c83893 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=732c38c83893
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 15 15:45:49 2012 +0000
Add security patches.
2012-02-08 Omair Majid <omajid at redhat.com>
* NEWS: Update with security fixes.
* Makefile.am (SECURITY_PATCHES): Add security patches.
(SPECIAL_SECURITY_PATCH): Add new variable.
(ICEDTEA_PATCHES): Add security patch that epends on backport.
* patches/security/20120214/7082299.patch,
* patches/security/20120214/7088367.patch,
* patches/security/20120214/7110683.patch,
* patches/security/20120214/7110687.patch,
* patches/security/20120214/7110700.patch,
* patches/security/20120214/7110704.patch,
* patches/security/20120214/7112642.patch,
* patches/security/20120214/7118283.patch,
* patches/security/20120214/7126960.patch: New security fixes.
changeset 49f9beb1f03c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=49f9beb1f03c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 15 15:48:21 2012 +0000
Add 1.8.13, 1.9.13 and 1.10.6 release notes.
2012-02-15 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Bring in 1.8.13, 1.9.13 and 1.10.6 release
notes.
changeset 1543f51ced0d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1543f51ced0d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 15 15:52:18 2012 +0000
Merge
diffstat:
ChangeLog | 123 +
Makefile.am | 24 +-
NEWS | 73 +-
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 +
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 196 +-
patches/arm-hsdis.patch | 88 +
patches/ecj/icedtea.patch | 87 +-
patches/ecj/jaxws-getdtdtype.patch | 4 +-
patches/openjdk/6633275-shaped_translucent_windows.patch | 7 -
patches/openjdk/6725214-direct3d-01.patch | 7 -
patches/openjdk/6851973-kerberos.patch | 200 --
patches/openjdk/7091528-javadoc_class_files.patch | 187 --
patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ------
patches/openjdk/7103725-ssl_beast_regression.patch | 21 -
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 11 +
patches/openjdk/remove-mimpure-option-to-gcc.patch | 150 ++
patches/security/20120214/7082299.patch | 200 ++
patches/security/20120214/7088367.patch | 43 +
patches/security/20120214/7110683.patch | 169 ++
patches/security/20120214/7110687.patch | 232 +++
patches/security/20120214/7110700.patch | 41 +
patches/security/20120214/7110704.patch | 60 +
patches/security/20120214/7112642.patch | 744 ++++++++++
patches/security/20120214/7118283.patch | 26 +
patches/security/20120214/7126960.patch | 80 +
25 files changed, 2196 insertions(+), 1044 deletions(-)
diffs (truncated from 3923 to 500 lines):
diff -r 876219858298 -r 1543f51ced0d ChangeLog
--- a/ChangeLog Wed Jan 18 12:03:17 2012 +0000
+++ b/ChangeLog Wed Feb 15 15:52:18 2012 +0000
@@ -1,3 +1,121 @@
+2012-02-15 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Bring in 1.8.13, 1.9.13 and 1.10.6
+ release notes.
+
+2012-02-08 Omair Majid <omajid at redhat.com>
+
+ * NEWS: Update with security fixes.
+ * Makefile.am
+ (SECURITY_PATCHES): Add security patches.
+ (SPECIAL_SECURITY_PATCH): Add new variable.
+ (ICEDTEA_PATCHES): Add security patch that epends on backport.
+ * patches/security/20120214/7082299.patch,
+ * patches/security/20120214/7088367.patch,
+ * patches/security/20120214/7110683.patch,
+ * patches/security/20120214/7110687.patch,
+ * patches/security/20120214/7110700.patch,
+ * patches/security/20120214/7110704.patch,
+ * patches/security/20120214/7112642.patch,
+ * patches/security/20120214/7118283.patch,
+ * patches/security/20120214/7126960.patch: New security fixes.
+
+2012-02-14 Omair Majid <omajid at redhat.com>
+
+ * NEWS: Update with 1.11.1 changes.
+
+2012-02-02 Omair Majid <omajid at redhat.com>
+
+ PR865 - Patching fails with patches/ecj/jaxws-getdtdtype.patch
+ * NEWS: Update with fix.
+ * patches/ecj/jaxws-getdtdtype.patch: Update to apply correctly.
+
+2012-02-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Sync with 1.11 branch.
+
+2012-01-31 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (return_check_monitors): DECACHE_JPC so that the saved bytecode
+ pointer is correct for the GC.
+
+2012-01-30 Deepak Bhole <dbhole at redhat.com>
+
+ Added patches to fix building with GCC 4.7
+ * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch:
+ New patch. Makes methods return NULL instead of boolean when they return a
+ pointer.
+ * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes
+ the invalid -mimpure-text option to GCC.
+
+2012-01-27 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set
+ decode_instructions = NULL.
+
+2012-01-25 Andrew Haley <aph at redhat.com>
+
+ * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch):
+ Remove safepoint code.
+ (Thumb2_Cond_Safepoint): New function.
+ (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places.
+
+2012-01-23 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add
+ cast to silence warning.
+
+2012-01-19 Xerxes RÃ¥nby <xerxes at zafena.se>
+ Andrew Haley <aph at redhat.com>
+
+ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
+ (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5.
+
+2012-01-23 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass):
+ Minor tidying.
+ * patches/arm-hsdis.patch: Make test for ARM more generic.
+
+2012-01-20 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address):
+ Return NULL;
+
+2012-01-20 Andrew Haley <aph at redhat.com>
+
+ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
+ (Whole file): use PrintAssembly rather than t2ee_print_disass.
+ (t2ee_print_disass): Delete.
+ (class Hsdis):Rename. (Was class Opcodes.)
+ Rewrite to use the OpenJDK hsdis framework.
+ (Thumb2_disass): move Hsdis here from global scope.
+ Rewrite to use the OpenJDK hsdis framework.
+ * patches/arm-hsdis.patch: New file.
+ * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-hsdis.patch.
+
+2012-01-19 Andrew Haley <aph at redhat.com>
+
+ * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp
+ (Thumb2_Safepoint): Add comment.
+ (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint.
+ (Thumb2_codegen): Pass stackdepth to Thumb2_Return.
+
+2012-01-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6851973-kerberos.patch,
+ * patches/openjdk/7091528-javadoc_class_files.patch,
+ * patches/openjdk/7102369-7094468-rmiregistry.patch,
+ * patches/openjdk/7103725-ssl_beast_regression.patch:
+ Dropped; upstream.
+ * Makefile.am: Remove dropped patches.
+ * patches/ecj/icedtea.patch: Updated due to 6790292.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6725214-direct3d-01.patch:
+ Remove copyright notice changes broken as a result of the annoying
+ 7128474 change.
+
2012-01-18 Xerxes RÃ¥nby <xerxes at zafena.se>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
@@ -1682,6 +1800,11 @@
2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+ * Makefile.am:
+ Bump to b25 (next version in hg).
+
+2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+
* NEWS:
Remove inaccurate line about ARM assembler.
diff -r 876219858298 -r 1543f51ced0d Makefile.am
--- a/Makefile.am Wed Jan 18 12:03:17 2012 +0000
+++ b/Makefile.am Wed Feb 15 15:52:18 2012 +0000
@@ -2,7 +2,7 @@
OPENJDK_DATE = 14_nov_2011
OPENJDK_SHA256SUM = f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
-OPENJDK_VERSION = b24
+OPENJDK_VERSION = b25
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = cff92704c4e0
@@ -201,7 +201,17 @@
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES =
+SECURITY_PATCHES = \
+ patches/security/20120214/7082299.patch \
+ patches/security/20120214/7088367.patch \
+ patches/security/20120214/7110683.patch \
+ patches/security/20120214/7110687.patch \
+ patches/security/20120214/7110700.patch \
+ patches/security/20120214/7110704.patch \
+ patches/security/20120214/7118283.patch \
+ patches/security/20120214/7126960.patch
+
+SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
@@ -218,6 +228,7 @@
patches/openjdk/6725214-direct3d-01.patch \
patches/openjdk/6748082-isDisplayLocal.patch \
patches/openjdk/6633275-shaped_translucent_windows.patch \
+ $(SPECIAL_SECURITY_PATCH) \
patches/openjdk/6769607-modal-hangs.patch \
patches/openjdk/6791612-opengl-jni-fix.patch \
patches/openjdk/6755274-glgetstring-crash.patch \
@@ -399,14 +410,13 @@
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
patches/openjdk/7103224-glibc_name_collision.patch \
patches/arm-debug.patch \
+ patches/arm-hsdis.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/6764553-IdResolver_is_not_thread_safe.patch \
- patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch
+ patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
+ patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
+ patches/openjdk/remove-mimpure-option-to-gcc.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 876219858298 -r 1543f51ced0d NEWS
--- a/NEWS Wed Jan 18 12:03:17 2012 +0000
+++ b/NEWS Wed Feb 15 15:52:18 2012 +0000
@@ -12,17 +12,81 @@
New in release 1.12 (2012-XX-XX):
+* Bug fixes
+ - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
* 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
+ - S6706974: Add krb5 test infrastructure
+ - S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
+ - S6761072: new krb5 tests fail on multiple platforms
-New in release 1.11 (2012-XX-XX):
+New in release 1.10.6 (2012-02-14):
+
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - RH580478: Desktop files should not use hardcoded path
+
+New in release 1.9.13 (2012-02-14):
+
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - RH580478: Desktop files should not use hardcoded path
+
+New in release 1.8.13 (2012-02-14):
+
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - RH580478: Desktop files should not use hardcoded path
+
+New in release 1.11.1 (2012-02-14):
+
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: (httpserver) Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+
+New in release 1.11 (2012-01-30):
* Use HotSpot 20 as the default virtual machine.
* ARM assembly language port reinstated and updated; details below.
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x.
+* Shark has been disabled
+* Fixed build with GCC 4.7
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- PR752: ImageFormatException extends Exception not RuntimeException
@@ -385,6 +449,7 @@
- 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
- S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set
+ - S7140882: Don't return booleans from methods returning pointers
* ARM Port
- Ported to the EABI hard-fp model
- Locking for multi-core operation added.
diff -r 876219858298 -r 1543f51ced0d arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jan 18 12:03:17 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Feb 15 15:52:18 2012 +0000
@@ -3576,6 +3576,7 @@
return_check_monitors:
stmdb arm_sp!, {r4, lr}
+ DECACHE_JPC
ldr r2, [istate, #ISTATE_METHOD]
ldr r4, [r2, #METHOD_ACCESSFLAGS]
tst r4, #1<<5
diff -r 876219858298 -r 1543f51ced0d arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 18 12:03:17 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Feb 15 15:52:18 2012 +0000
@@ -38,10 +38,6 @@
static char *t2ee_print_statistics;
#endif
-#ifdef T2EE_PRINT_DISASS
-static char *t2ee_print_disass;
-#endif
-
#ifdef T2EE_PRINT_REGUSAGE
static char *t2ee_print_regusage;
#endif
@@ -56,11 +52,6 @@
#include "precompiled.hpp"
#include "interpreter/bytecodes.hpp"
-#ifdef T2EE_PRINT_DISASS
-#include "dis-asm.h"
-#include "bfd.h"
-#endif
-
#define opc_nop 0x00
#define opc_aconst_null 0x01
#define opc_iconst_m1 0x02
@@ -725,41 +716,46 @@
#ifdef T2EE_PRINT_DISASS
-class Opcodes {
+class Hsdis {
public:
- typeof (::print_insn_little_arm) *print_insn_little_arm;
- typeof (::init_disassemble_info) *init_disassemble_info;
- typeof (::disassemble_init_for_target) *disassemble_init_for_target;
-
- // Load libopcodes.so lazily.
- Opcodes()
+
+ typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*);
+
+ typedef void* (*decode_instructions_ftype)
+ (void* start, void* end,
+ decode_instructions_event_callback_ftype event_callback,
+ void* event_stream,
+ void* printf_callback,
+ void* printf_stream,
+ const char* options);
+
+ decode_instructions_ftype decode_instructions;
+
+ void *lib;
+
+ // Load hsdis-arm.so lazily.
+ Hsdis()
{
- void *lib;
- if (t2ee_print_disass) {
- if (lib = dlopen("libopcodes.so", RTLD_NOW)) {
- print_insn_little_arm
- = (typeof print_insn_little_arm)dlsym(lib, "print_insn_little_arm");
- init_disassemble_info
- = (typeof init_disassemble_info)dlsym(lib, "init_disassemble_info");
- disassemble_init_for_target
- = (typeof disassemble_init_for_target)dlsym(lib, "disassemble_init_for_target");
+ decode_instructions = NULL;
+
+ if (PrintAssembly) {
+ if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) {
+ decode_instructions
+ = (typeof decode_instructions)dlsym(lib, "decode_instructions");
}
- if (! (print_insn_little_arm
- && init_disassemble_info
- && disassemble_init_for_target))
- {
- fprintf (stderr, "The environment variable T2EE_PRINT_DISASS is set, but\n"
- "libopcodes.so has not been found or is invalid. If you want to\n"
- "see a disassembly, please ensure that a valid copy of\n"
- "libopcodes.so is present somewhere in your library load path.\n");
- abort();
- }
+ if (! (decode_instructions)) {
+ fprintf (stderr, "PrintAssembly (or T2EE_PRINT_DISASS) is set, but\n"
+ "hsdis-arm.so has not been found or is invalid. If you want to\n"
+ "see a disassembly, please ensure that a valid copy of\n"
+ "hsdis-arm.so is present somewhere in your library load path.\n");
+ abort();
+ }
}
}
};
-static Opcodes opcodes;
+static void *print_address(void *stream, const char *tag, void *data);
void Thumb2_disass(Thumb2_Info *jinfo)
{
@@ -773,10 +769,11 @@
int start_b, end_b;
unsigned nodisass;
- struct disassemble_info info;
unsigned short *codebuf = jinfo->codebuf->codebuf;
unsigned idx, compiled_len;
+ static Hsdis hsdis;
+
#if 0
printf("Local Variable Usage\n");
printf("====================\n");
@@ -794,16 +791,6 @@
fflush(stdout);
fflush(stderr);
- opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf);
- info.arch = bfd_arch_arm;
- opcodes.disassemble_init_for_target(&info);
- info.endian = BFD_ENDIAN_LITTLE;
- info.endian_code = BFD_ENDIAN_LITTLE;
- info.buffer = (bfd_byte *)codebuf;
- info.buffer_vma = (bfd_vma)codebuf;
- info.buffer_length = jinfo->codebuf->idx * sizeof(short);
- info.disassembler_options = (char *)"force-thumb";
-
compiled_len = jinfo->codebuf->idx * 2;
for (idx = 0; idx < compiled_len; ) {
nodisass = 0;
@@ -867,14 +854,17 @@
low++;
}
bci += len;
- for (i = 0; i < 4; i++) {
+ {
+ // The insn sequence generated by tableswitch is 14
+ // bytes long.
+ const int tableswitch_code_len = 14;
printf("0x%08x:\t", (int)codebuf+idx);
- {
- int len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info);
- if (len == -1) len = 2;
- idx += len;
- putchar('\n');
- }
+ unsigned short *p = codebuf + idx/2;
+ hsdis.decode_instructions((char*)p,
+ (char *)p + tableswitch_code_len,
+ print_address, NULL, NULL, stdout,
+ "force-thumb");
+ idx += tableswitch_code_len;
}
for (i = 0; i < n; i++) {
printf("0x%08x:\t.short\t0x%04x\n", (int)codebuf+idx, *(short *)((int)codebuf + idx));
@@ -929,7 +919,6 @@
}
}
if (!nodisass) {
- printf("0x%08x:\t", (int)codebuf+idx);
{
int len;
unsigned s1, s2;
@@ -945,16 +934,27 @@
len = 4;
}
} else {
- len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info);
- if (len == -1) len = 2;
- idx += len;
+ char *p = (char*)codebuf + idx;
+ len = 2;
+ while (len + idx < compiled_len
+ && start_bci[(len + idx)/2] == -1)
+ len += 2;
+ hsdis.decode_instructions((char*)p, (char*)p + len,
+ print_address, NULL, NULL, stdout,
+ "force-thumb");
}
- putchar('\n');
+ idx += len;
}
}
}
fflush(stdout);
}
+// where
+static void *print_address(void *, const char *tag, void *data) {
+ if (strcmp(tag, "insn") == 0)
+ printf("0x%08x:\t", (unsigned int)data);
+ return NULL;
+}
#endif
#define BCI(len, pop, push, special, islocal, islocal_n, isstore, local_n, local_type) \
@@ -4354,6 +4354,10 @@
ldr_imm(jinfo->codebuf, r_tmp, r_tmp, 0, 0, 0);
More information about the distro-pkg-dev
mailing list