src/cpu/x86/vm/x86_32.ad

*** 670,690 ****
  }
  #endif
  
  void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
    Compile *C = ra_->C;
  
    if (C->max_vector_size() > 16) {
      // Clear upper bits of YMM registers when current compiled code uses
      // wide vectors to avoid AVX <-> SSE transition penalty during call.
!     MacroAssembler masm(&cbuf);
!     masm.vzeroupper();
    }
    // If method set FPU control word, restore to standard control word
    if (C->in_24_bit_fp_mode()) {
!     MacroAssembler masm(&cbuf);
!     masm.fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
    }
  
    int framesize = C->frame_size_in_bytes();
    assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
    // Remove two words for return addr and rbp,
--- 670,689 ----
  }
  #endif
  
  void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
    Compile *C = ra_->C;
+   MacroAssembler _masm(&cbuf);
  
    if (C->max_vector_size() > 16) {
      // Clear upper bits of YMM registers when current compiled code uses
      // wide vectors to avoid AVX <-> SSE transition penalty during call.
!     _masm.vzeroupper();
    }
    // If method set FPU control word, restore to standard control word
    if (C->in_24_bit_fp_mode()) {
!     _masm.fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
    }
  
    int framesize = C->frame_size_in_bytes();
    assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
    // Remove two words for return addr and rbp,
*** 702,711 ****
--- 701,714 ----
      emit_d8(cbuf, framesize);
    }
  
    emit_opcode(cbuf, 0x58 | EBP_enc);
  
+   if (StackReservedPages > 0 && C->has_reserved_stack_access()) {
+     __ reserved_stack_check();
+   }
+ 
    if (do_polling() && C->is_method_compilation()) {
      cbuf.relocate(cbuf.insts_end(), relocInfo::poll_return_type, 0);
      emit_opcode(cbuf,0x85);
      emit_rm(cbuf, 0x0, EAX_enc, 0x5); // EAX
      emit_d32(cbuf, (intptr_t)os::get_polling_page());
*** 729,738 ****
--- 732,742 ----
    if (framesize >= 128) {
      size += 6;
    } else {
      size += framesize ? 3 : 0;
    }
+   size += 64; // added to support ReservedStackAccess
    return size;
  }
  
  int MachEpilogNode::reloc() const {
    return 0; // a large enough number