X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsCCall.lhs;h=0fcfdd5b91707f365674043c47f5f8dee6860e42;hb=f238dae7ded41a7af20b6c0bc70e90e1ed8dffd9;hp=82204052516ea881e054c5c5a74058aa5d54a1f6;hpb=625880d3e99e610595aa6140f3e6269e769e1db4;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsCCall.lhs b/ghc/compiler/deSugar/DsCCall.lhs index 8220405..0fcfdd5 100644 --- a/ghc/compiler/deSugar/DsCCall.lhs +++ b/ghc/compiler/deSugar/DsCCall.lhs @@ -18,26 +18,26 @@ import CoreSyn import DsMonad -import CoreUtils ( exprType ) -import Id ( Id, mkWildId, idType ) +import CoreUtils ( exprType, mkCoerce2 ) +import Id ( Id, mkWildId ) import MkId ( mkFCallId, realWorldPrimId, mkPrimOpId ) import Maybes ( maybeToBool ) import ForeignCall ( ForeignCall(..), CCallSpec(..), CCallTarget(..), Safety, CCallConv(..) ) import DataCon ( splitProductType_maybe, dataConSourceArity, dataConWrapId ) import ForeignCall ( ForeignCall, CCallTarget(..) ) -import TcType ( Type, isUnLiftedType, mkFunTys, mkFunTy, +import TcType ( tcSplitTyConApp_maybe ) +import Type ( Type, isUnLiftedType, mkFunTys, mkFunTy, tyVarsOfType, mkForAllTys, mkTyConApp, - isBoolTy, isUnitTy, isPrimitiveType, - tcSplitTyConApp_maybe + isPrimitiveType, splitTyConApp_maybe, + splitNewType_maybe, splitForAllTy_maybe, ) -import Type ( repType, eqType ) -- Sees the representation type -import PrimOp ( PrimOp(TouchOp) ) -import TysPrim ( realWorldStatePrimTy, - byteArrayPrimTyCon, mutableByteArrayPrimTyCon, - intPrimTy, foreignObjPrimTy + +import PrimOp ( PrimOp(..) ) +import TysPrim ( realWorldStatePrimTy, intPrimTy, + byteArrayPrimTyCon, mutableByteArrayPrimTyCon ) -import TyCon ( tyConDataCons ) +import TyCon ( TyCon, tyConDataCons ) import TysWiredIn ( unitDataConId, unboxedSingletonDataCon, unboxedPairDataCon, unboxedSingletonTyCon, unboxedPairTyCon, @@ -46,8 +46,12 @@ import TysWiredIn ( unitDataConId, ) import Literal ( mkMachInt ) import CStrings ( CLabelString ) -import PrelNames ( Unique, hasKey, ioTyConKey ) +import PrelNames ( Unique, hasKey, ioTyConKey, boolTyConKey, unitTyConKey, + int8TyConKey, int16TyConKey, int32TyConKey, + word8TyConKey, word16TyConKey, word32TyConKey + ) import VarSet ( varSetElems ) +import Constants ( wORD_SIZE) import Outputable \end{code} @@ -96,7 +100,7 @@ dsCCall :: CLabelString -- C routine to invoke dsCCall lbl args may_gc is_asm result_ty = mapAndUnzipDs unboxArg args `thenDs` \ (unboxed_args, arg_wrappers) -> - boxResult [] ({-repType-} result_ty) `thenDs` \ (ccall_result_ty, res_wrapper) -> + boxResult [] result_ty `thenDs` \ (ccall_result_ty, res_wrapper) -> getUniqueDs `thenDs` \ uniq -> let target | is_asm = CasmTarget lbl @@ -143,8 +147,13 @@ unboxArg arg | isPrimitiveType arg_ty = returnDs (arg, \body -> body) + -- Recursive newtypes + | Just rep_ty <- splitNewType_maybe arg_ty + = unboxArg (mkCoerce2 rep_ty arg_ty arg) + -- Booleans - | isBoolTy arg_ty + | Just (tc,_) <- splitTyConApp_maybe arg_ty, + tc `hasKey` boolTyConKey = newSysLocalDs intPrimTy `thenDs` \ prim_arg -> returnDs (Var prim_arg, \ body -> Case (Case arg (mkWildId arg_ty) @@ -183,11 +192,7 @@ unboxArg arg = getSrcLocDs `thenDs` \ l -> pprPanic "unboxArg: " (ppr l <+> ppr arg_ty) where - arg_ty = repType (exprType arg) - -- The repType looks through any newtype or - -- implicit-parameter wrappings on the argument; - -- this is necessary, because isBoolTy (in particular) does not. - + arg_ty = exprType arg maybe_product_type = splitProductType_maybe arg_ty is_product_type = maybeToBool maybe_product_type Just (_, _, data_con, data_con_arg_tys) = maybe_product_type @@ -195,7 +200,7 @@ unboxArg arg (data_con_arg_ty1 : _) = data_con_arg_tys (_ : _ : data_con_arg_ty3 : _) = data_con_arg_tys - maybe_arg3_tycon = tcSplitTyConApp_maybe data_con_arg_ty3 + maybe_arg3_tycon = splitTyConApp_maybe data_con_arg_ty3 Just (arg3_tycon,_) = maybe_arg3_tycon \end{code} @@ -214,11 +219,6 @@ boxResult :: [Id] -> Type -> DsM (Type, CoreExpr -> CoreExpr) -- the result type will be -- State# RealWorld -> (# State# RealWorld #) --- Here is where we arrange that ForeignPtrs which are passed to a 'safe' --- foreign import don't get finalized until the call returns. For each --- argument of type ForeignObj# we arrange to touch# the argument after --- the call. The arg_ids passed in are the Ids passed to the actual ccall. - boxResult arg_ids result_ty = case tcSplitTyConApp_maybe result_ty of -- This split absolutely has to be a tcSplit, because we must @@ -261,13 +261,11 @@ boxResult arg_ids result_ty where mk_alt return_result (Nothing, wrap_result) = -- The ccall returns () - let - rhs_fun state_id = return_result (Var state_id) - (wrap_result (panic "boxResult")) - in newSysLocalDs realWorldStatePrimTy `thenDs` \ state_id -> - mkTouches arg_ids state_id rhs_fun `thenDs` \ the_rhs -> let + the_rhs = return_result (Var state_id) + (wrap_result (panic "boxResult")) + ccall_res_ty = mkTyConApp unboxedSingletonTyCon [realWorldStatePrimTy] the_alt = (DataAlt unboxedSingletonDataCon, [state_id], the_rhs) in @@ -276,59 +274,81 @@ boxResult arg_ids result_ty mk_alt return_result (Just prim_res_ty, wrap_result) = -- The ccall returns a non-() value newSysLocalDs prim_res_ty `thenDs` \ result_id -> - let - rhs_fun state_id = return_result (Var state_id) - (wrap_result (Var result_id)) - in newSysLocalDs realWorldStatePrimTy `thenDs` \ state_id -> - mkTouches arg_ids state_id rhs_fun `thenDs` \ the_rhs -> let + the_rhs = return_result (Var state_id) + (wrap_result (Var result_id)) + ccall_res_ty = mkTyConApp unboxedPairTyCon [realWorldStatePrimTy, prim_res_ty] the_alt = (DataAlt unboxedPairDataCon, [state_id, result_id], the_rhs) in returnDs (ccall_res_ty, the_alt) -touchzh = mkPrimOpId TouchOp - -mkTouches [] s cont = returnDs (cont s) -mkTouches (v:vs) s cont - | not (idType v `eqType` foreignObjPrimTy) = mkTouches vs s cont - | otherwise = newSysLocalDs realWorldStatePrimTy `thenDs` \s' -> - mkTouches vs s' cont `thenDs` \ rest -> - returnDs (Case (mkApps (Var touchzh) [Type foreignObjPrimTy, - Var v, Var s]) s' - [(DEFAULT, [], rest)]) resultWrapper :: Type -> (Maybe Type, -- Type of the expected result, if any CoreExpr -> CoreExpr) -- Wrapper for the result resultWrapper result_ty -- Base case 1: primitive types - | isPrimitiveType result_ty_rep + | isPrimitiveType result_ty = (Just result_ty, \e -> e) -- Base case 2: the unit type () - | isUnitTy result_ty_rep + | Just (tc,_) <- maybe_tc_app, tc `hasKey` unitTyConKey = (Nothing, \e -> Var unitDataConId) -- Base case 3: the boolean type - | isBoolTy result_ty_rep + | Just (tc,_) <- maybe_tc_app, tc `hasKey` boolTyConKey = (Just intPrimTy, \e -> Case e (mkWildId intPrimTy) [(DEFAULT ,[],Var trueDataConId ), (LitAlt (mkMachInt 0),[],Var falseDataConId)]) + -- Recursive newtypes + | Just rep_ty <- splitNewType_maybe result_ty + = let + (maybe_ty, wrapper) = resultWrapper rep_ty + in + (maybe_ty, \e -> mkCoerce2 result_ty rep_ty (wrapper e)) + + -- The type might contain foralls (eg. for dummy type arguments, + -- referring to 'Ptr a' is legal). + | Just (tyvar, rest) <- splitForAllTy_maybe result_ty + = let + (maybe_ty, wrapper) = resultWrapper rest + in + (maybe_ty, \e -> Lam tyvar (wrapper e)) + -- Data types with a single constructor, which has a single arg - | Just (_, tycon_arg_tys, data_con, data_con_arg_tys) <- splitProductType_maybe result_ty_rep, + | Just (tycon, tycon_arg_tys, data_con, data_con_arg_tys) <- splitProductType_maybe result_ty, dataConSourceArity data_con == 1 = let (maybe_ty, wrapper) = resultWrapper unwrapped_res_ty (unwrapped_res_ty : _) = data_con_arg_tys + narrow_wrapper = maybeNarrow tycon in (maybe_ty, \e -> mkApps (Var (dataConWrapId data_con)) - (map Type tycon_arg_tys ++ [wrapper e])) + (map Type tycon_arg_tys ++ [wrapper (narrow_wrapper e)])) | otherwise = pprPanic "resultWrapper" (ppr result_ty) where - result_ty_rep = repType result_ty -- Look through any newtypes/implicit parameters + maybe_tc_app = splitTyConApp_maybe result_ty + +-- When the result of a foreign call is smaller than the word size, we +-- need to sign- or zero-extend the result up to the word size. The C +-- standard appears to say that this is the responsibility of the +-- caller, not the callee. + +maybeNarrow :: TyCon -> (CoreExpr -> CoreExpr) +maybeNarrow tycon + | tycon `hasKey` int8TyConKey = \e -> App (Var (mkPrimOpId Narrow8IntOp)) e + | tycon `hasKey` int16TyConKey = \e -> App (Var (mkPrimOpId Narrow16IntOp)) e + | tycon `hasKey` int32TyConKey + && wORD_SIZE > 4 = \e -> App (Var (mkPrimOpId Narrow32IntOp)) e + + | tycon `hasKey` word8TyConKey = \e -> App (Var (mkPrimOpId Narrow8WordOp)) e + | tycon `hasKey` word16TyConKey = \e -> App (Var (mkPrimOpId Narrow16WordOp)) e + | tycon `hasKey` word32TyConKey + && wORD_SIZE > 4 = \e -> App (Var (mkPrimOpId Narrow32WordOp)) e + | otherwise = id \end{code}