graal-jvmci-8: src/cpu/x86/vm/templateTable_x86

comparison src/cpu/x86/vm/templateTable_x86_64.cpp @ 23614:32b682649973 jdk8u75-b04

8132051: Better byte behavior Reviewed-by: coleenp, roland

author	kevinw
date	Fri, 15 Jan 2016 22:33:15 +0000
parents	42790b7e4d48
children	b5f3a471e646

comparison

equal deleted inserted replaced

-:b374548dcb48
+:32b682649973
 /*
-* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 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:
 __ pop_ptr(rdx);
 // eax: value
 // ebx: index
 // rdx: array
 index_check(rdx, rbx); // prefer index in ebx
+// Need to check whether array is boolean or byte
+// since both types share the bastore bytecode.
+__ load_klass(rcx, rdx);
+__ movl(rcx, Address(rcx, Klass::layout_helper_offset()));
+int diffbit = Klass::layout_helper_boolean_diffbit();
+__ testl(rcx, diffbit);
+Label L_skip;
+__ jccb(Assembler::zero, L_skip);
+__ andl(rax, 1);  // if it is a T_BOOLEAN array, mask the stored value to 0/1
+__ bind(L_skip);
 __ movb(Address(rdx, rbx,
 Address::times_1,
 arrayOopDesc::base_offset_in_bytes(T_BYTE)),
 rax);
 }
 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::register_finalizer), c_rarg1);
 __ 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(rax);
+}
 __ remove_activation(state, r13);
 __ jmp(r13);
 }
 // ----------------------------------------------------------------------------
 // Volatile variables demand their effects be made known to all CPU's
 pop_and_check_object(obj);
 }
 const Address field(obj, off, Address::times_1);
-Label Done, notByte, notInt, notShort, notChar,
+Label Done, notByte, notBool, notInt, notShort, notChar,
 notLong, notFloat, notObj, notDouble;
 __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
 // Make sure we don't need to mask edx after the above shift
 assert(btos == 0, "change code, btos != 0");
 patch_bytecode(Bytecodes::_fast_bgetfield, bc, rbx);
 }
 __ jmp(Done);
 __ bind(notByte);
+__ cmpl(flags, ztos);
+__ jcc(Assembler::notEqual, notBool);
+// ztos (same code as btos)
+__ load_signed_byte(rax, field);
+__ push(ztos);
+// Rewrite bytecode to be faster
+if (!is_static) {
+// use btos rewriting, no truncating to t/f bit is needed for getfield.
+patch_bytecode(Bytecodes::_fast_bgetfield, bc, rbx);
+}
+__ jmp(Done);
+__ bind(notBool);
 __ cmpl(flags, atos);
 __ jcc(Assembler::notEqual, notObj);
 // atos
 __ load_heap_oop(rax, field);
 __ push(atos);
 __ andl(rdx, 0x1);
 // field address
 const Address field(obj, off, Address::times_1);
-Label notByte, notInt, notShort, notChar,
+Label notByte, notBool, notInt, notShort, notChar,
 notLong, notFloat, notObj, notDouble;
 __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
 assert(btos == 0, "change code, btos != 0");
 }
 __ jmp(Done);
 }
 __ bind(notByte);
+__ cmpl(flags, ztos);
+__ jcc(Assembler::notEqual, notBool);
+// ztos
+{
+__ pop(ztos);
+if (!is_static) pop_and_check_object(obj);
+__ andl(rax, 0x1);
+__ movb(field, rax);
+if (!is_static) {
+patch_bytecode(Bytecodes::_fast_zputfield, bc, rbx, true, byte_no);
+}
+__ jmp(Done);
+}
+__ bind(notBool);
 __ cmpl(flags, atos);
 __ jcc(Assembler::notEqual, notObj);
 // atos
 {
 // to do it for every data type, we use the saved values as the
 // jvalue object.
 switch (bytecode()) {          // load values into the jvalue object
 case Bytecodes::_fast_aputfield: __ push_ptr(rax); 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(rax); break;
 case Bytecodes::_fast_dputfield: __ push_d(); break;
 case Bytecodes::_fast_fputfield: __ push_f(); break;
 rbx, c_rarg2, c_rarg3);
 switch (bytecode()) {             // restore tos values
 case Bytecodes::_fast_aputfield: __ pop_ptr(rax); 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(rax); break;
 case Bytecodes::_fast_dputfield: __ pop_d(); break;
 case Bytecodes::_fast_fputfield: __ pop_f(); break;
 __ movq(field, rax);
 break;
 case Bytecodes::_fast_iputfield:
 __ movl(field, rax);
 break;
+case Bytecodes::_fast_zputfield:
+__ andl(rax, 0x1);  // boolean is true if LSB is 1
+// fall through to bputfield
 case Bytecodes::_fast_bputfield:
 __ movb(field, rax);
 break;
 case Bytecodes::_fast_sputfield:
 // fall through

Mercurial > hg > graal-jvmci-8

comparison src/cpu/x86/vm/templateTable_x86_64.cpp @ 23614:32b682649973 jdk8u75-b04