jdk-sandbox: comparison hotspot/src/cpu/x86/vm/macroAssembler

equal deleted inserted replaced

-:b6d8784a1037
+:ebe1dbb6e1aa
 assert(number_of_arguments >= 0   , "cannot have negative number of arguments");
 LP64_ONLY(assert(java_thread == r15_thread, "unexpected register"));
 #ifdef ASSERT
 // TraceBytecodes does not use r12 but saves it over the call, so don't verify
 // r12 is the heapbase.
-LP64_ONLY(if ((UseCompressedOops || UseCompressedKlassPointers) && !TraceBytecodes) verify_heapbase("call_VM_base: heap base corrupted?");)
+LP64_ONLY(if ((UseCompressedOops || UseCompressedClassPointers) && !TraceBytecodes) verify_heapbase("call_VM_base: heap base corrupted?");)
 #endif // ASSERT
 assert(java_thread != oop_result  , "cannot use the same register for java_thread & oop_result");
 assert(java_thread != last_java_sp, "cannot use the same register for java_thread & last_java_sp");
 }
 void MacroAssembler::load_klass(Register dst, Register src) {
 #ifdef _LP64
-if (UseCompressedKlassPointers) {
+if (UseCompressedClassPointers) {
 movl(dst, Address(src, oopDesc::klass_offset_in_bytes()));
 decode_klass_not_null(dst);
 } else
 #endif
 movptr(dst, Address(src, oopDesc::klass_offset_in_bytes()));
 movptr(dst, Address(dst, Klass::prototype_header_offset()));
 }
 void MacroAssembler::store_klass(Register dst, Register src) {
 #ifdef _LP64
-if (UseCompressedKlassPointers) {
+if (UseCompressedClassPointers) {
 encode_klass_not_null(src);
 movl(Address(dst, oopDesc::klass_offset_in_bytes()), src);
 } else
 #endif
 movptr(Address(dst, oopDesc::klass_offset_in_bytes()), src);
 #endif
 }
 #ifdef _LP64
 void MacroAssembler::store_klass_gap(Register dst, Register src) {
-if (UseCompressedKlassPointers) {
+if (UseCompressedClassPointers) {
 // Store to klass gap in destination
 movl(Address(dst, oopDesc::klass_gap_offset_in_bytes()), src);
 }
 }
 // Function instr_size_for_decode_klass_not_null() counts the instructions
 // 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 (UseCompressedKlassPointers, "only for compressed klass ptrs");
+assert (UseCompressedClassPointers, "only for compressed klass ptrs");
 // mov64 + addq + shlq? + mov64  (for reinit_heapbase()).
 return (Universe::narrow_klass_shift() == 0 ? 20 : 24);
 }
 // !!! 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 (UseCompressedKlassPointers, "should only be used for compressed headers");
+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) {
 }
 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 (UseCompressedKlassPointers, "should only be used for compressed headers");
+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.
 RelocationHolder rspec = oop_Relocation::spec(oop_index);
 mov_narrow_oop(dst, oop_index, rspec);
 }
 void  MacroAssembler::set_narrow_klass(Register dst, Klass* k) {
-assert (UseCompressedKlassPointers, "should only be used for compressed headers");
+assert (UseCompressedClassPointers, "should only be used for compressed headers");
 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
 int klass_index = oop_recorder()->find_index(k);
 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
 mov_narrow_oop(dst, Klass::encode_klass(k), rspec);
 }
 void  MacroAssembler::set_narrow_klass(Address dst, Klass* k) {
-assert (UseCompressedKlassPointers, "should only be used for compressed headers");
+assert (UseCompressedClassPointers, "should only be used for compressed headers");
 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
 int klass_index = oop_recorder()->find_index(k);
 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
 mov_narrow_oop(dst, Klass::encode_klass(k), rspec);
 }
 RelocationHolder rspec = oop_Relocation::spec(oop_index);
 Assembler::cmp_narrow_oop(dst, oop_index, rspec);
 }
 void  MacroAssembler::cmp_narrow_klass(Register dst, Klass* k) {
-assert (UseCompressedKlassPointers, "should only be used for compressed headers");
+assert (UseCompressedClassPointers, "should only be used for compressed headers");
 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
 int klass_index = oop_recorder()->find_index(k);
 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
 Assembler::cmp_narrow_oop(dst, Klass::encode_klass(k), rspec);
 }
 void  MacroAssembler::cmp_narrow_klass(Address dst, Klass* k) {
-assert (UseCompressedKlassPointers, "should only be used for compressed headers");
+assert (UseCompressedClassPointers, "should only be used for compressed headers");
 assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
 int klass_index = oop_recorder()->find_index(k);
 RelocationHolder rspec = metadata_Relocation::spec(klass_index);
 Assembler::cmp_narrow_oop(dst, Klass::encode_klass(k), rspec);
 }
 void MacroAssembler::reinit_heapbase() {
-if (UseCompressedOops || UseCompressedKlassPointers) {
+if (UseCompressedOops || UseCompressedClassPointers) {
 if (Universe::heap() != NULL) {
 if (Universe::narrow_oop_base() == NULL) {
 MacroAssembler::xorptr(r12_heapbase, r12_heapbase);
 } else {
 mov64(r12_heapbase, (int64_t)Universe::narrow_ptrs_base());

changeset 19979	ebe1dbb6e1aa
parent 19319	0ad35be0733a
child 20403	45a89fbcd8f7