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

-:27610f2f4b93
+:3a34fc828b4a
 // use S7 for fetch_unroll_info returned UnrollBlock
 Register unroll = S7;
 // Prolog for non exception case!
 // Correct the return address we were given.
 //FIXME, return address is on the tos or Ra?
-__ addi(RA, RA, - (NativeCall::return_address_offset));
+__ addi(RA, RA, - (NativeCall::return_address_offset_short));
 // Save everything in sight.
 map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
 // Normal deoptimization
 __ move(reason, Deoptimization::Unpack_deopt);
 __ b(cont);
 // Return address will be patched later with the throwing pc. The correct value is not
 // available now because loading it from memory would destroy registers.
 // Save everything in sight.
 // No need to update map as each call to save_live_registers will produce identical oopmap
-__ addi(RA, RA, - (NativeCall::return_address_offset));
+__ addi(RA, RA, - (NativeCall::return_address_offset_short));
 (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
 // Now it is safe to overwrite any register
 // store the correct deoptimization type
 __ move(reason, Deoptimization::Unpack_exception);
 // crud.  We cannot block on this call, no GC can happen.
 #ifndef OPT_THREAD
 __ get_thread(thread);
 #endif
-/*
-*
-0x000000555bd82aec: dadd a0, s6, zero                ; __ move(A0, thread);
-0x000000555bd82af0: daddi sp, sp, 0xfffffff0         ; __ addi(SP, SP, -additional_words  * wordSize);
-0x000000555bd82af4: sd sp, 0x1c8(s6)                 ; __ set_last_Java_frame(thread, NOREG, NOREG, NULL);
-0x000000555bd82af8: lui at, 0x0                      ; __ li64(AT, save_pc);
-0x000000555bd82afc: ori at, at, 0x55
-0x000000555bd82b00: dsll at, at, 16
-0x000000555bd82b04: ori at, at, 0x5bd8
-0x000000555bd82b08: dsll at, at, 16
-0x000000555bd82b0c: ori at, at, 0x2b34       ; save_pc = pc() +  NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 4
-0x000000555bd82b10: sd at, 0x1d0(s6)
-0x000000555bd82b14: lui t9, 0x0
-0x000000555bd82b18: ori t9, t9, 0x55
-0x000000555bd82b1c: dsll t9, t9, 16
-0x000000555bd82b20: ori t9, t9, 0x5aa6
-0x000000555bd82b24: dsll t9, t9, 16
-0x000000555bd82b28: ori t9, t9, 0x4074
-0x000000555bd82b2c: jalr t9
-0x000000555bd82b30: sll zero, zero, 0
-0x000000555bd82b34: daddiu sp, sp, 0x10	; save_pc
-*/
 __ move(A0, thread);
 __ addi(SP, SP, -additional_words  * wordSize);
 __ set_last_Java_frame(NOREG, NOREG, NULL);
 // Call fetch_unroll_info().  Need thread and this frame, but NOT official VM entry - cannot block on
 // this call, no GC can happen.  Call should capture return values.
 __ relocate(relocInfo::internal_pc_type);
 {
-intptr_t save_pc = (intptr_t)__ pc() +  NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 4;
+intptr_t save_pc = (intptr_t)__ pc() +  NativeMovConstReg::instruction_size + 28;
 __ patchable_set48(AT, save_pc);
 }
 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
 __ call((address)Deoptimization::fetch_unroll_info);
 __ move(AT, -(StackAlignmentInBytes));
 __ andr(SP, SP, AT);   // Fix stack alignment as required by ABI
 __ relocate(relocInfo::internal_pc_type);
 {
-intptr_t save_pc = (intptr_t)__ pc() +  NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 4;
+intptr_t save_pc = (intptr_t)__ pc() +  NativeMovConstReg::instruction_size + 28;
 __ patchable_set48(AT, save_pc);
 }
 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
 //__ call(Deoptimization::unpack_frames);
 __ get_thread(thread);
 #endif
 // set last_Java_sp
 __ set_last_Java_frame(NOREG, FP, NULL);
 __ relocate(relocInfo::internal_pc_type);
-assert(NativeCall::return_address_offset == 24, "in sharedRuntime return_address_offset");
 {
-long save_pc = (long)__ pc() +  28 + NativeCall::return_address_offset;
+long save_pc = (long)__ pc() + 52;
 __ patchable_set48(AT, (long)save_pc);
 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
 }
 // Call C code.  Need thread but NOT official VM entry
 // crud.  We cannot block on this call, no GC can happen.  Call should
 // capture callee-saved registers as well as return values.
 __ move(A0, thread);
 // argument already in T0
 __ move(A1, T0);
-__ set64(T9, (long)Deoptimization::uncommon_trap);
+__ patchable_set48(T9, (long)Deoptimization::uncommon_trap);
 __ jalr(T9);
 __ delayed()->nop();
 // Set an oopmap for the call site
 OopMapSet *oop_maps = new OopMapSet();
 __ move(AT, -(StackAlignmentInBytes));
 __ andr(SP, SP, AT);   // Fix stack alignment as required by ABI
 __ relocate(relocInfo::internal_pc_type);
 {
-long save_pc = (long)__ pc() +  28 + NativeCall::return_address_offset;
+long save_pc = (long)__ pc() + 52;
 __ patchable_set48(AT, (long)save_pc);
 }
 __ sd(AT, thread,in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
 // Call C code.  Need thread but NOT official VM entry
 // crud.  We cannot block on this call, no GC can happen.  Call should
 // restore return values to their stack-slots with the new SP.
 __ move(A0, thread);
 __ move(A1, Deoptimization::Unpack_uncommon_trap);
-__ set64(T9, (long)Deoptimization::unpack_frames);
+__ patchable_set48(T9, (long)Deoptimization::unpack_frames);
 __ jalr(T9);
 __ delayed()->nop();
 // Set an oopmap for the call site
 //oop_maps->add_gc_map( __ offset(), true, new OopMap( framesize, 0 ) );
 oop_maps->add_gc_map( __ offset(),  new OopMap( framesize, 0 ) );//Fu
 //align the stack before invoke native
 __ move(AT, -(StackAlignmentInBytes));
 __ andr(SP, SP, AT);
 __ relocate(relocInfo::internal_pc_type);
 {
-intptr_t save_pc = (intptr_t)__ pc() +  NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 1 * BytesPerInstWord;
+intptr_t save_pc = (intptr_t)__ pc() +  NativeMovConstReg::instruction_size + 24 + 1 * BytesPerInstWord;
 //tty->print_cr(" %s :%d, name:%s, pc: %lx, save_pc: %lx, frame_size_words: %lx", __func__, __LINE__, name, __ pc(), save_pc, frame_size_words); //aoqi_test
 __ patchable_set48(AT, save_pc);
 }
 __ sd(AT, thread, in_bytes(JavaThread::last_Java_pc_offset()));

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

src/cpu/mips/vm/sharedRuntime_mips_64.cpp

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

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

src/cpu/mips/vm/sharedRuntime_mips_64.cpp