X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FByteCodeGen.lhs;h=14b5ba4c0ed48ba89ad00a829b00f4ea208d1600;hp=3138e8eca8a1b554e8bdaa0739a35d5efab9438d;hb=f3210a431cc4181a4dc805ec8744e871b8575ef1;hpb=ad94d40948668032189ad22a0ad741ac1f645f50 diff --git a/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs index 3138e8e..14b5ba4 100644 --- a/compiler/ghci/ByteCodeGen.lhs +++ b/compiler/ghci/ByteCodeGen.lhs @@ -5,22 +5,15 @@ ByteCodeGen: Generate bytecode from Core \begin{code} -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings --- for details - module ByteCodeGen ( UnlinkedBCO, byteCodeGen, coreExprToBCOs ) where #include "HsVersions.h" import ByteCodeInstr import ByteCodeItbls -import ByteCodeFFI import ByteCodeAsm import ByteCodeLink +import LibFFI import Outputable import Name @@ -37,7 +30,6 @@ import CoreFVs import Type import DataCon import TyCon -import Class import Type import Util import DataCon @@ -54,16 +46,15 @@ import Bitmap import OrdList import Constants -import Data.List ( intersperse, sortBy, zip4, zip6, partition ) -import Foreign ( Ptr, castPtr, mallocBytes, pokeByteOff, Word8, - withForeignPtr, castFunPtrToPtr, nullPtr, plusPtr ) +import Data.List +import Foreign import Foreign.C import Control.Exception ( throwDyn ) import GHC.Exts ( Int(..), ByteArray# ) import Control.Monad ( when ) -import Data.Char ( ord, chr ) +import Data.Char import UniqSupply import BreakArray @@ -86,7 +77,7 @@ byteCodeGen dflags binds tycs modBreaks | (bndr, rhs) <- flattenBinds binds] us <- mkSplitUniqSupply 'y' - (BcM_State _us final_ctr mallocd _, proto_bcos) + (BcM_State _us _final_ctr mallocd _, proto_bcos) <- runBc us modBreaks (mapM schemeTopBind flatBinds) when (notNull mallocd) @@ -110,13 +101,13 @@ coreExprToBCOs dflags expr -- create a totally bogus name for the top-level BCO; this -- should be harmless, since it's never used for anything - let invented_name = mkSystemVarName (mkPseudoUniqueE 0) FSLIT("ExprTopLevel") + let invented_name = mkSystemVarName (mkPseudoUniqueE 0) (fsLit "ExprTopLevel") invented_id = Id.mkLocalId invented_name (panic "invented_id's type") -- the uniques are needed to generate fresh variables when we introduce new -- let bindings for ticked expressions us <- mkSplitUniqSupply 'y' - (BcM_State _us final_ctr mallocd _ , proto_bco) + (BcM_State _us _final_ctr mallocd _ , proto_bco) <- runBc us emptyModBreaks (schemeTopBind (invented_id, freeVars expr)) when (notNull mallocd) @@ -138,6 +129,7 @@ type Sequel = Int -- back off to this depth before ENTER -- to mess with it after each push/pop. type BCEnv = FiniteMap Id Int -- To find vars on the stack +{- ppBCEnv :: BCEnv -> SDoc ppBCEnv p = text "begin-env" @@ -146,6 +138,7 @@ ppBCEnv p where pp_one (var, offset) = int offset <> colon <+> ppr var <+> ppr (idCgRep var) cmp_snd x y = compare (snd x) (snd y) +-} -- Create a BCO and do a spot of peephole optimisation on the insns -- at the same time. @@ -178,17 +171,19 @@ mkProtoBCO nm instrs_ordlist origin arity bitmap_size bitmap is_ret mallocd_bloc -- (hopefully rare) cases when the (overestimated) stack use -- exceeds iNTERP_STACK_CHECK_THRESH. maybe_with_stack_check - | is_ret = peep_d - -- don't do stack checks at return points; + | is_ret && stack_usage < aP_STACK_SPLIM = peep_d + -- don't do stack checks at return points, -- everything is aggregated up to the top BCO - -- (which must be a function) - | stack_overest >= iNTERP_STACK_CHECK_THRESH - = STKCHECK stack_overest : peep_d + -- (which must be a function). + -- That is, unless the stack usage is >= AP_STACK_SPLIM, + -- see bug #1466. + | stack_usage >= iNTERP_STACK_CHECK_THRESH + = STKCHECK stack_usage : peep_d | otherwise = peep_d -- the supposedly common case -- We assume that this sum doesn't wrap - stack_overest = sum (map bciStackUse peep_d) + stack_usage = sum (map bciStackUse peep_d) -- Merge local pushes peep_d = peep (fromOL instrs_ordlist) @@ -265,10 +260,10 @@ schemeR fvs (nm, rhs) = schemeR_wrk fvs nm rhs (collect [] rhs) collect :: [Var] -> AnnExpr Id VarSet -> ([Var], AnnExpr' Id VarSet) -collect xs (_, AnnNote note e) = collect xs e -collect xs (_, AnnCast e _) = collect xs e -collect xs (_, AnnLam x e) = collect (if isTyVar x then xs else (x:xs)) e -collect xs (_, not_lambda) = (reverse xs, not_lambda) +collect xs (_, AnnNote _ e) = collect xs e +collect xs (_, AnnCast e _) = collect xs e +collect xs (_, AnnLam x e) = collect (if isTyVar x then xs else (x:xs)) e +collect xs (_, not_lambda) = (reverse xs, not_lambda) schemeR_wrk :: [Id] -> Id -> AnnExpr Id VarSet -> ([Var], AnnExpr' Var VarSet) -> BcM (ProtoBCO Name) schemeR_wrk fvs nm original_body (args, body) @@ -353,7 +348,7 @@ instance Outputable TickInfo where schemeE :: Int -> Sequel -> BCEnv -> AnnExpr' Id VarSet -> BcM BCInstrList -- Delegate tail-calls to schemeT. -schemeE d s p e@(AnnApp f a) +schemeE d s p e@(AnnApp _ _) = schemeT d s p e schemeE d s p e@(AnnVar v) @@ -414,7 +409,7 @@ schemeE d s p (AnnLet binds (_,body)) zipE = zipEqual "schemeE" -- ToDo: don't build thunks for things with no free variables - build_thunk dd [] size bco off arity + build_thunk _ [] size bco off arity = return (PUSH_BCO bco `consOL` unitOL (mkap (off+size) size)) where mkap | arity == 0 = MKAP @@ -425,9 +420,15 @@ schemeE d s p (AnnLet binds (_,body)) return (push_code `appOL` more_push_code) alloc_code = toOL (zipWith mkAlloc sizes arities) - where mkAlloc sz 0 = ALLOC_AP sz + where mkAlloc sz 0 + | is_tick = ALLOC_AP_NOUPD sz + | otherwise = ALLOC_AP sz mkAlloc sz arity = ALLOC_PAP arity sz + is_tick = case binds of + AnnNonRec id _ -> occNameFS (getOccName id) == tickFS + _other -> False + compile_bind d' fvs x rhs size arity off = do bco <- schemeR fvs (x,rhs) build_thunk d' fvs size bco off arity @@ -449,7 +450,7 @@ schemeE d s p (AnnLet binds (_,body)) -- best way to calculate the free vars but it seemed like the least -- intrusive thing to do schemeE d s p exp@(AnnCase {}) - | Just (tickInfo,rhs) <- isTickedExp' exp + | Just (_tickInfo, rhs) <- isTickedExp' exp = if isUnLiftedType ty then schemeE d s p (snd rhs) else do @@ -461,7 +462,7 @@ schemeE d s p exp@(AnnCase {}) fvs = exprFreeVars exp' ty = exprType exp' -schemeE d s p (AnnCase scrut bndr _ [(DataAlt dc, [bind1, bind2], rhs)]) +schemeE d s p (AnnCase scrut _ _ [(DataAlt dc, [bind1, bind2], rhs)]) | isUnboxedTupleCon dc, VoidArg <- typeCgRep (idType bind1) -- Convert -- case .... of x { (# VoidArg'd-thing, a #) -> ... } @@ -479,7 +480,7 @@ schemeE d s p (AnnCase scrut bndr _ [(DataAlt dc, [bind1, bind2], rhs)]) = --trace "automagic mashing of case alts (# a, VoidArg #)" $ doCase d s p scrut bind1 [(DEFAULT, [], rhs)] True{-unboxed tuple-} -schemeE d s p (AnnCase scrut bndr _ [(DataAlt dc, [bind1], rhs)]) +schemeE d s p (AnnCase scrut _ _ [(DataAlt dc, [bind1], rhs)]) | isUnboxedTupleCon dc -- Similarly, convert -- case .... of x { (# a #) -> ... } @@ -491,15 +492,15 @@ schemeE d s p (AnnCase scrut bndr _ [(DataAlt dc, [bind1], rhs)]) schemeE d s p (AnnCase scrut bndr _ alts) = doCase d s p scrut bndr alts False{-not an unboxed tuple-} -schemeE d s p (AnnNote note (_, body)) +schemeE d s p (AnnNote _ (_, body)) = schemeE d s p body schemeE d s p (AnnCast (_, body) _) = schemeE d s p body -schemeE d s p other +schemeE _ _ _ expr = pprPanic "ByteCodeGen.schemeE: unhandled case" - (pprCoreExpr (deAnnotate' other)) + (pprCoreExpr (deAnnotate' expr)) {- Ticked Expressions @@ -524,9 +525,6 @@ schemeE d s p other -} -isTickedExp :: AnnExpr Id a -> Maybe (TickInfo, AnnExpr Id a) -isTickedExp (annot, expr) = isTickedExp' expr - isTickedExp' :: AnnExpr' Id a -> Maybe (TickInfo, AnnExpr Id a) isTickedExp' (AnnCase scrut _bndr _type alts) | Just tickInfo <- isTickedScrut scrut, @@ -548,9 +546,9 @@ isTickedExp' (AnnCase scrut _bndr _type alts) idsOfArgs = catMaybes . map exprId exprId :: Expr Id -> Maybe Id exprId (Var id) = Just id - exprId other = Nothing + exprId _ = Nothing -isTickedExp' other = Nothing +isTickedExp' _ = Nothing -- Compile code to do a tail call. Specifically, push the fn, -- slide the on-stack app back down to the sequel depth, @@ -638,8 +636,8 @@ schemeT d s p app (AnnApp (_, AnnApp (_, AnnVar v) (_, AnnType t)) arg) -> case isPrimOpId_maybe v of Just TagToEnumOp -> Just (snd arg, extract_constr_Names t) - other -> Nothing - other -> Nothing + _ -> Nothing + _ -> Nothing -- Extract the args (R->L) and fn -- The function will necessarily be a variable, @@ -663,13 +661,13 @@ mkConAppCode :: Int -> Sequel -> BCEnv -> [AnnExpr' Id VarSet] -- Args, in *reverse* order -> BcM BCInstrList -mkConAppCode orig_d s p con [] -- Nullary constructor +mkConAppCode _ _ _ con [] -- Nullary constructor = ASSERT( isNullaryRepDataCon con ) return (unitOL (PUSH_G (getName (dataConWorkId con)))) -- Instead of doing a PACK, which would allocate a fresh -- copy of this constructor, use the single shared version. -mkConAppCode orig_d s p con args_r_to_l +mkConAppCode orig_d _ p con args_r_to_l = ASSERT( dataConRepArity con == length args_r_to_l ) do_pushery orig_d (non_ptr_args ++ ptr_args) where @@ -735,6 +733,7 @@ doTailCall init_d s p fn args return (final_d, push_code `appOL` more_push_code) -- v. similar to CgStackery.findMatch, ToDo: merge +findPushSeq :: [CgRep] -> (BCInstr, Int, [CgRep]) findPushSeq (PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: rest) = (PUSH_APPLY_PPPPPP, 6, rest) findPushSeq (PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: rest) @@ -796,17 +795,17 @@ doCase d s p (_,scrut) bndr alts is_unboxed_tuple isAlgCase = not (isUnLiftedType bndr_ty) && not is_unboxed_tuple -- given an alt, return a discr and code for it. - codeAlt alt@(DEFAULT, _, (_,rhs)) + codeAlt (DEFAULT, _, (_,rhs)) = do rhs_code <- schemeE d_alts s p_alts rhs return (NoDiscr, rhs_code) - codeAlt alt@(discr, bndrs, (_,rhs)) + codeAlt alt@(_, bndrs, (_,rhs)) -- primitive or nullary constructor alt: no need to UNPACK | null real_bndrs = do rhs_code <- schemeE d_alts s p_alts rhs return (my_discr alt, rhs_code) -- algebraic alt with some binders - | ASSERT(isAlgCase) otherwise = + | otherwise = let (ptrs,nptrs) = partition (isFollowableArg.idCgRep) real_bndrs ptr_sizes = map idSizeW ptrs @@ -818,18 +817,19 @@ doCase d s p (_,scrut) bndr alts is_unboxed_tuple (zip (reverse (ptrs ++ nptrs)) (mkStackOffsets d_alts (reverse bind_sizes))) in do + MASSERT(isAlgCase) rhs_code <- schemeE (d_alts+size) s p' rhs return (my_discr alt, unitOL (UNPACK size) `appOL` rhs_code) where real_bndrs = filter (not.isTyVar) bndrs - my_discr (DEFAULT, binds, rhs) = NoDiscr {-shouldn't really happen-} - my_discr (DataAlt dc, binds, rhs) + my_discr (DEFAULT, _, _) = NoDiscr {-shouldn't really happen-} + my_discr (DataAlt dc, _, _) | isUnboxedTupleCon dc = unboxedTupleException | otherwise = DiscrP (dataConTag dc - fIRST_TAG) - my_discr (LitAlt l, binds, rhs) + my_discr (LitAlt l, _, _) = case l of MachInt i -> DiscrI (fromInteger i) MachFloat r -> DiscrF (fromRational r) MachDouble r -> DiscrD (fromRational r) @@ -903,7 +903,7 @@ generateCCall :: Int -> Sequel -- stack and sequel depths -> [AnnExpr' Id VarSet] -- args (atoms) -> BcM BCInstrList -generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l +generateCCall d0 s p (CCallSpec target cconv _) fn args_r_to_l = let -- useful constants addr_sizeW = cgRepSizeW NonPtrArg @@ -913,7 +913,7 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l -- depth to the first word of the bits for that arg, and the -- CgRep of what was actually pushed. - pargs d [] = return [] + pargs _ [] = return [] pargs d (a:az) = let arg_ty = repType (exprType (deAnnotate' a)) @@ -924,18 +924,18 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l | t == arrayPrimTyCon || t == mutableArrayPrimTyCon -> do rest <- pargs (d + addr_sizeW) az code <- parg_ArrayishRep arrPtrsHdrSize d p a - return ((code,NonPtrArg):rest) + return ((code,AddrRep):rest) | t == byteArrayPrimTyCon || t == mutableByteArrayPrimTyCon -> do rest <- pargs (d + addr_sizeW) az code <- parg_ArrayishRep arrWordsHdrSize d p a - return ((code,NonPtrArg):rest) + return ((code,AddrRep):rest) -- Default case: push taggedly, but otherwise intact. - other + _ -> do (code_a, sz_a) <- pushAtom d p a rest <- pargs (d+sz_a) az - return ((code_a, atomRep a) : rest) + return ((code_a, atomPrimRep a) : rest) -- Do magic for Ptr/Byte arrays. Push a ptr to the array on -- the stack but then advance it over the headers, so as to @@ -950,11 +950,12 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l code_n_reps <- pargs d0 args_r_to_l let (pushs_arg, a_reps_pushed_r_to_l) = unzip code_n_reps + a_reps_sizeW = sum (map primRepSizeW a_reps_pushed_r_to_l) push_args = concatOL pushs_arg - d_after_args = d0 + sum (map cgRepSizeW a_reps_pushed_r_to_l) + d_after_args = d0 + a_reps_sizeW a_reps_pushed_RAW - | null a_reps_pushed_r_to_l || head a_reps_pushed_r_to_l /= VoidArg + | null a_reps_pushed_r_to_l || head a_reps_pushed_r_to_l /= VoidRep = panic "ByteCodeGen.generateCCall: missing or invalid World token?" | otherwise = reverse (tail a_reps_pushed_r_to_l) @@ -966,7 +967,7 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l -- Get the result rep. (returns_void, r_rep) = case maybe_getCCallReturnRep (idType fn) of - Nothing -> (True, VoidArg) + Nothing -> (True, VoidRep) Just rr -> (False, rr) {- Because the Haskell stack grows down, the a_reps refer to @@ -1009,8 +1010,18 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l DynamicTarget -> return (False, panic "ByteCodeGen.generateCCall(dyn)") StaticTarget target - -> do res <- ioToBc (lookupStaticPtr target) + -> do res <- ioToBc (lookupStaticPtr stdcall_adj_target) return (True, res) + where + stdcall_adj_target +#ifdef mingw32_TARGET_OS + | StdCallConv <- cconv + = let size = a_reps_sizeW * wORD_SIZE in + mkFastString (unpackFS target ++ '@':show size) +#endif + | otherwise + = target + -- in (is_static, static_target_addr) <- get_target_info let @@ -1032,7 +1043,7 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l -- Push the return placeholder. For a call returning nothing, -- this is a VoidArg (tag). - r_sizeW = cgRepSizeW r_rep + r_sizeW = primRepSizeW r_rep d_after_r = d_after_Addr + r_sizeW r_lit = mkDummyLiteral r_rep push_r = (if returns_void @@ -1040,28 +1051,27 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l else unitOL (PUSH_UBX (Left r_lit) r_sizeW)) -- generate the marshalling code we're going to call - r_offW = 0 - addr_offW = r_sizeW - arg1_offW = r_sizeW + addr_sizeW - args_offW = map (arg1_offW +) - (init (scanl (+) 0 (map cgRepSizeW a_reps))) - -- in - addr_of_marshaller <- ioToBc (mkMarshalCode cconv - (r_offW, r_rep) addr_offW - (zip args_offW a_reps)) - recordItblMallocBc (ItblPtr (castFunPtrToPtr addr_of_marshaller)) - let + -- Offset of the next stack frame down the stack. The CCALL -- instruction needs to describe the chunk of stack containing -- the ccall args to the GC, so it needs to know how large it -- is. See comment in Interpreter.c with the CCALL instruction. stk_offset = d_after_r - s + -- in + -- the only difference in libffi mode is that we prepare a cif + -- describing the call type by calling libffi, and we attach the + -- address of this to the CCALL instruction. + token <- ioToBc $ prepForeignCall cconv a_reps r_rep + let addr_of_marshaller = castPtrToFunPtr token + + recordItblMallocBc (ItblPtr (castFunPtrToPtr addr_of_marshaller)) + let -- do the call do_call = unitOL (CCALL stk_offset (castFunPtrToPtr addr_of_marshaller)) -- slide and return wrapup = mkSLIDE r_sizeW (d_after_r - r_sizeW - s) - `snocOL` RETURN_UBX r_rep + `snocOL` RETURN_UBX (primRepToCgRep r_rep) --in --trace (show (arg1_offW, args_offW , (map cgRepSizeW a_reps) )) $ return ( @@ -1069,17 +1079,19 @@ generateCCall d0 s p ccall_spec@(CCallSpec target cconv safety) fn args_r_to_l push_Addr `appOL` push_r `appOL` do_call `appOL` wrapup ) - -- Make a dummy literal, to be used as a placeholder for FFI return -- values on the stack. -mkDummyLiteral :: CgRep -> Literal +mkDummyLiteral :: PrimRep -> Literal mkDummyLiteral pr = case pr of - NonPtrArg -> MachWord 0 - DoubleArg -> MachDouble 0 - FloatArg -> MachFloat 0 - LongArg -> MachWord64 0 - _ -> moan64 "mkDummyLiteral" (ppr pr) + IntRep -> MachInt 0 + WordRep -> MachWord 0 + AddrRep -> MachNullAddr + DoubleRep -> MachDouble 0 + FloatRep -> MachFloat 0 + Int64Rep -> MachInt64 0 + Word64Rep -> MachWord64 0 + _ -> panic "mkDummyLiteral" -- Convert (eg) @@ -1096,21 +1108,21 @@ mkDummyLiteral pr -- -- to Nothing -maybe_getCCallReturnRep :: Type -> Maybe CgRep +maybe_getCCallReturnRep :: Type -> Maybe PrimRep maybe_getCCallReturnRep fn_ty - = let (a_tys, r_ty) = splitFunTys (dropForAlls fn_ty) + = let (_a_tys, r_ty) = splitFunTys (dropForAlls fn_ty) maybe_r_rep_to_go = if isSingleton r_reps then Nothing else Just (r_reps !! 1) (r_tycon, r_reps) = case splitTyConApp_maybe (repType r_ty) of - (Just (tyc, tys)) -> (tyc, map typeCgRep tys) + (Just (tyc, tys)) -> (tyc, map typePrimRep tys) Nothing -> blargh - ok = ( ( r_reps `lengthIs` 2 && VoidArg == head r_reps) - || r_reps == [VoidArg] ) + ok = ( ( r_reps `lengthIs` 2 && VoidRep == head r_reps) + || r_reps == [VoidRep] ) && isUnboxedTupleTyCon r_tycon && case maybe_r_rep_to_go of Nothing -> True - Just r_rep -> r_rep /= PtrArg + Just r_rep -> r_rep /= PtrRep -- if it was, it would be impossible -- to create a valid return value -- placeholder on the stack @@ -1161,7 +1173,7 @@ pushAtom :: Int -> BCEnv -> AnnExpr' Id VarSet -> BcM (BCInstrList, Int) pushAtom d p (AnnApp f (_, AnnType _)) = pushAtom d p (snd f) -pushAtom d p (AnnNote note e) +pushAtom d p (AnnNote _ e) = pushAtom d p (snd e) pushAtom d p (AnnLam x e) @@ -1200,15 +1212,16 @@ pushAtom d p (AnnVar v) sz = idSizeW v -pushAtom d p (AnnLit lit) +pushAtom _ _ (AnnLit lit) = case lit of - MachLabel fs _ -> code NonPtrArg - MachWord w -> code NonPtrArg - MachInt i -> code PtrArg - MachFloat r -> code FloatArg - MachDouble r -> code DoubleArg - MachChar c -> code NonPtrArg - MachStr s -> pushStr s + MachLabel _ _ -> code NonPtrArg + MachWord _ -> code NonPtrArg + MachInt _ -> code PtrArg + MachFloat _ -> code FloatArg + MachDouble _ -> code DoubleArg + MachChar _ -> code NonPtrArg + MachStr s -> pushStr s + l -> pprPanic "pushAtom" (ppr l) where code rep = let size_host_words = cgRepSizeW rep @@ -1241,9 +1254,9 @@ pushAtom d p (AnnLit lit) pushAtom d p (AnnCast e _) = pushAtom d p (snd e) -pushAtom d p other +pushAtom _ _ expr = pprPanic "ByteCodeGen.pushAtom" - (pprCoreExpr (deAnnotate (undefined, other))) + (pprCoreExpr (deAnnotate (undefined, expr))) foreign import ccall unsafe "memcpy" memcpy :: Ptr a -> Ptr b -> CSize -> IO () @@ -1266,7 +1279,7 @@ mkMultiBranch maybe_ncons raw_ways (filter (not.isNoDiscr.fst) raw_ways) mkTree :: [(Discr, BCInstrList)] -> Discr -> Discr -> BcM BCInstrList - mkTree [] range_lo range_hi = return the_default + mkTree [] _range_lo _range_hi = return the_default mkTree [val] range_lo range_hi | range_lo `eqAlt` range_hi @@ -1295,6 +1308,7 @@ mkMultiBranch maybe_ncons raw_ways the_default = case d_way of [] -> unitOL CASEFAIL [(_, def)] -> def + _ -> panic "mkMultiBranch/the_default" -- None of these will be needed if there are no non-default alts (mkTestLT, mkTestEQ, init_lo, init_hi) @@ -1317,7 +1331,8 @@ mkMultiBranch maybe_ncons raw_ways DiscrP _ -> ( \(DiscrP i) fail_label -> TESTLT_P i fail_label, \(DiscrP i) fail_label -> TESTEQ_P i fail_label, DiscrP algMinBound, - DiscrP algMaxBound ) + DiscrP algMaxBound ); + NoDiscr -> panic "mkMultiBranch NoDiscr" } (algMinBound, algMaxBound) @@ -1393,8 +1408,8 @@ unboxedTupleException " Workaround: use -fobject-code, or compile this module to .o separately.")) +mkSLIDE :: Int -> Int -> OrdList BCInstr mkSLIDE n d = if d == 0 then nilOL else unitOL (SLIDE n d) -bind x f = f x splitApp :: AnnExpr' id ann -> (AnnExpr' id ann, [AnnExpr' id ann]) -- The arguments are returned in *right-to-left* order @@ -1402,7 +1417,7 @@ splitApp (AnnApp (_,f) (_,a)) | isTypeAtom a = splitApp f | otherwise = case splitApp f of (f', as) -> (f', a:as) -splitApp (AnnNote n (_,e)) = splitApp e +splitApp (AnnNote _ (_,e)) = splitApp e splitApp (AnnCast (_,e) _) = splitApp e splitApp e = (e, []) @@ -1412,19 +1427,22 @@ isTypeAtom (AnnType _) = True isTypeAtom _ = False isVoidArgAtom :: AnnExpr' id ann -> Bool -isVoidArgAtom (AnnVar v) = typeCgRep (idType v) == VoidArg -isVoidArgAtom (AnnNote n (_,e)) = isVoidArgAtom e +isVoidArgAtom (AnnVar v) = typePrimRep (idType v) == VoidRep +isVoidArgAtom (AnnNote _ (_,e)) = isVoidArgAtom e isVoidArgAtom (AnnCast (_,e) _) = isVoidArgAtom e isVoidArgAtom _ = False +atomPrimRep :: AnnExpr' Id ann -> PrimRep +atomPrimRep (AnnVar v) = typePrimRep (idType v) +atomPrimRep (AnnLit l) = typePrimRep (literalType l) +atomPrimRep (AnnNote _ b) = atomPrimRep (snd b) +atomPrimRep (AnnApp f (_, AnnType _)) = atomPrimRep (snd f) +atomPrimRep (AnnLam x e) | isTyVar x = atomPrimRep (snd e) +atomPrimRep (AnnCast b _) = atomPrimRep (snd b) +atomPrimRep other = pprPanic "atomPrimRep" (ppr (deAnnotate (undefined,other))) + atomRep :: AnnExpr' Id ann -> CgRep -atomRep (AnnVar v) = typeCgRep (idType v) -atomRep (AnnLit l) = typeCgRep (literalType l) -atomRep (AnnNote n b) = atomRep (snd b) -atomRep (AnnApp f (_, AnnType _)) = atomRep (snd f) -atomRep (AnnLam x e) | isTyVar x = atomRep (snd e) -atomRep (AnnCast b _) = atomRep (snd b) -atomRep other = pprPanic "atomRep" (ppr (deAnnotate (undefined,other))) +atomRep e = primRepToCgRep (atomPrimRep e) isPtrAtom :: AnnExpr' Id ann -> Bool isPtrAtom e = atomRep e == PtrArg @@ -1472,7 +1490,7 @@ thenBc (BcM expr) cont = BcM $ \st0 -> do thenBc_ :: BcM a -> BcM b -> BcM b thenBc_ (BcM expr) (BcM cont) = BcM $ \st0 -> do - (st1, q) <- expr st0 + (st1, _) <- expr st0 (st2, r) <- cont st1 return (st2, r) @@ -1517,5 +1535,8 @@ newUnique = BcM $ newId :: Type -> BcM Id newId ty = do uniq <- newUnique - return $ mkSysLocal FSLIT("ticked") uniq ty + return $ mkSysLocal tickFS uniq ty + +tickFS :: FastString +tickFS = fsLit "ticked" \end{code}