/hg/icedtea6: Backport "6927165: Zero S/390 fixes" from upstream

[gbenson at icedtea.classpath.org]

changeset a508d7cd967a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a508d7cd967a
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 19 09:58:06 2010 +0000

	Backport "6927165: Zero S/390 fixes" from upstream


diffstat:

3 files changed, 17 insertions(+), 4 deletions(-)
ChangeLog                                                |    7 +++++++
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp           |    4 ++--
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp |   10 ++++++++--

diffs (60 lines):

diff -r c597699b4fa6 -r a508d7cd967a ChangeLog
--- a/ChangeLog	Fri Feb 19 01:16:48 2010 +0000
+++ b/ChangeLog	Fri Feb 19 09:58:06 2010 +0000
@@ -1,3 +1,10 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+	Increase StackShadowPages from 3 to 5 on 32-bit platforms.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+	(os::atomic_copy64): Added s390 specific implementation.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r c597699b4fa6 -r a508d7cd967a ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 09:58:06 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ define_pd_global(intx,  PreInflateSpin, 
 
 define_pd_global(intx,  StackYellowPages,     2);
 define_pd_global(intx,  StackRedPages,        1);
-define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
+define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);
diff -r c597699b4fa6 -r a508d7cd967a ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Fri Feb 19 09:58:06 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,13 @@
                   "stfd %0, 0(%2)\n"
                   : "=f"(tmp)
                   : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+    double tmp;
+    asm volatile ("ld  %0, 0(%1)\n"
+                  "std %0, 0(%2)\n"
+                  : "=r"(tmp)
+                  : "a"(src), "a"(dst));
 #else
     *(jlong *) dst = *(jlong *) src;
-#endif // PPC && !_LP64
+#endif
   }