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

-:5bef3df0c689
+:57b216e5c8e3
 // the call to the VM
 if (JvmtiExport::can_post_field_access()) {
 // Check to see if a field access watch has been set before we
 // take the time to call into the VM.
 Label L1;
-assert_different_registers(cache, index, FSR);
+// kill FSR
+Register tmp1 = T2;
+Register tmp2 = T1;
+Register tmp3 = T3;
+assert_different_registers(cache, index, AT);
 __ li(AT, (intptr_t)JvmtiExport::get_field_access_count_addr());
-__ lw(FSR, AT, 0);
+__ lw(AT, AT, 0);
-__ beq(FSR, R0, L1);
+__ beq(AT, R0, L1);
 __ delayed()->nop();
-// We rely on the bytecode being resolved and the cpCache entry filled in.
+__ get_cache_and_index_at_bcp(tmp2, tmp3, 1);
 // cache entry pointer
-__ daddi(cache, cache, in_bytes(ConstantPoolCache::base_offset()));
+__ daddi(tmp2, tmp2, in_bytes(ConstantPoolCache::base_offset()));
-__ shl(index, 4);
+__ shl(tmp3, LogBytesPerWord);
-__ dadd(cache, cache, index);
+__ dadd(tmp2, tmp2, tmp3);
 if (is_static) {
-__ move(FSR, R0);
+__ move(tmp1, R0);
 } else {
-__ lw(FSR, SP, 0);
+__ ld(tmp1, SP, 0);
-__ verify_oop(FSR);
+__ verify_oop(tmp1);
 }
-// FSR: object pointer or NULL
+// tmp1: object pointer or NULL
-// cache: cache entry pointer
+// tmp2: cache entry pointer
+// tmp3: jvalue object on the stack
 __ call_VM(NOREG, CAST_FROM_FN_PTR(address,
-InterpreterRuntime::post_field_access), FSR, cache);
+InterpreterRuntime::post_field_access),
+tmp1, tmp2, tmp3);
 __ get_cache_and_index_at_bcp(cache, index, 1);
 __ bind(L1);
 }
 }
 const Register obj   = T3;
 const Register off   = T2;
 const Register flags = T1;
 resolve_cache_and_index(byte_no, cache, index, sizeof(u2));
-//jvmti_post_field_access(cache, index, is_static, false);
+jvmti_post_field_access(cache, index, is_static, false);
 load_field_cp_cache_entry(obj, cache, index, off, flags, is_static);
 if (!is_static) pop_and_check_object(obj);
 __ dadd(index, obj, off);
 }
 // The registers cache and index expected to be set before call.
 // The function may destroy various registers, just not the cache and index registers.
 void TemplateTable::jvmti_post_field_mod(Register cache, Register index, bool is_static) {
+transition(vtos, vtos);
 ByteSize cp_base_offset = ConstantPoolCache::base_offset();
 if (JvmtiExport::can_post_field_modification()) {
-// Check to see if a field modification watch has been set before we take
+// Check to see if a field modification watch has been set before
-// the time to call into the VM.
+// we take the time to call into the VM.
 Label L1;
-assert_different_registers(cache, index, AT);
+//kill AT, T1, T2, T3, T9
+Register tmp1 = T2;
+Register tmp2 = T1;
+Register tmp3 = T3;
+Register tmp4 = T9;
+assert_different_registers(cache, index, tmp4);
 __ li(AT, JvmtiExport::get_field_modification_count_addr());
-__ lw(FSR, AT, 0);
+__ lw(AT, AT, 0);
-__ beq(FSR, R0, L1);
+__ beq(AT, R0, L1);
 __ delayed()->nop();
-/* // We rely on the bytecode being resolved and the cpCache entry filled in.
+__ get_cache_and_index_at_bcp(tmp2, tmp4, 1);
-resolve_cache_and_index(byte_no, T1, T1);
-*/
-// The cache and index registers have been already set.
-// This allows to eliminate this call but the cache and index
-// registers have to be correspondingly used after this line.
-__ get_cache_and_index_at_bcp(T1, T9, 1);
 if (is_static) {
-__ move(T2, R0);
+__ move(tmp1, R0);
 } else {
-// Life is harder. The stack holds the value on top,
+// Life is harder. The stack holds the value on top, followed by
-// followed by the object.
+// the object.  We don't know the size of the value, though; it
-// We don't know the size of the value, though;
+// could be one or two words depending on its type. As a result,
-// it could be one or two words
+// we must find the type to determine where the object is.
-// depending on its type. As a result, we must find
-// the type to determine where the object is.
 Label two_word, valsize_known;
-__ dsll(AT, T1, 4);
+__ dsll(AT, tmp4, Address::times_8);
-__ dadd(AT, T1, AT);
+__ dadd(AT, tmp2, AT);
-__ lw(T3, AT, in_bytes(cp_base_offset
+__ ld(tmp3, AT, in_bytes(cp_base_offset +
-+ ConstantPoolCacheEntry::flags_offset()));
+ConstantPoolCacheEntry::flags_offset()));
-__ move(T2, SP);
+__ shr(tmp3, ConstantPoolCacheEntry::tos_state_shift);
-__ shr(T3, ConstantPoolCacheEntry::tos_state_shift);
 // Make sure we don't need to mask ecx for tos_state_shift
 // after the above shift
 ConstantPoolCacheEntry::verify_tos_state_shift();
+__ move(tmp1, SP);
 __ move(AT, ltos);
-__ beq(T3, AT, two_word);
+__ beq(tmp3, AT, two_word);
 __ delayed()->nop();
 __ move(AT, dtos);
-__ beq(T3, AT, two_word);
+__ beq(tmp3, AT, two_word);
 __ delayed()->nop();
 __ b(valsize_known);
-__ delayed()->daddi(T2, T2,Interpreter::expr_offset_in_bytes(1) );
+__ delayed()->daddi(tmp1, tmp1, Interpreter::expr_offset_in_bytes(1) );
 __ bind(two_word);
-__ daddi(T2, T2,Interpreter::expr_offset_in_bytes(2));
+__ daddi(tmp1, tmp1, Interpreter::expr_offset_in_bytes(2));
 __ bind(valsize_known);
 // setup object pointer
-__ lw(T2, T2, 0*wordSize);
+__ ld(tmp1, tmp1, 0*wordSize);
 }
 // cache entry pointer
-__ daddi(T1, T1, in_bytes(cp_base_offset));
+__ daddi(tmp2, tmp2, in_bytes(cp_base_offset));
-__ shl(T1, 4);
+__ shl(tmp4, LogBytesPerWord);
-__ daddu(T1, T1, T1);
+__ daddu(tmp2, tmp2, tmp4);
 // object (tos)
-__ move(T3, SP);
+__ move(tmp3, SP);
-// T2: object pointer set up above (NULL if static)
+// tmp1: object pointer set up above (NULL if static)
-// T1: cache entry pointer
+// tmp2: cache entry pointer
-// T3: jvalue object on the stack
+// tmp3: jvalue object on the stack
-__ call_VM(NOREG, CAST_FROM_FN_PTR(address,
+__ call_VM(NOREG,
-InterpreterRuntime::post_field_modification), T2, T1, T3);
+CAST_FROM_FN_PTR(address,
+InterpreterRuntime::post_field_modification),
+tmp1, tmp2, tmp3);
 __ get_cache_and_index_at_bcp(cache, index, 1);
 __ bind(L1);
 }
 }
 const Register off   = T2;
 const Register flags = T1;
 const Register bc    = T3;
 resolve_cache_and_index(byte_no, cache, index, sizeof(u2));
-//jvmti_post_field_mod(cache, index, is_static);
+jvmti_post_field_mod(cache, index, is_static);
 load_field_cp_cache_entry(obj, cache, index, off, flags, is_static);
 Label notVolatile, Done;
 __ move(AT, 1<<ConstantPoolCacheEntry::is_volatile_shift);
 __ andr(T8, flags, AT);
 void TemplateTable::jvmti_post_fast_field_mod() {
 if (JvmtiExport::can_post_field_modification()) {
 // Check to see if a field modification watch has been set before
 // we take the time to call into the VM.
 Label L2;
+//kill AT, T1, T2, T3, T9
+Register tmp1 = T2;
+Register tmp2 = T1;
+Register tmp3 = T3;
+Register tmp4 = T9;
 __ li(AT, JvmtiExport::get_field_modification_count_addr());
-__ lw(T3, AT, 0);
+__ lw(tmp3, AT, 0);
-__ beq(T3, R0, L2);
+__ beq(tmp3, R0, L2);
 __ delayed()->nop();
-__ pop_ptr(T2);
+__ pop_ptr(tmp1);
-__ verify_oop(T2);
+__ verify_oop(tmp1);
-__ push_ptr(T2);
+__ push_ptr(tmp1);
-__ li(AT, -sizeof(jvalue));
-__ daddu(SP, SP, AT);
-__ move(T3, SP);
 switch (bytecode()) {          // load values into the jvalue object
-case Bytecodes::_fast_bputfield:
+case Bytecodes::_fast_aputfield: __ push_ptr(FSR); break;
-__ sb(FSR, SP, 0);
+case Bytecodes::_fast_bputfield: // fall through
-break;
+case Bytecodes::_fast_sputfield: // fall through
-case Bytecodes::_fast_sputfield:
+case Bytecodes::_fast_cputfield: // fall through
-__ sh(FSR, SP, 0);
+case Bytecodes::_fast_iputfield: __ push_i(FSR); break;
-break;
+case Bytecodes::_fast_dputfield: __ push_d(FSF); break;
-case Bytecodes::_fast_cputfield:
+case Bytecodes::_fast_fputfield: __ push_f(); break;
-__ sh(FSR, SP, 0);
+case Bytecodes::_fast_lputfield: __ push_l(FSR); break;
-break;
-case Bytecodes::_fast_iputfield:
-__ sw(FSR, SP, 0);
-break;
-case Bytecodes::_fast_lputfield:
-__ sd(FSR, SP, 0);
-break;
-case Bytecodes::_fast_fputfield:
-__ swc1(FSF, SP, 0);
-break;
-case Bytecodes::_fast_dputfield:
-__ sdc1(FSF, SP, 0);
-break;
-case Bytecodes::_fast_aputfield:
-__ sd(FSR, SP, 0);
-break;
 default:  ShouldNotReachHere();
 }
+__ move(tmp3, SP);
-// Save eax and sometimes edx because call_VM() will clobber them,
-// then use them for JVM/DI purposes
-__ push(FSR);
-if (bytecode() == Bytecodes::_fast_lputfield) __ push(SSR);
 // access constant pool cache entry
-__ get_cache_entry_pointer_at_bcp(T1, T2, 1);
+__ get_cache_entry_pointer_at_bcp(tmp2, FSR, 1);
-// no need, verified ahead
+__ verify_oop(tmp1);
-__ verify_oop(T2);
+// tmp1: object pointer copied above
+// tmp2: cache entry pointer
-// ebx: object pointer copied above
+// tmp3: jvalue object on the stack
-// eax: cache entry pointer
+__ call_VM(NOREG,
-// ecx: jvalue object on the stack
+CAST_FROM_FN_PTR(address,
-__ call_VM(NOREG, CAST_FROM_FN_PTR(address,
+InterpreterRuntime::post_field_modification),
-InterpreterRuntime::post_field_modification), T2, T1, T3);
+tmp1, tmp2, tmp3);
-if (bytecode() == Bytecodes::_fast_lputfield) __ pop(SSR);  // restore high value
-__ lw(FSR, SP, 0);
+switch (bytecode()) {             // restore tos values
-__ daddiu(SP, SP, sizeof(jvalue) + 1 * wordSize);
+case Bytecodes::_fast_aputfield: __ pop_ptr(FSR); break;
+case Bytecodes::_fast_bputfield: // fall through
+case Bytecodes::_fast_sputfield: // fall through
+case Bytecodes::_fast_cputfield: // fall through
+case Bytecodes::_fast_iputfield: __ pop_i(FSR); break;
+case Bytecodes::_fast_dputfield: __ pop_d(); break;
+case Bytecodes::_fast_fputfield: __ pop_f(); break;
+case Bytecodes::_fast_lputfield: __ pop_l(FSR); break;
+}
 __ bind(L2);
 }
 }
 // used registers : T2, T3, T1

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

src/cpu/mips/vm/templateTable_mips_64.cpp

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

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

src/cpu/mips/vm/templateTable_mips_64.cpp