---

yaml
---
r: 5615
b: refs/heads/master
c: e31849f
h: refs/heads/master
i:
  5613: 20811e1
  5611: 141f8eb
  5607: 46a03f6
  5599: 5003891
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dece91ed3883a4b81986404004d90b6a6f0b30a
+refs/heads/master: e31849fb7920cdd3a46758bb8c6fbd61cde22988

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

@@ -1,14 +1,17 @@
     .text
 
 // upcall_call_c_stack(void (*fn)(), void *new_esp)
+//
+// Note that we could use |enter| and |leave| but the manuals tell me they're
+// slower.
 .globl _upcall_call_c_stack
 _upcall_call_c_stack:
-    movl %esp,%ecx          // grab esp
-    movl 8(%esp),%eax       // save fn
+    pushl %ebp
+    movl %esp,%ebp          // save esp
+    movl 8(%esp),%eax       // eax = callee
     movl 12(%esp),%esp      // switch stack
-    pushl %ecx              // save esp on stack
     calll *%eax
-    popl %esp               // restore esp
+    movl %ebp,%esp          // would like to use "leave" but it's slower
+    popl %ebp
     ret
 
-