Mercurial > hg > release > icedtea7-forest-2.6 > hotspot

changeset 6449:e174f34bc41c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8148948, PR3100: aarch64: generate_copy_longs calls align() incorrectly Summary: Fix alignments Reviewed-by: aph
author enevill
date Wed, 03 Feb 2016 11:34:12 +0000
parents 30fa347a47e6
children f3f52408a4d2
files src/cpu/aarch64/vm/globals_aarch64.hpp src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/globals_aarch64.hpp	Thu Feb 04 16:24:28 2016 +0000
+++ b/src/cpu/aarch64/vm/globals_aarch64.hpp	Wed Feb 03 11:34:12 2016 +0000
@@ -48,11 +48,7 @@
 // the the vep is aligned at CodeEntryAlignment whereas c2 only aligns
 // the uep and the vep doesn't get real alignment but just slops on by
 // only assured that the entry instruction meets the 5 byte size requirement.
-#ifdef COMPILER2
 define_pd_global(intx, CodeEntryAlignment,       64);
-#else
-define_pd_global(intx, CodeEntryAlignment,       16);
-#endif // COMPILER2
 define_pd_global(intx, OptoLoopAlignment,        16);
 define_pd_global(intx, InlineFrequencyCount,     100);
 
--- a/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Thu Feb 04 16:24:28 2016 +0000
+++ b/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Wed Feb 03 11:34:12 2016 +0000
@@ -812,7 +812,7 @@
     assert_different_registers(s, d, count, rscratch1);
 
     Label again, large, small;
-    __ align(6);
+    __ align(CodeEntryAlignment);
     __ bind(start);
     __ cmp(count, 8);
     __ br(Assembler::LO, small);
@@ -857,7 +857,7 @@
 
     __ ret(lr);
 
-    __ align(6);
+    __ align(CodeEntryAlignment);
     __ bind(large);
 
     // Fill 8 registers