Merge remote-tracking branch 'jdk20u/master' into jdk20.0.2

src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023 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
@@ -57,7 +57,7 @@ int AbstractInterpreter::BasicType_as_index(BasicType type) {
 // Note: This returns the conservative size assuming maximum alignment.
 int AbstractInterpreter::size_top_interpreter_activation(Method* method) {
  const int max_alignment_size = 2;
- const int abi_scratch = frame::abi_reg_args_size;
+ const int abi_scratch = frame::top_ijava_frame_abi_size;
  return method->max_locals() + method->max_stack() +
  frame::interpreter_frame_monitor_size() + max_alignment_size + abi_scratch;
 }
@@ -76,8 +76,8 @@ int AbstractInterpreter::size_activation(int max_stack,
  // in TemplateInterpreterGenerator::generate_fixed_frame.
  assert(Interpreter::stackElementWords == 1, "sanity");
  const int max_alignment_space = StackAlignmentInBytes / Interpreter::stackElementSize;
- const int abi_scratch = is_top_frame ? (frame::abi_reg_args_size / Interpreter::stackElementSize) :
- (frame::abi_minframe_size / Interpreter::stackElementSize);
+ const int abi_scratch = is_top_frame ? (frame::top_ijava_frame_abi_size / Interpreter::stackElementSize) :
+ (frame::parent_ijava_frame_abi_size / Interpreter::stackElementSize);
  const int size =
  max_stack +
  (callee_locals - callee_params) +
@@ -122,20 +122,20 @@ void AbstractInterpreter::layout_activation(Method* method,
  bool is_top_frame,
  bool is_bottom_frame) {
 
- const int abi_scratch = is_top_frame ? (frame::abi_reg_args_size / Interpreter::stackElementSize) :
- (frame::abi_minframe_size / Interpreter::stackElementSize);
+ const int abi_scratch = is_top_frame ? (frame::top_ijava_frame_abi_size / Interpreter::stackElementSize) :
+ (frame::parent_ijava_frame_abi_size / Interpreter::stackElementSize);
 
  intptr_t* locals_base = (caller->is_interpreted_frame()) ?
  caller->interpreter_frame_esp() + caller_actual_parameters :
- caller->sp() + method->max_locals() - 1 + (frame::abi_minframe_size / Interpreter::stackElementSize);
+ caller->sp() + method->max_locals() - 1 + (frame::java_abi_size / Interpreter::stackElementSize);
 
  intptr_t* monitor_base = caller->sp() - frame::ijava_state_size / Interpreter::stackElementSize;
  intptr_t* monitor = monitor_base - (moncount * frame::interpreter_frame_monitor_size());
  intptr_t* esp_base = monitor - 1;
  intptr_t* esp = esp_base - tempcount - popframe_extra_args;
  intptr_t* sp = (intptr_t *) (((intptr_t) (esp_base - callee_locals_count + callee_param_count - method->max_stack()- abi_scratch)) & -StackAlignmentInBytes);
- intptr_t* sender_sp = caller->sp() + (frame::abi_minframe_size - frame::abi_reg_args_size) / Interpreter::stackElementSize;
- intptr_t* top_frame_sp = is_top_frame ? sp : sp + (frame::abi_minframe_size - frame::abi_reg_args_size) / Interpreter::stackElementSize;
+ intptr_t* sender_sp = caller->sp() + (frame::parent_ijava_frame_abi_size - frame::top_ijava_frame_abi_size) / Interpreter::stackElementSize;
+ intptr_t* top_frame_sp = is_top_frame ? sp : sp + (frame::parent_ijava_frame_abi_size - frame::top_ijava_frame_abi_size) / Interpreter::stackElementSize;
 
  interpreter_frame->interpreter_frame_set_method(method);
  interpreter_frame->interpreter_frame_set_mirror(method->method_holder()->java_mirror());

src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023 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
@@ -1830,7 +1830,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
 
  // Set up the arraycopy stub information.
  ArrayCopyStub* stub = op->stub();
- const int frame_resize = frame::abi_reg_args_size - sizeof(frame::jit_abi); // C calls need larger frame.
+ const int frame_resize = frame::native_abi_reg_args_size - sizeof(frame::java_abi); // C calls need larger frame.
 
  // Always do stub if no type information is available. It's ok if
  // the known type isn't loaded since the code sanity checks

src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023 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
@@ -153,7 +153,7 @@ static int fpu_reg_save_offsets[FrameMap::nof_fpu_regs];
 static int frame_size_in_bytes = -1;
 
 static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
- assert(frame_size_in_bytes > frame::abi_reg_args_size, "init");
+ assert(frame_size_in_bytes > frame::native_abi_reg_args_size, "init");
  sasm->set_frame_size(frame_size_in_bytes / BytesPerWord);
  int frame_size_in_slots = frame_size_in_bytes / sizeof(jint);
  OopMap* oop_map = new OopMap(frame_size_in_slots, 0);
@@ -241,7 +241,7 @@ static void restore_live_registers(StubAssembler* sasm, Register result1, Regist
 
 void Runtime1::initialize_pd() {
  int i;
- int sp_offset = frame::abi_reg_args_size;
+ int sp_offset = frame::native_abi_reg_args_size;
 
  for (i = 0; i < FrameMap::nof_cpu_regs; i++) {
  Register r = as_Register(i);
@@ -487,9 +487,9 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
 
  __ mflr(R0);
  __ std(R0, _abi0(lr), R1_SP);
- __ push_frame(frame::abi_reg_args_size, R0); // Empty dummy frame (no callee-save regs).
- sasm->set_frame_size(frame::abi_reg_args_size / BytesPerWord);
- OopMap* oop_map = new OopMap(frame::abi_reg_args_size / sizeof(jint), 0);
+ __ push_frame(frame::native_abi_reg_args_size, R0); // Empty dummy frame (no callee-save regs).
+ sasm->set_frame_size(frame::native_abi_reg_args_size / BytesPerWord);
+ OopMap* oop_map = new OopMap(frame::native_abi_reg_args_size / sizeof(jint), 0);
  int call_offset = __ call_RT(noreg, noreg,
  CAST_FROM_FN_PTR(address, SharedRuntime::register_finalizer), R3_ARG1);
  oop_maps = new OopMapSet();
@@ -732,9 +732,9 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
  __ set_info("unimplemented entry", dont_gc_arguments);
  __ mflr(R0);
  __ std(R0, _abi0(lr), R1_SP);
- __ push_frame(frame::abi_reg_args_size, R0); // empty dummy frame
- sasm->set_frame_size(frame::abi_reg_args_size / BytesPerWord);
- OopMap* oop_map = new OopMap(frame::abi_reg_args_size / sizeof(jint), 0);
+ __ push_frame(frame::native_abi_reg_args_size, R0); // empty dummy frame
+ sasm->set_frame_size(frame::native_abi_reg_args_size / BytesPerWord);
+ OopMap* oop_map = new OopMap(frame::native_abi_reg_args_size / sizeof(jint), 0);
 
  __ load_const_optimized(R4_ARG2, (int)id);
  int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), R4_ARG2);

src/hotspot/cpu/ppc/continuationEntry_ppc.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2022, 2023 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
@@ -29,7 +29,7 @@
 
 class ContinuationEntryPD {
  // This is needed to position the ContinuationEntry at the unextended sp of the entry frame
- frame::abi_reg_args _abi;
+ frame::native_abi_reg_args _abi;
 };
 
 #endif // CPU_PPC_CONTINUATIONENTRY_PPC_HPP