1.1 --- a/src/cpu/x86/vm/stubGenerator_x86_64.cpp Tue Apr 06 15:18:10 2010 -0700 1.2 +++ b/src/cpu/x86/vm/stubGenerator_x86_64.cpp Wed Apr 07 09:37:47 2010 -0700 1.3 @@ -871,9 +871,8 @@ 1.4 } 1.5 1.6 address generate_fp_mask(const char *stub_name, int64_t mask) { 1.7 + __ align(CodeEntryAlignment); 1.8 StubCodeMark mark(this, "StubRoutines", stub_name); 1.9 - 1.10 - __ align(16); 1.11 address start = __ pc(); 1.12 1.13 __ emit_data64( mask, relocInfo::none ); 1.14 @@ -1268,7 +1267,7 @@ 1.15 Label& L_copy_32_bytes, Label& L_copy_8_bytes) { 1.16 DEBUG_ONLY(__ stop("enter at entry label, not here")); 1.17 Label L_loop; 1.18 - __ align(16); 1.19 + __ align(OptoLoopAlignment); 1.20 __ BIND(L_loop); 1.21 if(UseUnalignedLoadStores) { 1.22 __ movdqu(xmm0, Address(end_from, qword_count, Address::times_8, -24)); 1.23 @@ -1309,7 +1308,7 @@ 1.24 Label& L_copy_32_bytes, Label& L_copy_8_bytes) { 1.25 DEBUG_ONLY(__ stop("enter at entry label, not here")); 1.26 Label L_loop; 1.27 - __ align(16); 1.28 + __ align(OptoLoopAlignment); 1.29 __ BIND(L_loop); 1.30 if(UseUnalignedLoadStores) { 1.31 __ movdqu(xmm0, Address(from, qword_count, Address::times_8, 16)); 1.32 @@ -2229,7 +2228,7 @@ 1.33 // Loop control: 1.34 // for (count = -count; count != 0; count++) 1.35 // Base pointers src, dst are biased by 8*(count-1),to last element. 1.36 - __ align(16); 1.37 + __ align(OptoLoopAlignment); 1.38 1.39 __ BIND(L_store_element); 1.40 __ store_heap_oop(to_element_addr, rax_oop); // store the oop