# HG changeset patch
# User Gary Benson <gbenson@redhat.com>
# Date 1229518515 18000
# Node ID 515916374161234257aa668dd5f54fb39a0633e3
# Parent  b95615866532a5a48a5233f274da4456aacd1ab5
2008-12-17  Gary Benson  <gbenson@redhat.com>

	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
	(_Copy_conjoint_jshorts_atomic): Implemented.

diff -r b95615866532 -r 515916374161 ChangeLog
--- a/ChangeLog	Wed Dec 17 10:03:26 2008 +0100
+++ b/ChangeLog	Wed Dec 17 07:55:15 2008 -0500
@@ -1,3 +1,8 @@
+2008-12-17  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(_Copy_conjoint_jshorts_atomic): Implemented.
+
 2008-12-17  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/icedtea-zero.patch: Update for PARISC.
diff -r b95615866532 -r 515916374161 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Wed Dec 17 10:03:26 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Wed Dec 17 07:55:15 2008 -0500
@@ -388,7 +388,18 @@
 
   void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count)
   {
-    Unimplemented();
+    if (from > to) {
+      jshort *end = from + count;
+      while (from < end)
+        *(to++) = *(from++);
+    }
+    else if (from < to) {
+      jshort *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end)
+        *(to--) = *(from--);
+    }
   }
   void _Copy_conjoint_jints_atomic(jint* from, jint* to, size_t count)
   {