src/cpu/s390/vm/c1_LIRAssembler_s390.cpp

*** 151,161 ****
    // failures when searching for the corresponding bci. => Add a nop.
    // (was bug 5/14/1999 - gri)
    __ nop();
  
    // Generate code for exception handler.
!   address handler_base = __ start_a_stub(exception_handler_size);
    if (handler_base == NULL) {
      // Not enough space left for the handler.
      bailout("exception handler overflow");
      return -1;
    }
--- 151,161 ----
    // failures when searching for the corresponding bci. => Add a nop.
    // (was bug 5/14/1999 - gri)
    __ nop();
  
    // Generate code for exception handler.
!   address handler_base = __ start_a_stub(exception_handler_size());
    if (handler_base == NULL) {
      // Not enough space left for the handler.
      bailout("exception handler overflow");
      return -1;
    }
*** 164,174 ****
  
    address a = Runtime1::entry_for (Runtime1::handle_exception_from_callee_id);
    address call_addr = emit_call_c(a);
    CHECK_BAILOUT_(-1);
    __ should_not_reach_here();
!   guarantee(code_offset() - offset <= exception_handler_size, "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
--- 164,174 ----
  
    address a = Runtime1::entry_for (Runtime1::handle_exception_from_callee_id);
    address call_addr = emit_call_c(a);
    CHECK_BAILOUT_(-1);
    __ should_not_reach_here();
!   guarantee(code_offset() - offset <= exception_handler_size(), "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
*** 249,268 ****
    // failures when searching for the corresponding bci. => Add a nop.
    // (was bug 5/14/1999 - gri)
    __ nop();
  
    // Generate code for exception handler.
!   address handler_base = __ start_a_stub(deopt_handler_size);
    if (handler_base == NULL) {
      // Not enough space left for the handler.
      bailout("deopt handler overflow");
      return -1;
    }  int offset = code_offset();
    // Size must be constant (see HandlerImpl::emit_deopt_handler).
    __ load_const(Z_R1_scratch, SharedRuntime::deopt_blob()->unpack());
    __ call(Z_R1_scratch);
!   guarantee(code_offset() - offset <= deopt_handler_size, "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
--- 249,268 ----
    // failures when searching for the corresponding bci. => Add a nop.
    // (was bug 5/14/1999 - gri)
    __ nop();
  
    // Generate code for exception handler.
!   address handler_base = __ start_a_stub(deopt_handler_size());
    if (handler_base == NULL) {
      // Not enough space left for the handler.
      bailout("deopt handler overflow");
      return -1;
    }  int offset = code_offset();
    // Size must be constant (see HandlerImpl::emit_deopt_handler).
    __ load_const(Z_R1_scratch, SharedRuntime::deopt_blob()->unpack());
    __ call(Z_R1_scratch);
!   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
*** 1156,1166 ****
  
    // Stub is fixed up when the corresponding call is converted from calling
    // compiled code to calling interpreted code.
  
    address call_pc = __ pc();
!   address stub = __ start_a_stub(call_stub_size);
    if (stub == NULL) {
      bailout("static call stub overflow");
      return;
    }
  
--- 1156,1166 ----
  
    // Stub is fixed up when the corresponding call is converted from calling
    // compiled code to calling interpreted code.
  
    address call_pc = __ pc();
!   address stub = __ start_a_stub(call_stub_size());
    if (stub == NULL) {
      bailout("static call stub overflow");
      return;
    }
  
*** 1179,1189 ****
      bailout("const section overflow");
      return;
    }
  
    __ z_br(Z_R1);
!   assert(__ offset() - start <= call_stub_size, "stub too big");
    __ end_a_stub(); // Update current stubs pointer and restore insts_end.
  }
  
  void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Op2* op) {
    bool unsigned_comp = condition == lir_cond_belowEqual || condition == lir_cond_aboveEqual;
--- 1179,1189 ----
      bailout("const section overflow");
      return;
    }
  
    __ z_br(Z_R1);
!   assert(__ offset() - start <= call_stub_size(), "stub too big");
    __ end_a_stub(); // Update current stubs pointer and restore insts_end.
  }
  
  void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Op2* op) {
    bool unsigned_comp = condition == lir_cond_belowEqual || condition == lir_cond_aboveEqual;