graal-compiler: src/cpu/x86/vm/macroAssembler

comparison src/cpu/x86/vm/macroAssembler_x86.cpp @ 13086:096c224171c4

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 20 Nov 2013 00:10:38 +0100
parents	359f7e70ae7f be525e91f65b
children	02f27ecb4f3a

comparison

equal deleted inserted replaced

-:92b7ec34ddfa
+:096c224171c4
 subptr(tmp, os::vm_page_size());
 subl(size, os::vm_page_size());
 jcc(Assembler::greater, loop);
 // Bang down shadow pages too.
-// The -1 because we already subtracted 1 page.
+// At this point, (tmp-0) is the last address touched, so don't
-for (int i = 0; i< StackShadowPages-1; i++) {
+// touch it again.  (It was touched as (tmp-pagesize) but then tmp
+// was post-decremented.)  Skip this address by starting at i=1, and
+// touch a few more pages below.  N.B.  It is important to touch all
+// the way down to and including i=StackShadowPages.
+for (int i = 1; i <= StackShadowPages; i++) {
 // this could be any sized move but this is can be a debugging crumb
 // so the bigger the better.
 movptr(Address(tmp, (-i*os::vm_page_size())), size );
 }
 }
 Address index(noreg, card_index, Address::times_1);
 const Register card_addr = tmp;
 lea(card_addr, as_Address(ArrayAddress(cardtable, index)));
 #endif
-cmpb(Address(card_addr, 0), 0);
+cmpb(Address(card_addr, 0), (int)G1SATBCardTableModRefBS::g1_young_card_val());
 jcc(Assembler::equal, done);
+membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
+cmpb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
+jcc(Assembler::equal, done);
 // storing a region crossing, non-NULL oop, card is clean.
 // dirty card and log.
-movb(Address(card_addr, 0), 0);
+movb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
 cmpl(queue_index, 0);
 jcc(Assembler::equal, runtime);
 subl(queue_index, wordSize);
 movptr(tmp2, buffer);
 }
 }
 }
 void MacroAssembler::encode_klass_not_null(Register r) {
-assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
+if (Universe::narrow_klass_base() != NULL) {
 // Use r12 as a scratch register in which to temporarily load the narrow_klass_base.
 assert(r != r12_heapbase, "Encoding a klass in r12");
 mov64(r12_heapbase, (int64_t)Universe::narrow_klass_base());
 subq(r, r12_heapbase);
+}
 if (Universe::narrow_klass_shift() != 0) {
 assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
 shrq(r, LogKlassAlignmentInBytes);
 }
-reinit_heapbase();
+if (Universe::narrow_klass_base() != NULL) {
+reinit_heapbase();
+}
 }
 void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
 if (dst == src) {
 encode_klass_not_null(src);
 } else {
-mov64(dst, (int64_t)Universe::narrow_klass_base());
+if (Universe::narrow_klass_base() != NULL) {
-negq(dst);
+mov64(dst, (int64_t)Universe::narrow_klass_base());
-addq(dst, src);
+negq(dst);
+addq(dst, src);
+} else {
+movptr(dst, src);
+}
 if (Universe::narrow_klass_shift() != 0) {
 assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
 shrq(dst, LogKlassAlignmentInBytes);
 }
 }
 // generated by decode_klass_not_null(register r) and reinit_heapbase(),
 // when (Universe::heap() != NULL).  Hence, if the instructions they
 // generate change, then this method needs to be updated.
 int MacroAssembler::instr_size_for_decode_klass_not_null() {
 assert (UseCompressedClassPointers, "only for compressed klass ptrs");
-// mov64 + addq + shlq? + mov64  (for reinit_heapbase()).
+if (Universe::narrow_klass_base() != NULL) {
-return (Universe::narrow_klass_shift() == 0 ? 20 : 24);
+// mov64 + addq + shlq? + mov64  (for reinit_heapbase()).
+return (Universe::narrow_klass_shift() == 0 ? 20 : 24);
+} else {
+// longest load decode klass function, mov64, leaq
+return 16;
+}
 }
 // !!! If the instructions that get generated here change then function
 // instr_size_for_decode_klass_not_null() needs to get updated.
 void  MacroAssembler::decode_klass_not_null(Register r) {
 // Note: it will change flags
-assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
 assert (UseCompressedClassPointers, "should only be used for compressed headers");
 assert(r != r12_heapbase, "Decoding a klass in r12");
 // Cannot assert, unverified entry point counts instructions (see .ad file)
 // vtableStubs also counts instructions in pd_code_size_limit.
 // Also do not verify_oop as this is called by verify_oop.
 if (Universe::narrow_klass_shift() != 0) {
 assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
 shlq(r, LogKlassAlignmentInBytes);
 }
 // Use r12 as a scratch register in which to temporarily load the narrow_klass_base.
-mov64(r12_heapbase, (int64_t)Universe::narrow_klass_base());
+if (Universe::narrow_klass_base() != NULL) {
-addq(r, r12_heapbase);
+mov64(r12_heapbase, (int64_t)Universe::narrow_klass_base());
-reinit_heapbase();
+addq(r, r12_heapbase);
+reinit_heapbase();
+}
 }
 void  MacroAssembler::decode_klass_not_null(Register dst, Register src) {
 // Note: it will change flags
-assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
 assert (UseCompressedClassPointers, "should only be used for compressed headers");
 if (dst == src) {
 decode_klass_not_null(dst);
 } else {
 // Cannot assert, unverified entry point counts instructions (see .ad file)
 // vtableStubs also counts instructions in pd_code_size_limit.
 // Also do not verify_oop as this is called by verify_oop.
 mov64(dst, (int64_t)Universe::narrow_klass_base());
 if (Universe::narrow_klass_shift() != 0) {
 assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
 assert(LogKlassAlignmentInBytes == Address::times_8, "klass not aligned on 64bits?");
 leaq(dst, Address(dst, src, Address::times_8, 0));

Mercurial > hg > graal-compiler

comparison src/cpu/x86/vm/macroAssembler_x86.cpp @ 13086:096c224171c4