jdk8-mips64-public/hotspot: comparison src/cpu/sparc/vm/templateTable

-:b374548dcb48
+:32b682649973
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 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(O2); // index
 // Otos_i: val
+// O2: index
 // O3: array
 __ index_check(O3, O2, 0, G3_scratch, O2);
+// Need to check whether array is boolean or byte
+// since both types share the bastore bytecode.
+__ load_klass(O3, G4_scratch);
+__ ld(G4_scratch, in_bytes(Klass::layout_helper_offset()), G4_scratch);
+__ set(Klass::layout_helper_boolean_diffbit(), G3_scratch);
+__ andcc(G3_scratch, G4_scratch, G0);
+Label L_skip;
+__ br(Assembler::zero, false, Assembler::pn, L_skip);
+__ delayed()->nop();
+__ and3(Otos_i, 1, Otos_i);  // if it is a T_BOOLEAN array, mask the stored value to 0/1
+__ bind(L_skip);
 __ stb(Otos_i, O2, arrayOopDesc::base_offset_in_bytes(T_BYTE));
 }
 void TemplateTable::castore() {
 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::register_finalizer), Otos_i);
 __ 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(Otos_i);
+}
 __ remove_activation(state, /* throw_monitor_exception */ true);
 // The caller's SP was adjusted upon method entry to accomodate
 // the callee's non-argument locals. Undo that adjustment.
 __ ret();                             // return to caller
 }
 Label checkVolatile;
 // compute field type
-Label notByte, notInt, notShort, notChar, notLong, notFloat, notObj;
+Label notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj;
 __ srl(Rflags, ConstantPoolCacheEntry::tos_state_shift, Rflags);
 // Make sure we don't need to mask Rflags after the above shift
 ConstantPoolCacheEntry::verify_tos_state_shift();
 // Check atos before itos for getstatic, more likely (in Queens at least)
 __ bind(notLong);
 // cmp(Rflags, btos);
 __ br(Assembler::notEqual, false, Assembler::pt, notByte);
-__ delayed() ->cmp(Rflags, ctos);
+__ delayed() ->cmp(Rflags, ztos);
 // btos
 __ ldsb(Rclass, Roffset, Otos_i);
 __ push(itos);
 if (!is_static) {
 }
 __ ba(checkVolatile);
 __ delayed()->tst(Lscratch);
 __ bind(notByte);
+// cmp(Rflags, ztos);
+__ br(Assembler::notEqual, false, Assembler::pt, notBool);
+__ delayed() ->cmp(Rflags, ctos);
+// ztos
+__ ldsb(Rclass, Roffset, Otos_i);
+__ push(itos);
+if (!is_static) {
+// use btos rewriting, no truncating to t/f bit is needed for getfield.
+patch_bytecode(Bytecodes::_fast_bgetfield, G3_scratch, G4_scratch);
+}
+__ ba(checkVolatile);
+__ delayed()->tst(Lscratch);
+__ bind(notBool);
 // cmp(Rflags, ctos);
 __ br(Assembler::notEqual, false, Assembler::pt, notChar);
 __ delayed() ->cmp(Rflags, stos);
 // to do it for every data type, we use the saved values as the
 // jvalue object.
 switch (bytecode()) {  // save tos values before call_VM() clobbers them
 case Bytecodes::_fast_aputfield: __ push_ptr(Otos_i); 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(Otos_i); break;
 case Bytecodes::_fast_dputfield: __ push_d(Ftos_d); break;
 case Bytecodes::_fast_fputfield: __ push_f(Ftos_f); break;
 // G3_scratch: jvalue object on the stack
 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_modification), G4_scratch, G1_scratch, G3_scratch);
 switch (bytecode()) {             // restore tos values
 case Bytecodes::_fast_aputfield: __ pop_ptr(Otos_i); 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(Otos_i); break;
 case Bytecodes::_fast_dputfield: __ pop_d(Ftos_d); break;
 case Bytecodes::_fast_fputfield: __ pop_f(Ftos_f); break;
 __ srl(Rflags, ConstantPoolCacheEntry::tos_state_shift, Rflags);
 // Make sure we don't need to mask Rflags after the above shift
 ConstantPoolCacheEntry::verify_tos_state_shift();
 // compute field type
-Label notInt, notShort, notChar, notObj, notByte, notLong, notFloat;
+Label notInt, notShort, notChar, notObj, notByte, notBool, notLong, notFloat;
 if (is_static) {
 // putstatic with object type most likely, check that first
 __ cmp(Rflags, atos);
 __ br(Assembler::notEqual, false, Assembler::pt, notObj);
 __ bind(notObj);
 }
 // cmp(Rflags, btos);
 __ br(Assembler::notEqual, false, Assembler::pt, notByte);
-__ delayed()->cmp(Rflags, ltos);
+__ delayed()->cmp(Rflags, ztos);
 // btos
 {
 __ pop_i();
 if (!is_static) pop_and_check_object(Rclass);
 __ ba(checkVolatile);
 __ delayed()->tst(Lscratch);
 }
 __ bind(notByte);
+// cmp(Rflags, btos);
+__ br(Assembler::notEqual, false, Assembler::pt, notBool);
+__ delayed()->cmp(Rflags, ltos);
+// ztos
+{
+__ pop_i();
+if (!is_static) pop_and_check_object(Rclass);
+__ and3(Otos_i, 1, Otos_i);
+__ stb(Otos_i, Rclass, Roffset);
+if (!is_static) {
+patch_bytecode(Bytecodes::_fast_zputfield, G3_scratch, G4_scratch, true, byte_no);
+}
+__ ba(checkVolatile);
+__ delayed()->tst(Lscratch);
+}
+__ bind(notBool);
 // cmp(Rflags, ltos);
 __ br(Assembler::notEqual, false, Assembler::pt, notLong);
 __ delayed()->cmp(Rflags, ctos);
 // ltos
 __ ld_ptr(Rcache, cp_base_offset + ConstantPoolCacheEntry::f2_offset(), Roffset);
 pop_and_check_object(Rclass);
 switch (bytecode()) {
+case Bytecodes::_fast_zputfield: __ and3(Otos_i, 1, Otos_i);  // fall through to bputfield
 case Bytecodes::_fast_bputfield: __ stb(Otos_i, Rclass, Roffset); break;
 case Bytecodes::_fast_cputfield: /* fall through */
 case Bytecodes::_fast_sputfield: __ sth(Otos_i, Rclass, Roffset); break;
 case Bytecodes::_fast_iputfield: __ st(Otos_i, Rclass, Roffset);  break;
 case Bytecodes::_fast_lputfield: __ st_long(Otos_l, Rclass, Roffset); break;

comparison: src/cpu/sparc/vm/templateTable_sparc.cpp

src/cpu/sparc/vm/templateTable_sparc.cpp

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

comparison: src/cpu/sparc/vm/templateTable_sparc.cpp

src/cpu/sparc/vm/templateTable_sparc.cpp