Fix stack alignment for sysv_386

Author: kristjanvalur

lib/sysv_i386/libstackman.a

@@ -30,8 +30,8 @@ stackman_switch:
 	movl	8(%ebp), %eax
 	movl	12(%ebp), %edx
 #APP
-# 50 "switch_x86_gcc.h" 1
-	subl $0x1a, %esp
+# 50 "../platforms/switch_x86_gcc.h" 1
+	subl $0x1c, %esp
 movl %eax, %esi
 movl %edx, %edi
 leal 0x10(%esp), %ebx
@@ -48,7 +48,7 @@ movl $1, 4(%esp)
 movl %edi, 0(%esp)
 call *%esi
 movl %eax, %eax
-addl $0x1a, %esp
+addl $0x1c, %esp
 
 # 0 "" 2
 #NO_APP
@@ -79,19 +79,19 @@ stackman_call:
 	subl	$8, %esp
 	.cfi_offset 3, -12
 #APP
-# 108 "switch_x86_gcc.h" 1
+# 108 "../platforms/switch_x86_gcc.h" 1
 	movl %esp, %ebx
 # 0 "" 2
-# 110 "switch_x86_gcc.h" 1
+# 110 "../platforms/switch_x86_gcc.h" 1
 	leal 4(%esp), %eax
 # 0 "" 2
 #NO_APP
 	movl	16(%ebp), %edx
 #APP
-# 113 "switch_x86_gcc.h" 1
+# 113 "../platforms/switch_x86_gcc.h" 1
 	movl %edx, %esp
 # 0 "" 2
-# 115 "switch_x86_gcc.h" 1
+# 115 "../platforms/switch_x86_gcc.h" 1
 	subl $4, %esp
 # 0 "" 2
 #NO_APP
@@ -100,7 +100,7 @@ stackman_call:
 	pushl	12(%ebp)
 	call	*8(%ebp)
 #APP
-# 119 "switch_x86_gcc.h" 1
+# 119 "../platforms/switch_x86_gcc.h" 1
 	movl %ebx, %esp
 # 0 "" 2
 #NO_APP

src/platforms/switch_x86_gcc.S

@@ -52,14 +52,14 @@ void *result;
       /* adjust stack pointer to be 16 byte (4 quad) aligned with 
        * room for call args
        * since the call instruction, 5 quads have
-       * been pushed (ip, bp, bx, si, di), need extra 3 quads (0xa)
+       * been pushed (ip, bp, bx, si, di), need extra 3 quads (0xc)
        * for alignment, which fits our three quad call args.
        * Add another 16 (0x10) bytes, so that we can pass to the callbacks
        * a 16 byte boundary that lies above the pushed arguments
        * so that the call arguments of the functions aren't clobbered
        * by memory transfer.
        */
-    "subl $0x1a, %%esp\n"
+    "subl $0x1c, %%esp\n"
     "movl %[cb], %%esi\n"  /* save 'callback' for later */
     "movl %[ctx], %%edi\n" /* save 'context' for later         */
 
@@ -86,7 +86,7 @@ void *result;
 
     "movl %%eax, %[result]\n"
 
-    "addl $0x1a, %%esp\n"
+    "addl $0x1c, %%esp\n"
     : [result] "=r" (result)              /* output variables */
     : [cb] "r" (callback),       /* input variables  */
       [ctx] "r" (context)