[aarch64-port-dev ] /hg/icedtea7-forest-aarch64/hotspot: 4 new changesets

[adinn at icedtea.classpath.org]

changeset 7891f0e7ae10 in /hg/icedtea7-forest-aarch64/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=7891f0e7ae10
author: andrew
date: Fri Dec 12 06:38:01 2014 +0000

	Added tag icedtea-2.6pre15 for changeset 5ad4c0916974


changeset a685a32270c3 in /hg/icedtea7-forest-aarch64/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=a685a32270c3
author: andrew
date: Tue Dec 30 21:41:20 2014 +0000

	Added tag icedtea-2.6pre16 for changeset 7891f0e7ae10


changeset 0a377d9c35cd in /hg/icedtea7-forest-aarch64/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=0a377d9c35cd
author: Edward Nevill <ed at camswl.com>
date: Fri Jan 09 10:05:00 2015 +0000

	Fix guarantee failure in syncronizer.cpp


changeset 219b0a7f15b6 in /hg/icedtea7-forest-aarch64/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=219b0a7f15b6
author: adinn
date: Tue Jan 13 14:41:43 2015 +0000

	merge


diffstat:

 .hgtags                       |  2 ++
 src/cpu/aarch64/vm/aarch64.ad |  9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 5ad4c0916974 -r 219b0a7f15b6 .hgtags
--- a/.hgtags	Thu Dec 11 16:42:03 2014 +0000
+++ b/.hgtags	Tue Jan 13 14:41:43 2015 +0000
@@ -779,3 +779,5 @@
 0c2099cd04cd24778c5baccc7c8a72c311ef6f84 icedtea-2.6pre12
 c6fa18ed8a01a15e1210bf44dc7075463e0a514b icedtea-2.6pre13
 1d3d9e81c8e16bfe948da9bc0756e922a3802ca4 icedtea-2.6pre14
+5ad4c09169742e076305193c1e0b8256635cf33e icedtea-2.6pre15
+7891f0e7ae10d8f636fdbf29bcfe06f43d057e5f icedtea-2.6pre16
diff -r 5ad4c0916974 -r 219b0a7f15b6 src/cpu/aarch64/vm/aarch64.ad
--- a/src/cpu/aarch64/vm/aarch64.ad	Thu Dec 11 16:42:03 2014 +0000
+++ b/src/cpu/aarch64/vm/aarch64.ad	Tue Jan 13 14:41:43 2015 +0000
@@ -2950,7 +2950,8 @@
       __ ldxr(tmp, oop);
       __ cmp(tmp, disp_hdr);
       __ br(Assembler::NE, cas_failed);
-      __ stxr(tmp, box, oop);
+      // use stlxr to ensure update is immediately visible
+      __ stlxr(tmp, box, oop);
       __ cbzw(tmp, cont);
       __ b(retry_load);
     }
@@ -2999,7 +3000,8 @@
 	__ ldxr(rscratch1, tmp);
 	__ cmp(disp_hdr, rscratch1);
 	__ br(Assembler::NE, fail);
-	__ stxr(rscratch1, rthread, tmp);
+        // use stlxr to ensure update is immediately visible
+	__ stlxr(rscratch1, rthread, tmp);
 	__ cbnzw(rscratch1, retry_load);
 	__ bind(fail);
       }
@@ -3087,7 +3089,8 @@
 	__ ldxr(tmp, oop);
 	__ cmp(box, tmp);
 	__ br(Assembler::NE, cas_failed);
-	__ stxr(tmp, disp_hdr, oop);
+        // use stlxr to ensure update is immediately visible
+	__ stlxr(tmp, disp_hdr, oop);
 	__ cbzw(tmp, cont);
 	__ b(retry_load);
       }