From: Max Bolingbroke <batterseapower@hotmail.com>
Date: Fri, 1 Apr 2011 23:06:16 +0000 (+0100)
Subject: Pop OS X stack padding even if the foreign call is stdcall (#5052)
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=7a29845e5ed105fcbd6ccadb8061bae2c124f817

Pop OS X stack padding even if the foreign call is stdcall (#5052)

The problem was that the codegen for foreign calls makes sure the stack
is 16-byte aligned on OS X by pushing some padding. In the case where the
foreign call is cdecl, that padding gets popped after the call, but if the
convention is stdcall then it doesn't generate any popping code at all.

However, this is incorrect because the stdcall only promises to pop the
arguments, not the padding. The fix is to generate code to pop the padding
(if any) on OS X.
---

diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index e606e2c..86ecbf9 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -1587,12 +1587,24 @@ genCCall target dest_regs args = do
             | otherwise
 #endif
             = concatOL push_codes
+	
+	  -- Deallocate parameters after call for ccall;
+	  -- but not for stdcall (callee does it)
+	  --
+	  -- We have to pop any stack padding we added
+	  -- on Darwin even if we are doing stdcall, though (#5052)
+	pop_size | cconv /= StdCallConv = tot_arg_size
+	         | otherwise
+#if darwin_TARGET_OS
+                 = arg_pad_size
+#else
+                 = 0
+#endif
+	
 	call = callinsns `appOL`
                toOL (
-			-- Deallocate parameters after call for ccall;
-			-- but not for stdcall (callee does it)
-                  (if cconv == StdCallConv || tot_arg_size==0 then [] else 
-		   [ADD II32 (OpImm (ImmInt tot_arg_size)) (OpReg esp)])
+                  (if pop_size==0 then [] else 
+		   [ADD II32 (OpImm (ImmInt pop_size)) (OpReg esp)])
                   ++
                   [DELTA (delta + tot_arg_size)]
                )