*** old/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp	Thu Nov  3 14:15:55 2016
--- new/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp	Thu Nov  3 14:15:55 2016

*** 151,161 ****
--- 151,161 ----
    // failures when searching for the corresponding bci => add a nop
    // (was bug 5/14/1999 - gri).
    __ nop();
  
    // Generate code for the 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;

*** 166,176 ****
--- 166,176 ----
    //__ load_const_optimized(R0, entry_point);
    __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(entry_point));
    __ mtctr(R0);
    __ bctr();
  
!   guarantee(code_offset() - offset <= exception_handler_size(), "overflow");
    __ end_a_stub();
  
    return offset;
  }
  

*** 231,252 ****
--- 231,252 ----
    // failures when searching for the corresponding bci => add a nop
    // (was bug 5/14/1999 - gri).
    __ nop();
  
    // Generate code for deopt 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();
    __ bl64_patchable(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type);
  
!   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
    __ end_a_stub();
  
    return offset;
  }
  

*** 1305,1315 ****
--- 1305,1315 ----
  }
  
  
  void LIR_Assembler::emit_static_call_stub() {
    address call_pc = __ pc();
!   address stub = __ start_a_stub(max_static_call_stub_size);
!   address stub = __ start_a_stub(static_call_stub_size());
    if (stub == NULL) {
      bailout("static call stub overflow");
      return;
    }
  

*** 1344,1354 ****
--- 1344,1354 ----
    if (!success) {
      bailout("const section overflow");
      return;
    }
  
!   assert(__ offset() - start <= max_static_call_stub_size, "stub too big");
!   assert(__ offset() - start <= static_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) {