--- a/hotspot/src/cpu/x86/vm/x86_32.ad	Thu Oct 15 11:20:04 2015 +0000
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad	Thu Oct 15 17:38:41 2015 +0200
@@ -580,7 +580,11 @@
     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");
+      if (framesize > 0) {
+        st->print("\n\t");
+        st->print("ADD    EBP, #%d", framesize);
+      }
     }
   }