1.1 --- a/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Sep 06 11:11:19 2013 -0700
1.2 +++ b/src/cpu/x86/vm/macroAssembler_x86.cpp Mon Aug 12 17:37:02 2013 +0200
1.3 @@ -1635,7 +1635,7 @@
1.4 #ifdef ASSERT
1.5 // TraceBytecodes does not use r12 but saves it over the call, so don't verify
1.6 // r12 is the heapbase.
1.7 - LP64_ONLY(if ((UseCompressedOops || UseCompressedKlassPointers) && !TraceBytecodes) verify_heapbase("call_VM_base: heap base corrupted?");)
1.8 + LP64_ONLY(if ((UseCompressedOops || UseCompressedClassPointers) && !TraceBytecodes) verify_heapbase("call_VM_base: heap base corrupted?");)
1.9 #endif // ASSERT
1.10
1.11 assert(java_thread != oop_result , "cannot use the same register for java_thread & oop_result");
1.12 @@ -4802,7 +4802,7 @@
1.13
1.14 void MacroAssembler::load_klass(Register dst, Register src) {
1.15 #ifdef _LP64
1.16 - if (UseCompressedKlassPointers) {
1.17 + if (UseCompressedClassPointers) {
1.18 movl(dst, Address(src, oopDesc::klass_offset_in_bytes()));
1.19 decode_klass_not_null(dst);
1.20 } else
1.21 @@ -4817,7 +4817,7 @@
1.22
1.23 void MacroAssembler::store_klass(Register dst, Register src) {
1.24 #ifdef _LP64
1.25 - if (UseCompressedKlassPointers) {
1.26 + if (UseCompressedClassPointers) {
1.27 encode_klass_not_null(src);
1.28 movl(Address(dst, oopDesc::klass_offset_in_bytes()), src);
1.29 } else
1.30 @@ -4892,7 +4892,7 @@
1.31
1.32 #ifdef _LP64
1.33 void MacroAssembler::store_klass_gap(Register dst, Register src) {
1.34 - if (UseCompressedKlassPointers) {
1.35 + if (UseCompressedClassPointers) {
1.36 // Store to klass gap in destination
1.37 movl(Address(dst, oopDesc::klass_gap_offset_in_bytes()), src);
1.38 }
1.39 @@ -5075,7 +5075,7 @@
1.40 // when (Universe::heap() != NULL). Hence, if the instructions they
1.41 // generate change, then this method needs to be updated.
1.42 int MacroAssembler::instr_size_for_decode_klass_not_null() {
1.43 - assert (UseCompressedKlassPointers, "only for compressed klass ptrs");
1.44 + assert (UseCompressedClassPointers, "only for compressed klass ptrs");
1.45 // mov64 + addq + shlq? + mov64 (for reinit_heapbase()).
1.46 return (Universe::narrow_klass_shift() == 0 ? 20 : 24);
1.47 }
1.48 @@ -5085,7 +5085,7 @@
1.49 void MacroAssembler::decode_klass_not_null(Register r) {
1.50 // Note: it will change flags
1.51 assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
1.52 - assert (UseCompressedKlassPointers, "should only be used for compressed headers");
1.53 + assert (UseCompressedClassPointers, "should only be used for compressed headers");
1.54 assert(r != r12_heapbase, "Decoding a klass in r12");
1.55 // Cannot assert, unverified entry point counts instructions (see .ad file)
1.56 // vtableStubs also counts instructions in pd_code_size_limit.
1.57 @@ -5103,7 +5103,7 @@
1.58 void MacroAssembler::decode_klass_not_null(Register dst, Register src) {
1.59 // Note: it will change flags
1.60 assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
1.61 - assert (UseCompressedKlassPointers, "should only be used for compressed headers");
1.62 + assert (UseCompressedClassPointers, "should only be used for compressed headers");
1.63 if (dst == src) {
1.64 decode_klass_not_null(dst);
1.65 } else {
1.66 @@ -5141,7 +5141,7 @@
1.67 }
1.68
1.69 void MacroAssembler::set_narrow_klass(Register dst, Klass* k) {
1.70 - assert (UseCompressedKlassPointers, "should only be used for compressed headers");
1.71 + assert (UseCompressedClassPointers, "should only be used for compressed headers");
1.72 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
1.73 int klass_index = oop_recorder()->find_index(k);
1.74 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
1.75 @@ -5149,7 +5149,7 @@
1.76 }
1.77
1.78 void MacroAssembler::set_narrow_klass(Address dst, Klass* k) {
1.79 - assert (UseCompressedKlassPointers, "should only be used for compressed headers");
1.80 + assert (UseCompressedClassPointers, "should only be used for compressed headers");
1.81 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
1.82 int klass_index = oop_recorder()->find_index(k);
1.83 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
1.84 @@ -5175,7 +5175,7 @@
1.85 }
1.86
1.87 void MacroAssembler::cmp_narrow_klass(Register dst, Klass* k) {
1.88 - assert (UseCompressedKlassPointers, "should only be used for compressed headers");
1.89 + assert (UseCompressedClassPointers, "should only be used for compressed headers");
1.90 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
1.91 int klass_index = oop_recorder()->find_index(k);
1.92 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
1.93 @@ -5183,7 +5183,7 @@
1.94 }
1.95
1.96 void MacroAssembler::cmp_narrow_klass(Address dst, Klass* k) {
1.97 - assert (UseCompressedKlassPointers, "should only be used for compressed headers");
1.98 + assert (UseCompressedClassPointers, "should only be used for compressed headers");
1.99 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
1.100 int klass_index = oop_recorder()->find_index(k);
1.101 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
1.102 @@ -5191,7 +5191,7 @@
1.103 }
1.104
1.105 void MacroAssembler::reinit_heapbase() {
1.106 - if (UseCompressedOops || UseCompressedKlassPointers) {
1.107 + if (UseCompressedOops || UseCompressedClassPointers) {
1.108 if (Universe::heap() != NULL) {
1.109 if (Universe::narrow_oop_base() == NULL) {
1.110 MacroAssembler::xorptr(r12_heapbase, r12_heapbase);
