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

-:69619c96717a
+:e3f4d3592615
 Label L_patch_done;
 switch (bc) {
 case Bytecodes::_fast_aputfield:
 case Bytecodes::_fast_bputfield:
+case Bytecodes::_fast_zputfield:
 case Bytecodes::_fast_cputfield:
 case Bytecodes::_fast_dputfield:
 case Bytecodes::_fast_fputfield:
 case Bytecodes::_fast_iputfield:
 case Bytecodes::_fast_lputfield:
 void TemplateTable::bastore() {
 transition(itos, vtos);
 __ pop_i(SSR);
 if(UseBoundCheckInstruction) {
+guarantee(false, "unimplemented yet!");
 __ pop_ptr(T2);
 __ dadd(SSR, T2, SSR);
 __ addi(SSR, SSR, arrayOopDesc::base_offset_in_bytes(T_BYTE));  // base
 __ lw(AT, T2, arrayOopDesc::length_offset_in_bytes());
 __ addi(AT, AT, arrayOopDesc::base_offset_in_bytes(T_BYTE));  //bound
 __ gssble(FSR, SSR, AT);
 } else {
 index_check(T2, SSR);
+// Need to check whether array is boolean or byte
+// since both types share the bastore bytecode.
+__ load_klass(T9, T2);
+__ lw(T9, T9, in_bytes(Klass::layout_helper_offset()));
+int diffbit = Klass::layout_helper_boolean_diffbit();
+__ move(AT, diffbit);
+Label L_skip;
+__ andr(AT, T9, AT);
+__ beq(AT, R0, L_skip);
+__ nop();
+__ andi(FSR, FSR, 0x1);
+__ bind(L_skip);
 if (UseLoongsonISA && Assembler::is_simm(arrayOopDesc::base_offset_in_bytes(T_BYTE), 8)) {
 __ gssbx(FSR, T2, SSR, arrayOopDesc::base_offset_in_bytes(T_BYTE));
 } else {
 __ dadd(SSR, T2, SSR);
 __ sb(FSR, SSR, arrayOopDesc::base_offset_in_bytes(T_BYTE));
 __ delayed()->nop();
 __ call_VM(noreg, CAST_FROM_FN_PTR(address,
 InterpreterRuntime::register_finalizer), T1);
 __ bind(skip_register_finalizer);
 }
+// Narrow result if state is itos but result type is smaller.
+// Need to narrow in the return bytecode rather than in generate_return_entry
+// since compiled code callers expect the result to already be narrowed.
+if (state == itos) {
+__ narrow(FSR);
+}
 __ remove_activation(state, T9);
 __ sync();
 __ jr(T9);
 __ delayed()->nop();
 if (!is_static) pop_and_check_object(obj);
 __ dadd(index, obj, off);
-Label Done, notByte, notInt, notShort, notChar,
+Label Done, notByte, notBool, notInt, notShort, notChar,
 notLong, notFloat, notObj, notDouble;
 assert(btos == 0, "change code, btos != 0");
 __ dsrl(flags, flags, ConstantPoolCacheEntry::tos_state_shift);
-__ andi(flags, flags, 0xf);
+__ andi(flags, flags, ConstantPoolCacheEntry::tos_state_mask);
 __ bne(flags, R0, notByte);
 __ delayed()->nop();
 // btos
 __ lb(FSR, index, 0);
 patch_bytecode(Bytecodes::_fast_bgetfield, T3, T2);
 }
 __ b(Done);
 __ delayed()->daddi(SP, SP, - wordSize);
 __ bind(notByte);
+__ move(AT, ztos);
+__ bne(flags, AT, notBool);
+__ delayed()->nop();
+// ztos
+__ lb(FSR, index, 0);
+__ sd(FSR, SP, - wordSize);
+// Rewrite bytecode to be faster
+if (!is_static) {
+// patch_bytecode(Bytecodes::_fast_igetfield, T3, T2);
+patch_bytecode(Bytecodes::_fast_bgetfield, T3, T2);
+}
+__ b(Done);
+__ delayed()->daddi(SP, SP, - wordSize);
+__ bind(notBool);
 __ move(AT, itos);
 __ bne(flags, AT, notInt);
 __ delayed()->nop();
 // itos
 volatile_barrier();
 __ bind(notVolatile);
 }
-Label notByte, notInt, notShort, notChar, notLong, notFloat, notObj, notDouble;
+Label notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj, notDouble;
 assert(btos == 0, "change code, btos != 0");
 // btos
 __ dsrl(flags, flags, ConstantPoolCacheEntry::tos_state_shift);
 patch_bytecode(Bytecodes::_fast_bputfield, bc, off, true, byte_no);
 }
 __ b(Done);
 __ delayed()->nop();
+// ztos
+__ bind(notByte);
+__ move(AT, ztos);
+__ bne(flags, AT, notBool);
+__ delayed()->nop();
+__ pop(ztos);
+if (!is_static) {
+pop_and_check_object(obj);
+}
+__ dadd(AT, obj, off);
+__ andi(FSR, FSR, 0x1);
+__ sb(FSR, AT, 0);
+if (!is_static) {
+patch_bytecode(Bytecodes::_fast_zputfield, bc, off, true, byte_no);
+}
+__ b(Done);
+__ delayed()->nop();
 // itos
-__ bind(notByte);
+__ bind(notBool);
 __ move(AT, itos);
 __ bne(flags, AT, notInt);
 __ delayed()->nop();
 __ pop(itos);
 __ verify_oop(tmp1);
 __ push_ptr(tmp1);
 switch (bytecode()) {          // load values into the jvalue object
 case Bytecodes::_fast_aputfield: __ push_ptr(FSR); break;
 case Bytecodes::_fast_bputfield: // fall through
+case Bytecodes::_fast_zputfield: // fall through
 case Bytecodes::_fast_sputfield: // fall through
 case Bytecodes::_fast_cputfield: // fall through
 case Bytecodes::_fast_iputfield: __ push_i(FSR); break;
 case Bytecodes::_fast_dputfield: __ push_d(FSF); break;
 case Bytecodes::_fast_fputfield: __ push_f(); break;
 tmp1, tmp2, tmp3);
 switch (bytecode()) {             // restore tos values
 case Bytecodes::_fast_aputfield: __ pop_ptr(FSR); break;
 case Bytecodes::_fast_bputfield: // fall through
+case Bytecodes::_fast_zputfield: // 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;
 __ dadd(T2, T3, T2);
 }
 // access field
 switch (bytecode()) {
+case Bytecodes::_fast_zputfield:
+__ andi(FSR, FSR, 0x1);  // boolean is true if LSB is 1
+// fall through to bputfield
 case Bytecodes::_fast_bputfield:
 __ sb(FSR, T2, 0);
 break;
 case Bytecodes::_fast_sputfield: // fall through
 case Bytecodes::_fast_cputfield:

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