---

yaml
---
r: 6298
b: refs/heads/master
c: 3617f03
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85083ec51b57ed5a44ce34c8b3610ca66dff7a68
+refs/heads/master: 3617f0377fb797ada3a20addb9e9a24e4b8a4f43

trunk/src/rt/arch/i386/ccall.S

@@ -37,9 +37,10 @@ upcall_call_c_stack_shim:
 #endif
     pushl %ebp
     movl %esp,%ebp          // save esp
-    movl 8(%esp),%eax       // eax = callee
-    movl 12(%esp),%esp      // switch stack
-    pushl %esp              // push ptr to new arguments
+    movl 8(%ebp),%eax       // eax = callee
+    movl 12(%ebp),%esp      // switch stack
+    subl $12,%esp           // maintain 16-byte alignment
+    pushl 12(%ebp)          // push ptr to argument block
     calll *%eax
     movl %ebp,%esp          // would like to use "leave" but it's slower
     popl %ebp