src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp

*** 285,295 ****
    __ nop();
  
    // generate code for exception handler
    ciMethod* method = compilation()->method();
  
!   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;
--- 285,295 ----
    __ nop();
  
    // generate code for exception handler
    ciMethod* method = compilation()->method();
  
!   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;
*** 298,308 ****
    int offset = code_offset();
  
    __ call(Runtime1::entry_for(Runtime1::handle_exception_from_callee_id), relocInfo::runtime_call_type);
    __ delayed()->nop();
    __ should_not_reach_here();
!   guarantee(code_offset() - offset <= exception_handler_size, "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
--- 298,308 ----
    int offset = code_offset();
  
    __ call(Runtime1::entry_for(Runtime1::handle_exception_from_callee_id), relocInfo::runtime_call_type);
    __ delayed()->nop();
    __ should_not_reach_here();
!   guarantee(code_offset() - offset <= exception_handler_size(), "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
*** 373,394 ****
    // (was bug 5/14/1999 - gri)
    __ nop();
  
    // generate code for deopt handler
    ciMethod* method = compilation()->method();
!   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();
    AddressLiteral deopt_blob(SharedRuntime::deopt_blob()->unpack());
    __ JUMP(deopt_blob, G3_scratch, 0); // sethi;jmp
    __ delayed()->nop();
!   guarantee(code_offset() - offset <= deopt_handler_size, "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
--- 373,394 ----
    // (was bug 5/14/1999 - gri)
    __ nop();
  
    // generate code for deopt handler
    ciMethod* method = compilation()->method();
!   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();
    AddressLiteral deopt_blob(SharedRuntime::deopt_blob()->unpack());
    __ JUMP(deopt_blob, G3_scratch, 0); // sethi;jmp
    __ delayed()->nop();
!   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
    __ end_a_stub();
  
    return offset;
  }
  
*** 1491,1501 ****
  }
  
  
  void LIR_Assembler::emit_static_call_stub() {
    address call_pc = __ pc();
!   address stub = __ start_a_stub(call_stub_size);
    if (stub == NULL) {
      bailout("static call stub overflow");
      return;
    }
  
--- 1491,1501 ----
  }
  
  
  void LIR_Assembler::emit_static_call_stub() {
    address call_pc = __ pc();
!   address stub = __ start_a_stub(call_stub_size());
    if (stub == NULL) {
      bailout("static call stub overflow");
      return;
    }
  
*** 1506,1516 ****
    // must be set to -1 at code generation time
    AddressLiteral addrlit(-1);
    __ jump_to(addrlit, G3);
    __ delayed()->nop();
  
!   assert(__ offset() - start <= call_stub_size, "stub too big");
    __ end_a_stub();
  }
  
  
  void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Op2* op) {
--- 1506,1516 ----
    // must be set to -1 at code generation time
    AddressLiteral addrlit(-1);
    __ jump_to(addrlit, G3);
    __ delayed()->nop();
  
!   assert(__ offset() - start <= call_stub_size(), "stub too big");
    __ end_a_stub();
  }
  
  
  void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Op2* op) {