[project @ 2005-01-27 10:44:00 by simonpj]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcForeign.lhs

diff --git a/ghc/compiler/typecheck/TcForeign.lhs b/ghc/compiler/typecheck/TcForeign.lhs
index d18fe5f..840da46 100644 (file)
--- a/ghc/compiler/typecheck/TcForeign.lhs
+++ b/ghc/compiler/typecheck/TcForeign.lhs
@@ -26,6 +26,7 @@ import TcRnMonad
 import TcHsType                ( tcHsSigType, UserTypeCtxt(..) )
 import TcExpr          ( tcCheckSigma )                        
 
+import ForeignCall     ( CCallConv(..) )
 import ErrUtils                ( Message )
 import Id              ( Id, mkLocalId, mkExportedLocalId )
 #if alpha_TARGET_ARCH
@@ -45,13 +46,15 @@ import TcType               ( Type, tcSplitFunTys, tcSplitTyConApp_maybe,
 import ForeignCall     ( CExportSpec(..), CCallTarget(..), 
                          CLabelString, isCLabelString,
                          isDynamicTarget, withDNTypes, DNKind(..), DNCallSpec(..) ) 
-import MachOp          ( machRepByteWidth )
 import PrelNames       ( hasKey, ioTyConKey )
-import CmdLineOpts     ( dopt_HscLang, HscLang(..) )
+import CmdLineOpts     ( dopt_HscTarget, HscTarget(..) )
 import Outputable
 import SrcLoc          ( Located(..), srcSpanStart )
-import Bag             ( emptyBag, consBag )
+import Bag             ( consBag )
 
+#if alpha_TARGET_ARCH
+import MachOp          ( machRepByteWidth )
+#endif
 \end{code}
 
 \begin{code}
@@ -128,6 +131,7 @@ tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport cconv _ _ _ CWrapper)
        -- as ft -> IO Addr is accepted, too.  The use of the latter two forms
        -- is DEPRECATED, though.
     checkCg checkCOrAsmOrInterp `thenM_`
+    checkCConv cconv           `thenM_`
     (case arg_tys of
        [arg1_ty] -> checkForeignArgs isFFIExternalTy arg1_tys               `thenM_`
                     checkForeignRes nonIOok  isFFIExportResultTy res1_ty    `thenM_`
@@ -138,9 +142,10 @@ tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport cconv _ _ _ CWrapper)
         other -> addErrTc (illegalForeignTyErr empty sig_ty)   )            `thenM_`
     return idecl
 
-tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport _ safety _ _ (CFunction target))
+tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport cconv safety _ _ (CFunction target))
   | isDynamicTarget target     -- Foreign import dynamic
   = checkCg checkCOrAsmOrInterp                `thenM_`
+    checkCConv cconv                   `thenM_`
     case arg_tys of            -- The first arg must be Ptr, FunPtr, or Addr
       []               -> 
        check False (illegalForeignTyErr empty sig_ty) `thenM_`
@@ -154,6 +159,7 @@ tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport _ safety _ _ (CFunction targe
        return idecl
   | otherwise          -- Normal foreign import
   = checkCg (checkCOrAsmOrDotNetOrInterp)                      `thenM_`
+    checkCConv cconv                                           `thenM_`
     checkCTarget target                                                `thenM_`
     getDOpts                                                   `thenM` \ dflags ->
     checkForeignArgs (isFFIArgumentTy dflags safety) arg_tys   `thenM_`
@@ -200,7 +206,7 @@ checkFEDArgs arg_tys = returnM ()
 tcForeignExports :: [LForeignDecl Name] 
                 -> TcM (LHsBinds TcId, [LForeignDecl TcId])
 tcForeignExports decls
-  = foldlM combine (emptyBag, []) (filter isForeignExport decls)
+  = foldlM combine (emptyLHsBinds, []) (filter isForeignExport decls)
   where
    combine (binds, fs) fe = 
        wrapLocSndM tcFExport fe        `thenM` \ (b, f) ->
@@ -310,15 +316,27 @@ checkCOrAsmOrDotNetOrInterp other
 
 checkCg check
  = getDOpts            `thenM` \ dflags ->
-   let hscLang = dopt_HscLang dflags in
-   case hscLang of
+   let hscTarget = dopt_HscTarget dflags in
+   case hscTarget of
      HscNothing -> returnM ()
      otherwise  ->
-       case check hscLang of
+       case check hscTarget of
         Nothing  -> returnM ()
         Just err -> addErrTc (text "Illegal foreign declaration:" <+> err)
 \end{code} 
                           
+Calling conventions
+
+\begin{code}
+checkCConv :: CCallConv -> TcM ()
+checkCConv CCallConv  = return ()
+#if i386_TARGET_ARCH
+checkCConv StdCallConv = return ()
+#else
+checkCConv StdCallConv = addErrTc (text "calling convention not supported on this architecture: stdcall")
+#endif
+\end{code}
+
 Warnings
 
 \begin{code}