*** old/src/cpu/x86/vm/x86_64.ad	Thu Mar  6 11:59:53 2014
--- new/src/cpu/x86/vm/x86_64.ad	Thu Mar  6 11:59:53 2014

*** 711,728 ****
--- 711,729 ----
  //=============================================================================
  #ifndef PRODUCT
  void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
    Compile* C = ra_->C;
  
!   int framesize = C->frame_slots() << LogBytesPerInt;
!   int framesize = C->frame_size_in_bytes();
+   int bangsize = C->bang_size_in_bytes();
    assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
    // Remove wordSize for return addr which is already pushed.
    framesize -= wordSize;
  
!   if (C->need_stack_bang(framesize)) {
!   if (C->need_stack_bang(bangsize)) {
      framesize -= wordSize;
!     st->print("# stack bang (%d bytes)", bangsize);
      st->print("\n\t");
      st->print("pushq   rbp\t# Save rbp");
      if (framesize) {
        st->print("\n\t");
        st->print("subq    rsp, #%d\t# Create frame",framesize);

*** 749,761 ****
--- 750,763 ----
  
  void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
    Compile* C = ra_->C;
    MacroAssembler _masm(&cbuf);
  
!   int framesize = C->frame_slots() << LogBytesPerInt;
!   int framesize = C->frame_size_in_bytes();
+   int bangsize = C->bang_size_in_bytes();
  
!   __ verified_entry(framesize, C->need_stack_bang(framesize), false);
!   __ verified_entry(framesize, C->need_stack_bang(bangsize)?bangsize:0, false);
  
    C->set_frame_complete(cbuf.insts_size());
  
    if (C->has_mach_constant_base_node()) {
      // NOTE: We set the table base offset here because users might be

*** 784,794 ****
--- 786,796 ----
    if (C->max_vector_size() > 16) {
      st->print("vzeroupper");
      st->cr(); st->print("\t");
    }
  
!   int framesize = C->frame_slots() << LogBytesPerInt;
!   int framesize = C->frame_size_in_bytes();
    assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
    // Remove word for return adr already pushed
    // and RBP
    framesize -= 2*wordSize;
  

*** 820,830 ****
--- 822,832 ----
      // wide vectors to avoid AVX <-> SSE transition penalty during call.
      MacroAssembler _masm(&cbuf);
      __ vzeroupper();
    }
  
!   int framesize = C->frame_slots() << LogBytesPerInt;
!   int framesize = C->frame_size_in_bytes();
    assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
    // Remove word for return adr already pushed
    // and RBP
    framesize -= 2*wordSize;