Merge pull request #1980 from GaloisInc/T1979-ffi-build-fixes

FFI-related build fixes (#1979)

Author: RyanGlScott

cryptol.cabal

@@ -47,7 +47,7 @@ flag ffi
 library
   Default-language:
     Haskell2010
-  Build-depends:       base              >= 4.9 && < 5,
+  Build-depends:       base              >= 4.9 && < 4.20,
                        aeson             >= 2.0 && < 2.3,
                        arithmoi          >= 0.12,
                        async             >= 2.2 && < 2.3,

src/Cryptol/Eval/FFI.hs

@@ -9,34 +9,30 @@ module Cryptol.Eval.FFI
   , evalForeignDecls
   ) where
 
-import Cryptol.Eval.FFI.ForeignSrc
-    ( ForeignSrc)
-#ifdef FFI_ENABLED
-import Cryptol.Eval.FFI.ForeignSrc
-    (ForeignImpl, loadForeignImpl )
-#else
-import Cryptol.Parser.AST (ForeignMode)
-#endif
-import Cryptol.Eval.FFI.Error ( FFILoadError )
-import Cryptol.Eval (Eval, EvalEnv )
-import Cryptol.TypeCheck.AST
-    ( FFI(..), TVar(TVBound), findForeignDecls )
-import Cryptol.TypeCheck.FFI.FFIType ( FFIFunType(..) )
+import Cryptol.Eval.FFI.ForeignSrc (ForeignSrc)
+import Cryptol.Eval.FFI.Error (FFILoadError)
+import Cryptol.Eval (Eval, EvalEnv)
+import Cryptol.ModuleSystem.Name (Name)
+import Cryptol.TypeCheck.AST (FFI(..), findForeignDecls)
 
 #ifdef FFI_ENABLED
 
-import           Data.Either(partitionEithers)
-import           Data.Traversable(for)
-import           Cryptol.Backend.Concrete
-import           Cryptol.Backend.Monad
-import           Cryptol.Eval.Env
-import           Cryptol.Eval.Prims
-import           Cryptol.Eval.Type
-import           Cryptol.Eval.Value
-import           Cryptol.ModuleSystem.Name
-import           Cryptol.Utils.Ident
-import           Cryptol.Eval.FFI.C(callForeignC)
-import           Cryptol.Eval.FFI.Abstract(callForeignAbstract)
+import           Data.Either (partitionEithers)
+import           Data.Traversable (for)
+
+import           Cryptol.Backend.Concrete (Concrete)
+import           Cryptol.Backend.Monad (io)
+import           Cryptol.Eval.Env (bindVarDirect)
+import           Cryptol.Eval.FFI.Abstract (callForeignAbstract)
+import           Cryptol.Eval.FFI.C (callForeignC)
+import           Cryptol.Eval.FFI.ForeignSrc (ForeignImpl, loadForeignImpl)
+import           Cryptol.Eval.Prims (Prim(..))
+import           Cryptol.Eval.Type (TypeEnv, bindTypeVar)
+import           Cryptol.Eval.Value (GenValue, Backend(SEval))
+import           Cryptol.ModuleSystem.Name (nameIdent)
+import           Cryptol.TypeCheck.AST (TVar(TVBound))
+import           Cryptol.TypeCheck.FFI.FFIType (FFIFunType(..))
+import           Cryptol.Utils.Ident (unpackIdent)
 
 #endif
 
@@ -70,7 +66,7 @@ foreignPrimPoly cc name impl =
 foreignPrim ::
   FFIFunType t ->
   (TypeEnv -> [(t,GenValue s)] -> SEval s (GenValue s)) ->
-  Prim s 
+  Prim s
 foreignPrim ft k = buildNumPoly (ffiTParams ft) mempty
   where
   buildNumPoly (tp:tps) tenv = PNumPoly \n ->
@@ -90,4 +86,4 @@ evalForeignDecls :: ForeignSrc -> [(Name, FFI)] -> EvalEnv ->
   Eval ([FFILoadError], EvalEnv)
 evalForeignDecls _ _ env = pure ([], env)
 
-#endif
+#endif

src/Cryptol/Eval/FFI/Abstract/Call.hsc

@@ -57,14 +57,14 @@ runFFI ::
 runFFI args ty k =
   allocaBytes #{size struct CryValImporter} $ \robj ->
   allocaBytes #{size struct CryValExporter} $ \aobj ->
-  
+
   do expS <- cryStartExport args
      #{poke struct CryValExporter, self}            aobj expS
      #{poke struct CryValExporter, recv_u8}         aobj cry_recv_u8_addr
      #{poke struct CryValExporter, recv_u64}        aobj cry_recv_u64_addr
      #{poke struct CryValExporter, recv_double}     aobj cry_recv_double_addr
      #{poke struct CryValExporter, recv_u64_digits} aobj cry_recv_u64_digits_addr
-     impS <- cryStartImport ty 
+     impS <- cryStartImport ty
      #{poke struct CryValImporter, self}               robj impS
      #{poke struct CryValImporter, send_bool}          robj cry_bool_addr
      #{poke struct CryValImporter, send_small_uint}    robj cry_small_uint_addr
@@ -74,7 +74,7 @@ runFFI args ty k =
      #{poke struct CryValImporter, send_new_large_int} robj cry_large_int_addr
      #{poke struct CryValImporter, send_sign}          robj cry_sign_addr
      callForeignImpl k [SomeFFIArg aobj, SomeFFIArg robj] :: IO ()
-     
+
      -- callFFI k retVoid [argPtr aobj, argPtr robj]
      cryEndExport expS
      cryFinishImport impS