src/cpu/ppc/vm/sharedRuntime_ppc.cpp

rev 13203 : 8183571: PPC64 build broken after 8178499
Reviewed-by: simonis

*** 220,230 ****
  
    // calcualte frame size
    const int regstosave_num       = sizeof(RegisterSaver_LiveRegs) /
                                     sizeof(RegisterSaver::LiveRegType);
    const int register_save_size   = regstosave_num * reg_size;
!   const int frame_size_in_bytes  = align_up(register_save_size, frame::alignment_in_bytes)
                                     + frame::abi_reg_args_size;
    *out_frame_size_in_bytes       = frame_size_in_bytes;
    const int frame_size_in_slots  = frame_size_in_bytes / sizeof(jint);
    const int register_save_offset = frame_size_in_bytes - register_save_size;
  
--- 220,230 ----
  
    // calcualte frame size
    const int regstosave_num       = sizeof(RegisterSaver_LiveRegs) /
                                     sizeof(RegisterSaver::LiveRegType);
    const int register_save_size   = regstosave_num * reg_size;
!   const int frame_size_in_bytes  = align_up(register_save_size, (int)frame::alignment_in_bytes)
                                     + frame::abi_reg_args_size;
    *out_frame_size_in_bytes       = frame_size_in_bytes;
    const int frame_size_in_slots  = frame_size_in_bytes / sizeof(jint);
    const int register_save_offset = frame_size_in_bytes - register_save_size;
  
*** 872,882 ****
  
    assert_different_registers(sender_SP, code, ientry, return_pc, tmp);
  
    // Adapter needs TOP_IJAVA_FRAME_ABI.
    const int adapter_size = frame::top_ijava_frame_abi_size +
!       align_up(total_args_passed * wordSize, frame::alignment_in_bytes);
  
    // regular (verified) c2i entry point
    c2i_entrypoint = __ pc();
  
    // Does compiled code exists? If yes, patch the caller's callsite.
--- 872,882 ----
  
    assert_different_registers(sender_SP, code, ientry, return_pc, tmp);
  
    // Adapter needs TOP_IJAVA_FRAME_ABI.
    const int adapter_size = frame::top_ijava_frame_abi_size +
!                            align_up(total_args_passed * wordSize, (int)frame::alignment_in_bytes);
  
    // regular (verified) c2i entry point
    c2i_entrypoint = __ pc();
  
    // Does compiled code exists? If yes, patch the caller's callsite.
*** 2202,2213 ****
      // None of the above fast optimizations worked so we have to get into the
      // slow case of monitor enter. Inline a special case of call_VM that
      // disallows any pending_exception.
  
      // Save argument registers and leave room for C-compatible ABI_REG_ARGS.
!     int frame_size = frame::abi_reg_args_size +
!         align_up(total_c_args * wordSize, frame::alignment_in_bytes);
      __ mr(R11_scratch1, R1_SP);
      RegisterSaver::push_frame_and_save_argument_registers(masm, R12_scratch2, frame_size, total_c_args, out_regs, out_regs2);
  
      // Do the call.
      __ set_last_Java_frame(R11_scratch1, r_return_pc);
--- 2202,2212 ----
      // None of the above fast optimizations worked so we have to get into the
      // slow case of monitor enter. Inline a special case of call_VM that
      // disallows any pending_exception.
  
      // Save argument registers and leave room for C-compatible ABI_REG_ARGS.
!     int frame_size = frame::abi_reg_args_size + align_up(total_c_args * wordSize, (int)frame::alignment_in_bytes);
      __ mr(R11_scratch1, R1_SP);
      RegisterSaver::push_frame_and_save_argument_registers(masm, R12_scratch2, frame_size, total_c_args, out_regs, out_regs2);
  
      // Do the call.
      __ set_last_Java_frame(R11_scratch1, r_return_pc);
*** 2569,2579 ****
  }
  
  // This function returns the adjust size (in number of words) to a c2i adapter
  // activation for use during deoptimization.
  int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) {
!   return align_up((callee_locals - callee_parameters) * Interpreter::stackElementWords, frame::alignment_in_bytes);
  }
  
  uint SharedRuntime::out_preserve_stack_slots() {
  #if defined(COMPILER1) || defined(COMPILER2)
    return frame::jit_out_preserve_size / VMRegImpl::stack_slot_size;
--- 2568,2578 ----
  }
  
  // This function returns the adjust size (in number of words) to a c2i adapter
  // activation for use during deoptimization.
  int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) {
!   return align_up((callee_locals - callee_parameters) * Interpreter::stackElementWords, (int)frame::alignment_in_bytes);
  }
  
  uint SharedRuntime::out_preserve_stack_slots() {
  #if defined(COMPILER1) || defined(COMPILER2)
    return frame::jit_out_preserve_size / VMRegImpl::stack_slot_size;