On Linux use libffi for allocating executable memory (fixed #738)

[ghc-hetmet.git] / compiler / ghci / ByteCodeFFI.lhs

diff --git a/compiler/ghci/ByteCodeFFI.lhs b/compiler/ghci/ByteCodeFFI.lhs
index 5c2b35f..649efc0 100644 (file)
--- a/compiler/ghci/ByteCodeFFI.lhs
+++ b/compiler/ghci/ByteCodeFFI.lhs
@@ -28,14 +28,16 @@ moan64 msg pp_rep
 
 newExec :: Storable a => [a] -> IO (FunPtr ())
 newExec code
-   = do ptr <- _allocateExec (fromIntegral $ codeSize undefined code)
+   = alloca $ \pcode -> do
+        ptr <- _allocateExec (fromIntegral $ codeSize undefined code) pcode
         pokeArray ptr code
-        return (castPtrToFunPtr ptr)
+        code <- peek pcode
+        return (castPtrToFunPtr code)
    where
    codeSize :: Storable a => a -> [a] -> Int
    codeSize dummy array = sizeOf(dummy) * length array
 
 foreign import ccall unsafe "allocateExec"
-  _allocateExec :: CUInt -> IO (Ptr a)  
+  _allocateExec :: CUInt -> Ptr (Ptr a) -> IO (Ptr a)  
 \end{code}