/hg/icedtea6: S7031385, PR680: Incorrect register allocation in ...

[dbhole at icedtea.classpath.org]

changeset 0239a181c7a0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0239a181c7a0
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Mar 31 19:23:12 2011 -0400

	S7031385, PR680: Incorrect register allocation in
	orderAccess_linux_x86.inline.hpp


diffstat:

 ChangeLog                                                 |  10 +++++++
 Makefile.am                                               |   3 +-
 NEWS                                                      |   1 +
 patches/openjdk/7031385-gcc-register-allocation-fix.patch |  20 +++++++++++++++
 4 files changed, 33 insertions(+), 1 deletions(-)

diffs (66 lines):

diff -r 64437a39a9c8 -r 0239a181c7a0 ChangeLog
--- a/ChangeLog	Thu Mar 31 15:34:49 2011 +0100
+++ b/ChangeLog	Thu Mar 31 19:23:12 2011 -0400
@@ -1,3 +1,13 @@
+2011-03-31  Deepak Bhole <dbhole at redhat.com>
+
+	S7031385, PR680: Incorrect register allocation in
+	orderAccess_linux_x86.inline.hpp 
+	* Makefile.am: Apply patch.
+	* NEWS: Updated
+	* patches/openjdk/7031385-gcc-register-allocation-fix.patch: New patch. 
+	Fixes register allocation by constraining output to one of a/b/c/d 
+	registers.
+
 2011-03-31  Andrew John Hughes  <ahughes at redhat.com>
 
 	S7032388, PR682: Make HotSpot work on machines without
diff -r 64437a39a9c8 -r 0239a181c7a0 Makefile.am
--- a/Makefile.am	Thu Mar 31 15:34:49 2011 +0100
+++ b/Makefile.am	Thu Mar 31 19:23:12 2011 -0400
@@ -334,7 +334,8 @@
 	patches/mark_sun_toolkit_privileged_code.patch \
 	patches/g356743-libpng-1.5.patch \
 	patches/revert-6885123.patch \
-	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch
+	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
+	patches/openjdk/7031385-gcc-register-allocation-fix.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 64437a39a9c8 -r 0239a181c7a0 NEWS
--- a/NEWS	Thu Mar 31 15:34:49 2011 +0100
+++ b/NEWS	Thu Mar 31 19:23:12 2011 -0400
@@ -21,6 +21,7 @@
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - G356743: Support libpng 1.5.
+  - S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp
 * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
 * CACAO
   - Ignore all unknown options, but report them.
diff -r 64437a39a9c8 -r 0239a181c7a0 patches/openjdk/7031385-gcc-register-allocation-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7031385-gcc-register-allocation-fix.patch	Thu Mar 31 19:23:12 2011 -0400
@@ -0,0 +1,21 @@
+diff -ur openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp openjdk/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp	2011-03-31 13:05:19.924400634 -0400
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp	2011-03-31 13:06:00.617400605 -0400
+@@ -93,7 +93,7 @@
+ 
+ inline void     OrderAccess::store_fence(jbyte*  p, jbyte  v) {
+   __asm__ volatile (  "xchgb (%2),%0"
+-                    : "=r" (v)
++                    : "=q" (v)
+                     : "0" (v), "r" (p)
+                     : "memory");
+ }
+@@ -155,7 +155,7 @@
+ // Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
+ inline void     OrderAccess::release_store_fence(volatile jbyte*  p, jbyte  v) {
+   __asm__ volatile (  "xchgb (%2),%0"
+-                    : "=r" (v)
++                    : "=q" (v)
+                     : "0" (v), "r" (p)
+                     : "memory");
+ }