1.1 --- a/src/cpu/mips/vm/sharedRuntime_mips_64.cpp Sun Mar 05 16:29:58 2017 -0500
1.2 +++ b/src/cpu/mips/vm/sharedRuntime_mips_64.cpp Mon Mar 06 05:13:05 2017 -0500
1.3 @@ -2468,7 +2468,7 @@
1.4 // Klass::cast(method->method_holder())->java_mirror())));
1.5 //__ addiu(oop_handle_reg, oop_handle_reg, Assembler::split_low((int)
1.6 // JNIHandles::make_local(Klass::cast(method->method_holder())->java_mirror())));
1.7 - __ li48(oop_handle_reg, (long)JNIHandles::make_local((method->method_holder())->java_mirror()));
1.8 + __ patchable_set48(oop_handle_reg, (long)JNIHandles::make_local((method->method_holder())->java_mirror()));
1.9 // __ verify_oop(oop_handle_reg);
1.10 // Now handlize the static class mirror it's known not-null.
1.11 __ sd( oop_handle_reg, SP, klass_offset);
1.12 @@ -2495,7 +2495,7 @@
1.13 __ relocate(relocInfo::internal_pc_type);
1.14 {
1.15 intptr_t save_pc = (intptr_t)the_pc ;
1.16 - __ li48(AT, save_pc);
1.17 + __ patchable_set48(AT, save_pc);
1.18 }
1.19 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
1.20
1.21 @@ -2509,7 +2509,7 @@
1.22 __ relocate(rspec);
1.23 //__ lui(T6, Assembler::split_high((int)JNIHandles::make_local(method())));
1.24 //__ addiu(T6, T6, Assembler::split_low((int)JNIHandles::make_local(method())));
1.25 - __ li48(AT, (long)(method()));
1.26 + __ patchable_set48(AT, (long)(method()));
1.27
1.28 __ call_VM_leaf(
1.29 CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
1.30 @@ -2772,7 +2772,7 @@
1.31 __ relocate(rspec);
1.32 //__ lui(T6, Assembler::split_high((int)JNIHandles::make_local(method())));
1.33 //__ addiu(T6, T6, Assembler::split_low((int)JNIHandles::make_local(method())));
1.34 - __ li48(AT, (long)(method()));
1.35 + __ patchable_set48(AT, (long)(method()));
1.36
1.37 __ call_VM_leaf(
1.38 CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
1.39 @@ -3829,7 +3829,7 @@
1.40 __ relocate(relocInfo::internal_pc_type);
1.41 {
1.42 intptr_t save_pc = (intptr_t)__ pc() + NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 4;
1.43 - __ li48(AT, save_pc);
1.44 + __ patchable_set48(AT, save_pc);
1.45 }
1.46 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
1.47
1.48 @@ -3994,7 +3994,7 @@
1.49 __ relocate(relocInfo::internal_pc_type);
1.50 {
1.51 intptr_t save_pc = (intptr_t)__ pc() + NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 4;
1.52 - __ li48(AT, save_pc);
1.53 + __ patchable_set48(AT, save_pc);
1.54 }
1.55 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
1.56
1.57 @@ -4094,7 +4094,7 @@
1.58 assert(NativeCall::return_address_offset == 24, "in sharedRuntime return_address_offset");
1.59 {
1.60 long save_pc = (long)__ pc() + 28 + NativeCall::return_address_offset;
1.61 - __ li48(AT, (long)save_pc);
1.62 + __ patchable_set48(AT, (long)save_pc);
1.63 __ sd(AT, thread, in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
1.64 }
1.65 // Call C code. Need thread but NOT official VM entry
1.66 @@ -4103,7 +4103,7 @@
1.67 __ move(A0, thread);
1.68 // argument already in T0
1.69 __ move(A1, T0);
1.70 - __ li48(T9, (long)Deoptimization::uncommon_trap);
1.71 + __ set64(T9, (long)Deoptimization::uncommon_trap);
1.72 __ jalr(T9);
1.73 __ delayed()->nop();
1.74
1.75 @@ -4216,7 +4216,7 @@
1.76 __ relocate(relocInfo::internal_pc_type);
1.77 {
1.78 long save_pc = (long)__ pc() + 28 + NativeCall::return_address_offset;
1.79 - __ li48(AT, (long)save_pc);
1.80 + __ patchable_set48(AT, (long)save_pc);
1.81 }
1.82 __ sd(AT, thread,in_bytes(JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
1.83
1.84 @@ -4225,7 +4225,7 @@
1.85 // restore return values to their stack-slots with the new SP.
1.86 __ move(A0, thread);
1.87 __ move(A1, Deoptimization::Unpack_uncommon_trap);
1.88 - __ li48(T9, (long)Deoptimization::unpack_frames);
1.89 + __ set64(T9, (long)Deoptimization::unpack_frames);
1.90 __ jalr(T9);
1.91 __ delayed()->nop();
1.92 // Set an oopmap for the call site
1.93 @@ -4408,7 +4408,7 @@
1.94 {
1.95 intptr_t save_pc = (intptr_t)__ pc() + NativeMovConstReg::instruction_size + NativeCall::return_address_offset + 1 * BytesPerInstWord;
1.96 //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
1.97 - __ li48(AT, save_pc);
1.98 + __ patchable_set48(AT, save_pc);
1.99 }
1.100 __ sd(AT, thread, in_bytes(JavaThread::last_Java_pc_offset()));
1.101
