*** old/src/cpu/x86/vm/x86_64.ad	Tue Oct 13 12:25:20 2015
--- new/src/cpu/x86/vm/x86_64.ad	Tue Oct 13 12:25:20 2015

*** 865,875 ****
--- 865,879 ----
      st->print("\n\t");
      framesize -= wordSize;
      st->print("movq    [rsp + #%d], rbp\t# Save rbp",framesize);
      if (PreserveFramePointer) {
        st->print("\n\t");
!       st->print("movq    rbp, [rsp + #%d]\t# Save the caller's SP into rbp", (framesize + wordSize));
!       st->print("movq    rbp, rsp\t# Save the caller's SP into rbp");
+       if (framesize > 0) {
+         st->print("\n\t");
+         st->print("addq    rbp, #%d", framesize);
+       }      
      }
    }
  
    if (VerifyStackAtCalls) {
      st->print("\n\t");