jdk8-mips64-public/hotspot: comparison src/cpu/mips/vm/c1_CodeStubs

-:e4aeef458496
+:ffcdff41a92f
 }
 #ifdef TIERED
 void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
 __ bind(_entry);
+ce->store_parameter(_method->as_register(), 1);
 ce->store_parameter(_bci, 0);
 __ call(Runtime1::entry_for(Runtime1::counter_overflow_id), relocInfo::runtime_call_type);
 __ delayed()->nop();
 ce->add_call_info_here(_info);
 ce->verify_oop_map(_info);
 void NewObjectArrayStub::emit_code(LIR_Assembler* ce) {
 assert(__ sp_offset() == 0, "frame size should be fixed");
 __ bind(_entry);
-//assert(_length->as_register() == rbx, "length must in rbx,");
-//assert(_klass_reg->as_register() == rdx, "klass_reg must in rdx");
-//__ call(RuntimeAddress(Runtime1::entry_for(Runtime1::new_object_array_id)));
 assert(_length->as_register() == T2, "length must in ebx");
 #ifndef _LP64
 assert(_klass_reg->as_register() == T4, "klass_reg must in T4");
 #else
-//FIXME. in A4? aoqi
 assert(_klass_reg->as_register() == A4, "klass_reg must in A4");
 #endif
 __ call(Runtime1::entry_for(Runtime1::new_object_array_id), relocInfo::runtime_call_type);
 __ delayed()->nop();
 ce->add_call_info_here(_info);
 ce->verify_oop_map(_info);
-//assert(_result->as_register() == rax, "result must in rax,");
-//__ jmp(_continuation);
 assert(_result->as_register() == V0, "result must in eax");
 __ b_far(_continuation);
 __ delayed()->nop();
 }
 void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
 assert(__ sp_offset() == 0, "frame size should be fixed");
 __ bind(_entry);
 ce->store_parameter(_obj_reg->as_register(),  1);
 ce->store_parameter(_lock_reg->is_single_cpu()? _lock_reg->as_register() : _lock_reg->as_register_lo(), 0);
-/*
+Runtime1::StubID enter_id;
-Runtime1::StubID enter_id;
-if (ce->compilation()->has_fpu_code()) {
-enter_id = Runtime1::monitorenter_id;
-} else {
-enter_id = Runtime1::monitorenter_nofpu_id;
-}
-__ call(RuntimeAddress(Runtime1::entry_for(enter_id)));
-*/
 if (ce->compilation()->has_fpu_code()) {
-__ call(Runtime1::entry_for(Runtime1::monitorenter_id), relocInfo::runtime_call_type);
+enter_id = Runtime1::monitorenter_id;
 } else {
-__ call(Runtime1::entry_for(Runtime1::monitorenter_nofpu_id), relocInfo::runtime_call_type);
+enter_id = Runtime1::monitorenter_nofpu_id;
 }
+//__ call(RuntimeAddress(Runtime1::entry_for(enter_id)));
+__ call(Runtime1::entry_for(enter_id), relocInfo::runtime_call_type);
 __ delayed()->nop();
 ce->add_call_info_here(_info);
 ce->verify_oop_map(_info);
 __ b_far(_continuation);
 __ delayed()->nop();
 // lock_reg was destroyed by fast unlocking attempt => recompute it
 ce->monitor_address(_monitor_ix, _lock_reg);
 }
 ce->store_parameter(_lock_reg->as_register(), 0);
 // note: non-blocking leaf routine => no call info needed
-/*
+Runtime1::StubID exit_id;
-Runtime1::StubID exit_id;
-if (ce->compilation()->has_fpu_code()) {
-exit_id = Runtime1::monitorexit_id;
-} else {
-exit_id = Runtime1::monitorexit_nofpu_id;
-}
-__ call(RuntimeAddress(Runtime1::entry_for(exit_id)));
-__ jmp(_continuation);
-*/
 if (ce->compilation()->has_fpu_code()) {
-__ call(Runtime1::entry_for(Runtime1::monitorexit_id), relocInfo::runtime_call_type);
+exit_id = Runtime1::monitorexit_id;
 } else {
-__ call(Runtime1::entry_for(Runtime1::monitorexit_nofpu_id), relocInfo::runtime_call_type);
+exit_id = Runtime1::monitorexit_nofpu_id;
 }
-__ delayed()->nop();
+//__ call(RuntimeAddress(Runtime1::entry_for(exit_id)));
+__ call(Runtime1::entry_for(exit_id), relocInfo::runtime_call_type);
-//__ jmp(_continuation);
+__ delayed()->nop();
 __ b_far(_continuation);
 __ delayed()->nop();
 }
 // very hard to make a guess about what code might be in the icache.
 // Force the instruction to be double word aligned so that it
 // doesn't span a cache line.
 // the NativeJump is not finished, i am not sure what to do here. FIXME
-//masm->align(round_to(NativeGeneralJump::instruction_size, wordSize));
+//  masm->align(round_to(NativeGeneralJump::instruction_size, wordSize));
+//tty->print_cr("align_patch_site has not finished yet!!!");
 }
 void PatchingStub::emit_code(LIR_Assembler* ce) {
 assert(NativeCall::instruction_size <= _bytes_to_copy && _bytes_to_copy <= 0xFF, "not enough room for call");
 assert(_bytes_to_copy <= 0xFF, "not enough room for call");
 if (CommentedAssembly) {
 __ block_comment(" patch template");
 }
 if (_id == load_klass_id) {
 // produce a copy of the load klass instruction for use by the being initialized case
+//#ifdef ASSERT
 address start = __ pc();
+//#endif
+Metadata* o = NULL;
+RelocationHolder rspec = metadata_Relocation::spec(_index);
+__ relocate(rspec);
+__ li48(_obj, (long)o);
+while ((intx)__ pc() - (intx)start < NativeCall::instruction_size) {
+__ nop();
+}
+#ifdef ASSERT
+for (int i = 0; i < _bytes_to_copy; i++) {
+address ptr = (address)(_pc_start + i);
+int a_byte = (*ptr) & 0xFF;
+assert(a_byte == *start++, "should be the same code");
+}
+#endif
+} else if (_id == load_mirror_id || _id == load_appendix_id) {
+//#ifdef ASSERT
+address start = __ pc();
+//#endif
 jobject o = NULL;
-int oop_index = __ oop_recorder()->allocate_oop_index(o);
+RelocationHolder rspec = oop_Relocation::spec(_index);
-RelocationHolder rspec = oop_Relocation::spec(oop_index);
 __ relocate(rspec);
-#ifndef _LP64
-//by_css
-__ lui(_obj, Assembler::split_high((int)o));
-__ addiu(_obj, _obj, Assembler::split_low((int)o));
-#else
-//This should be same as jobject2reg_with_patching.
 __ li48(_obj, (long)o);
-#endif
 while ((intx)__ pc() - (intx)start < NativeCall::instruction_size) {
 __ nop();
 }
 #ifdef ASSERT
 for (int i = 0; i < _bytes_to_copy; i++) {
 }
 }
 address end_of_patch = __ pc();
 int bytes_to_skip = 0;
-if (_id == load_klass_id) {
+if (_id == load_mirror_id) {
 int offset = __ offset();
 if (CommentedAssembly) {
 __ block_comment(" being_initialized check");
 }
 assert(_obj != NOREG, "must be a valid register");
-#ifndef OPT_THREAD
+Register tmp = AT;
-//FIXME, T8 need be saved ?
+Register tmp2 = T9;
-Register thread = T8;
+__ ld_ptr(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes()));
-__ get_thread(thread);
+__ get_thread(tmp);
-#else
+__ ld_ptr(tmp2, Address(tmp2, InstanceKlass::init_thread_offset()));
-Register thread = TREG;
+__ bne(tmp, tmp2, call_patch);
-#endif
-__ ld(AT, _obj, in_bytes(InstanceKlass::init_thread_offset()));
-__ bne(thread, AT, call_patch);
 __ delayed()->nop();
 // access_field patches may execute the patched code before it's
 // copied back into place so we need to jump back into the main
 // code of the nmethod to continue execution.
 // need 4 bytes
 int sizeof_patch_record = 4;
 bytes_to_skip += sizeof_patch_record;
 // emit the offsets needed to find the code to patch
-int being_initialized_entry_offset = __ pc() - being_initialized_entry + patch_info_size;
+int being_initialized_entry_offset = __ pc() - being_initialized_entry + sizeof_patch_record;
-#ifdef _LP64
-/* Jin: In MIPS64, byte_skip is much larger than that in X86. It can not be contained in a byte:
-*   - bytes_to_skip = 0x190;
-*   - _bytes_to_copy = 0x20;
-*   - being_initialized_entry_offset = 0x1b0;
-*
-*   To minimize the modification of share codes, the values are decreased 4 times when generated,
-*   thus can be packed into a long type.
-*
-*   See [share/vm/c1/c1_Runtime1.cpp 918] Runtime1::patch_code()
-*/
-being_initialized_entry_offset /= 4;
-_bytes_to_copy /= 4;
-bytes_to_skip /= 4;
-#endif
 // patch_info_pc offset | size of b instruction(8)| patched code size
 assert((char)being_initialized_entry_offset==being_initialized_entry_offset, "just check");
 assert((char)bytes_to_skip==bytes_to_skip, "just check");
 assert((char)_bytes_to_copy==_bytes_to_copy, "just check");
 __ emit_int32(being_initialized_entry_offset<<8 | (bytes_to_skip<<16) | (_bytes_to_copy<<24) );
 address patch_info_pc = __ pc();
-#ifdef _LP64
-assert(patch_info_pc - end_of_patch == bytes_to_skip * 4, "incorrect patch info");
-#else
 assert(patch_info_pc - end_of_patch == bytes_to_skip, "incorrect patch info");
-#endif
 address entry = __ pc();
 NativeGeneralJump::insert_unconditional((address)_pc_start, entry);
 address target = NULL;
+relocInfo::relocType reloc_type = relocInfo::none;
 switch (_id) {
 case access_field_id:  target = Runtime1::entry_for(Runtime1::access_field_patching_id); break;
-case load_klass_id:    target = Runtime1::entry_for(Runtime1::load_klass_patching_id); break;
+case load_klass_id:    target = Runtime1::entry_for(Runtime1::load_klass_patching_id); reloc_type = relocInfo::metadata_type; break;
+case load_mirror_id:   target = Runtime1::entry_for(Runtime1::load_mirror_patching_id); reloc_type = relocInfo::oop_type; break;
+case load_appendix_id: target = Runtime1::entry_for(Runtime1::load_appendix_patching_id); reloc_type = relocInfo::oop_type; break;
 default: ShouldNotReachHere();
 }
 __ bind(call_patch);
 if (CommentedAssembly) {
 __ block_comment("patch entry point");
 }
-#ifndef _LP64
-__ lui(T9, Assembler::split_high((int)target));
-__ addiu(T9, T9, Assembler::split_low((int)target));
-#else
 __ li48(T9, (long)target);
-#endif
 __ jalr(T9);
 __ delayed()->nop();
 assert(_patch_info_offset == (patch_info_pc - __ pc()), "must not change");
 ce->add_call_info_here(_info);
 int jmp_off = __ offset();
 // Add enough nops so deoptimization can overwrite the jmp above with a call
 // and not destroy the world.
 for (int j = __ offset(); j < jmp_off + NativeCall::instruction_size; j += 4 ) {
 __ nop();
 }
-if (_id == load_klass_id) {
+if (_id == load_klass_id || _id == load_mirror_id || _id == load_appendix_id) {
 CodeSection* cs = __ code_section();
 address pc = (address)_pc_start;
 RelocIterator iter(cs, pc, pc + 1);
-relocInfo::change_reloc_info_for_address(&iter, pc, relocInfo::oop_type, relocInfo::none);
+relocInfo::change_reloc_info_for_address(&iter, pc, reloc_type, relocInfo::none);
 }
+}
+void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
+__ bind(_entry);
+__ call(Runtime1::entry_for(Runtime1::deoptimize_id), relocInfo::runtime_call_type);
+ce->add_call_info_here(_info);
+DEBUG_ONLY(__ should_not_reach_here());
 }
 void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
 ce->compilation()->implicit_exception_table()->append(_offset, __ offset());

comparison: src/cpu/mips/vm/c1_CodeStubs_mips.cpp

src/cpu/mips/vm/c1_CodeStubs_mips.cpp

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/cpu/mips/vm/c1_CodeStubs_mips.cpp

src/cpu/mips/vm/c1_CodeStubs_mips.cpp