--- old/src/cpu/x86/vm/macroAssembler_x86.cpp	2015-10-12 14:22:13.333084626 +0200
+++ new/src/cpu/x86/vm/macroAssembler_x86.cpp	2015-10-12 14:22:13.197084620 +0200
@@ -6247,7 +6247,6 @@
     // Save caller's stack pointer into RBP if the frame pointer is preserved.
     if (PreserveFramePointer) {
       movptr(rbp, rsp);
-      addptr(rbp, framesize + wordSize);
     }
   }
 
--- old/src/cpu/x86/vm/x86_32.ad	2015-10-12 14:22:13.373084628 +0200
+++ new/src/cpu/x86/vm/x86_32.ad	2015-10-12 14:22:13.213084621 +0200
@@ -580,7 +580,7 @@
     st->print("MOV    [ESP + #%d], EBP\t# Save EBP",framesize);
     if (PreserveFramePointer) {
       st->print("\n\t");
-      st->print("MOV    EBP, [ESP + #%d]\t# Save the caller's SP into EBP", (framesize + wordSize));
+      st->print("MOV    EBP, ESP\t# Save the caller's SP into EBP");
     }
   }
 
--- old/src/cpu/x86/vm/x86_64.ad	2015-10-12 14:22:13.429084630 +0200
+++ new/src/cpu/x86/vm/x86_64.ad	2015-10-12 14:22:13.269084623 +0200
@@ -867,7 +867,7 @@
     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");
     }
   }