--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp Wed Jun 12 14:06:16 2019 +0200
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp Wed Jun 12 14:21:36 2019 +0200
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, SAP SE. 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
@@ -4339,9 +4339,8 @@
z_lg(result, 0, result);
}
-void MacroAssembler::load_mirror(Register mirror, Register method) {
- mem2reg_opt(mirror, Address(method, Method::const_offset()));
- mem2reg_opt(mirror, Address(mirror, ConstMethod::constants_offset()));
+void MacroAssembler::load_mirror_from_const_method(Register mirror, Register const_method) {
+ mem2reg_opt(mirror, Address(const_method, ConstMethod::constants_offset()));
mem2reg_opt(mirror, Address(mirror, ConstantPool::pool_holder_offset_in_bytes()));
mem2reg_opt(mirror, Address(mirror, Klass::java_mirror_offset()));
resolve_oop_handle(mirror);
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp Wed Jun 12 14:06:16 2019 +0200
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp Wed Jun 12 14:21:36 2019 +0200
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, SAP SE. 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
@@ -821,7 +821,7 @@
const int page_size = os::vm_page_size();
NearLabel after_frame_check;
- BLOCK_COMMENT("counter_overflow {");
+ BLOCK_COMMENT("stack_overflow_check {");
assert_different_registers(frame_size, tmp1);
@@ -883,7 +883,7 @@
// If you get to here, then there is enough stack space.
__ bind(after_frame_check);
- BLOCK_COMMENT("} counter_overflow");
+ BLOCK_COMMENT("} stack_overflow_check");
}
// Allocate monitor and lock method (asm interpreter).
@@ -927,7 +927,9 @@
__ bind(static_method);
// Lock the java mirror.
- __ load_mirror(object, method);
+ // Load mirror from interpreter frame.
+ __ z_lg(object, _z_ijava_state_neg(mirror), Z_fp);
+
#ifdef ASSERT
{
NearLabel L;
@@ -991,20 +993,20 @@
// Allocate space for locals other than the parameters, the
// interpreter state, monitors, and the expression stack.
- const Register local_count = Z_ARG5;
- const Register fp = Z_tmp_2;
+ const Register local_count = Z_ARG5;
+ const Register fp = Z_tmp_2;
+ const Register const_method = Z_ARG1;
BLOCK_COMMENT("generate_fixed_frame {");
-
{
// local registers
const Register top_frame_size = Z_ARG2;
const Register sp_after_resize = Z_ARG3;
const Register max_stack = Z_ARG4;
- // local_count = method->constMethod->max_locals();
- __ z_lg(Z_R1_scratch, Address(Z_method, Method::const_offset()));
- __ z_llgh(local_count, Address(Z_R1_scratch, ConstMethod::size_of_locals_offset()));
+ __ z_lg(const_method, Address(Z_method, Method::const_offset()));
+ __ z_llgh(max_stack, Address(const_method, ConstMethod::size_of_parameters_offset()));
+ __ z_sllg(Z_locals /*parameter_count bytes*/, max_stack /*parameter_count*/, LogBytesPerWord);
if (native_call) {
// If we're calling a native method, we replace max_stack (which is
@@ -1024,9 +1026,6 @@
// area, so we need to allocate at least that much even though we're
// going to throw it away.
//
-
- __ z_lg(Z_R1_scratch, Address(Z_method, Method::const_offset()));
- __ z_llgh(max_stack, Address(Z_R1_scratch, ConstMethod::size_of_parameters_offset()));
__ add2reg(max_stack, 2);
NearLabel passing_args_on_stack;
@@ -1042,14 +1041,14 @@
__ bind(passing_args_on_stack);
} else {
// !native_call
- __ z_lg(max_stack, method_(const));
+ // local_count = method->constMethod->max_locals();
+ __ z_llgh(local_count, Address(const_method, ConstMethod::size_of_locals_offset()));
// Calculate number of non-parameter locals (in slots):
- __ z_lg(Z_R1_scratch, Address(Z_method, Method::const_offset()));
- __ z_sh(local_count, Address(Z_R1_scratch, ConstMethod::size_of_parameters_offset()));
+ __ z_sgr(local_count, max_stack);
// max_stack = method->max_stack();
- __ z_llgh(max_stack, Address(max_stack, ConstMethod::max_stack_offset()));
+ __ z_llgh(max_stack, Address(const_method, ConstMethod::max_stack_offset()));
// max_stack in bytes
__ z_sllg(max_stack, max_stack, LogBytesPerWord);
}
@@ -1089,14 +1088,15 @@
// delta = PARENT_IJAVA_FRAME_ABI + (locals_count - params_count)
__ add2reg(sp_after_resize, (Interpreter::stackElementSize) - (frame::z_parent_ijava_frame_abi_size), Z_esp);
- __ z_sllg(Z_R0_scratch, local_count, LogBytesPerWord); // Params have already been subtracted from local_count.
- __ z_slgr(sp_after_resize, Z_R0_scratch);
+ if (!native_call) {
+ __ z_sllg(Z_R0_scratch, local_count, LogBytesPerWord); // Params have already been subtracted from local_count.
+ __ z_slgr(sp_after_resize, Z_R0_scratch);
+ }
// top_frame_size = TOP_IJAVA_FRAME_ABI + max_stack + size of interpreter state
__ add2reg(top_frame_size,
frame::z_top_ijava_frame_abi_size +
- frame::z_ijava_state_size +
- frame::interpreter_frame_monitor_size() * wordSize,
+ frame::z_ijava_state_size,
max_stack);
if (!native_call) {
@@ -1104,7 +1104,7 @@
// Native calls don't need the stack size check since they have no
// expression stack and the arguments are already on the stack and
// we only add a handful of words to the stack.
- Register frame_size = max_stack; // Reuse the regiser for max_stack.
+ Register frame_size = max_stack; // Reuse the register for max_stack.
__ z_lgr(frame_size, Z_SP);
__ z_sgr(frame_size, sp_after_resize);
__ z_agr(frame_size, top_frame_size);
@@ -1136,13 +1136,12 @@
#endif
// Save sender SP from F1 (i.e. before it was potentially modified by an
- // adapter) into F0's interpreter state. We us it as well to revert
+ // adapter) into F0's interpreter state. We use it as well to revert
// resizing the frame above.
__ z_stg(Z_R10, _z_ijava_state_neg(sender_sp), fp);
- // Load cp cache and save it at the and of this block.
- __ z_lg(Z_R1_scratch, Address(Z_method, Method::const_offset()));
- __ z_lg(Z_R1_scratch, Address(Z_R1_scratch, ConstMethod::constants_offset()));
+ // Load cp cache and save it at the end of this block.
+ __ z_lg(Z_R1_scratch, Address(const_method, ConstMethod::constants_offset()));
__ z_lg(Z_R1_scratch, Address(Z_R1_scratch, ConstantPool::cache_offset_in_bytes()));
// z_ijava_state->method = method;
@@ -1152,10 +1151,6 @@
// parameters on top of caller's expression stack.
// Tos points past last Java argument.
- __ z_lg(Z_locals, Address(Z_method, Method::const_offset()));
- __ z_llgh(Z_locals /*parameter_count words*/,
- Address(Z_locals, ConstMethod::size_of_parameters_offset()));
- __ z_sllg(Z_locals /*parameter_count bytes*/, Z_locals /*parameter_count*/, LogBytesPerWord);
__ z_agr(Z_locals, Z_esp);
// z_ijava_state->locals - i*BytesPerWord points to i-th Java local (i starts at 0)
// z_ijava_state->locals = Z_esp + parameter_count bytes
@@ -1183,8 +1178,7 @@
if (native_call) {
__ clear_reg(Z_bcp); // Must initialize. Will get written into frame where GC reads it.
} else {
- __ z_lg(Z_bcp, method_(const));
- __ add2reg(Z_bcp, in_bytes(ConstMethod::codes_offset()));
+ __ add2reg(Z_bcp, in_bytes(ConstMethod::codes_offset()), const_method);
}
__ z_stg(Z_bcp, _z_ijava_state_neg(bcp), fp);
@@ -1202,62 +1196,21 @@
__ z_stg(Z_R1_scratch, _z_ijava_state_neg(cpoolCache), fp);
// Get mirror and store it in the frame as GC root for this Method*.
- __ load_mirror(Z_R1_scratch, Z_method);
+ __ load_mirror_from_const_method(Z_R1_scratch, const_method);
__ z_stg(Z_R1_scratch, _z_ijava_state_neg(mirror), fp);
BLOCK_COMMENT("} generate_fixed_frame: initialize interpreter state");
//=============================================================================
if (!native_call) {
- // Fill locals with 0x0s.
- NearLabel locals_zeroed;
- NearLabel doXC;
-
// Local_count is already num_locals_slots - num_param_slots.
- __ compare64_and_branch(local_count, (intptr_t)0L, Assembler::bcondNotHigh, locals_zeroed);
-
- // Advance local_addr to point behind locals (creates positive incr. in loop).
- __ z_lg(Z_R1_scratch, Address(Z_method, Method::const_offset()));
- __ z_llgh(Z_R0_scratch, Address(Z_R1_scratch, ConstMethod::size_of_locals_offset()));
- __ add2reg(Z_R0_scratch, -1);
-
- __ z_lgr(local_addr/*locals*/, Z_locals);
+ // Start of locals: local_addr = Z_locals - locals size + 1 slot
+ __ z_llgh(Z_R0_scratch, Address(const_method, ConstMethod::size_of_locals_offset()));
+ __ add2reg(local_addr, BytesPerWord, Z_locals);
__ z_sllg(Z_R0_scratch, Z_R0_scratch, LogBytesPerWord);
- __ z_sllg(local_count, local_count, LogBytesPerWord); // Local_count are non param locals.
__ z_sgr(local_addr, Z_R0_scratch);
- if (VM_Version::has_Prefetch()) {
- __ z_pfd(0x02, 0, Z_R0, local_addr);
- __ z_pfd(0x02, 256, Z_R0, local_addr);
- }
-
- // Can't optimise for Z10 using "compare and branch" (immediate value is too big).
- __ z_cghi(local_count, 256);
- __ z_brnh(doXC);
-
- // MVCLE: Initialize if quite a lot locals.
- // __ bind(doMVCLE);
- __ z_lgr(Z_R0_scratch, local_addr);
- __ z_lgr(Z_R1_scratch, local_count);
- __ clear_reg(Z_ARG2); // Src len of MVCLE is zero.
-
- __ MacroAssembler::move_long_ext(Z_R0_scratch, Z_ARG1, 0);
- __ z_bru(locals_zeroed);
-
- Label XC_template;
- __ bind(XC_template);
- __ z_xc(0, 0, local_addr, 0, local_addr);
-
- __ bind(doXC);
- __ z_bctgr(local_count, Z_R0); // Get #bytes-1 for EXECUTE.
- if (VM_Version::has_ExecuteExtensions()) {
- __ z_exrl(local_count, XC_template); // Execute XC with variable length.
- } else {
- __ z_larl(Z_R1_scratch, XC_template);
- __ z_ex(local_count, 0, Z_R0, Z_R1_scratch); // Execute XC with variable length.
- }
-
- __ bind(locals_zeroed);
+ __ Clear_Array(local_count, local_addr, Z_ARG2);
}
}
@@ -1530,8 +1483,8 @@
Label method_is_not_static;
__ testbit(method2_(Rmethod, access_flags), JVM_ACC_STATIC_BIT);
__ z_bfalse(method_is_not_static);
- // Get mirror.
- __ load_mirror(Z_R1, Rmethod);
+ // Load mirror from interpreter frame.
+ __ z_lg(Z_R1, _z_ijava_state_neg(mirror), Z_fp);
// z_ijava_state.oop_temp = pool_holder->klass_part()->java_mirror();
__ z_stg(Z_R1, oop_tmp_offset, Z_fp);
// Pass handle to mirror as 2nd argument to JNI method.