X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FPprC.hs;h=8726547ae9f8194da6e3c2d8c4b45009a96fbdab;hb=f96e9aa0444de0e673b3c4055c6e43299639bc5b;hp=62bdb314046ef2fcb0021bae8b1fb4592dd6d204;hpb=58546748b9659f59dfdc3a917b1b64ceacc5496d;p=ghc-hetmet.git diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index 62bdb31..8726547 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -28,6 +28,7 @@ import Cmm import CLabel import MachOp import ForeignCall +import ClosureInfo -- Utils import DynFlags @@ -51,19 +52,21 @@ import PprCmm () -- instances only -- import Debug.Trace #endif -#if __GLASGOW_HASKELL__ >= 504 import Data.Array.ST -#endif import Control.Monad.ST #if x86_64_TARGET_ARCH import StaticFlags ( opt_Unregisterised ) #endif +#if defined(alpha_TARGET_ARCH) || defined(mips_TARGET_ARCH) || defined(mipsel_TARGET_ARCH) || defined(arm_TARGET_ARCH) +#define BEWARE_LOAD_STORE_ALIGNMENT +#endif + -- -------------------------------------------------------------------------- -- Top level -pprCs :: DynFlags -> [Cmm] -> SDoc +pprCs :: DynFlags -> [RawCmm] -> SDoc pprCs dflags cmms = pprCode CStyle (vcat $ map (\c -> split_marker $$ pprC c) cmms) where @@ -71,7 +74,7 @@ pprCs dflags cmms | dopt Opt_SplitObjs dflags = ptext SLIT("__STG_SPLIT_MARKER") | otherwise = empty -writeCs :: DynFlags -> Handle -> [Cmm] -> IO () +writeCs :: DynFlags -> Handle -> [RawCmm] -> IO () writeCs dflags handle cmms = printForC handle (pprCs dflags cmms) @@ -81,13 +84,13 @@ writeCs dflags handle cmms -- for fun, we could call cmmToCmm over the tops... -- -pprC :: Cmm -> SDoc +pprC :: RawCmm -> SDoc pprC (Cmm tops) = vcat $ intersperse (text "") $ map pprTop tops -- -- top level procs -- -pprTop :: CmmTop -> SDoc +pprTop :: RawCmmTop -> SDoc pprTop (CmmProc info clbl _params blocks) = (if not (null info) then pprDataExterns info $$ @@ -196,15 +199,15 @@ pprStmt stmt = case stmt of where rep = cmmExprRep src - CmmCall (CmmForeignCall fn cconv) results args volatile -> + CmmCall (CmmForeignCall fn cconv) results args srt -> -- Controversial: leave this out for now. -- pprUndef fn $$ - pprCall ppr_fn cconv results args volatile + pprCall ppr_fn cconv results args srt where ppr_fn = case fn of CmmLit (CmmLabel lbl) -> pprCLabel lbl - _other -> parens (cCast (pprCFunType cconv results args) fn) + _ -> parens (cCast (pprCFunType cconv results args) fn) -- for a dynamic call, cast the expression to -- a function of the right type (we hope). @@ -217,8 +220,8 @@ pprStmt stmt = case stmt of ptext SLIT("#undef") <+> pprCLabel lbl pprUndef _ = empty - CmmCall (CmmPrim op) results args volatile -> - pprCall ppr_fn CCallConv results args volatile + CmmCall (CmmPrim op) results args srt -> + pprCall ppr_fn CCallConv results args srt where ppr_fn = pprCallishMachOp_for_C op @@ -227,7 +230,7 @@ pprStmt stmt = case stmt of CmmJump lbl _params -> mkJMP_(pprExpr lbl) <> semi CmmSwitch arg ids -> pprSwitch arg ids -pprCFunType :: CCallConv -> [(CmmReg,MachHint)] -> [(CmmExpr,MachHint)] -> SDoc +pprCFunType :: CCallConv -> CmmHintFormals -> CmmActuals -> SDoc pprCFunType cconv ress args = hcat [ res_type ress, @@ -236,7 +239,7 @@ pprCFunType cconv ress args ] where res_type [] = ptext SLIT("void") - res_type [(one,hint)] = machRepHintCType (cmmRegRep one) hint + res_type [(one,hint)] = machRepHintCType (localRegRep one) hint arg_type (expr,hint) = machRepHintCType (cmmExprRep expr) hint @@ -325,7 +328,7 @@ pprExpr e = case e of CmmLoad expr rep -> -- the general case: - char '*' <> parens (cCast (machRepPtrCType rep) expr) + cLoad expr rep CmmReg reg -> pprCastReg reg CmmRegOff reg 0 -> pprCastReg reg @@ -429,6 +432,9 @@ pprStatics (CmmStaticLit (CmmInt i I64) : rest) #endif where r = i .&. 0xffffffff q = i `shiftR` 32 +pprStatics (CmmStaticLit (CmmInt i rep) : rest) + | machRepByteWidth rep /= wORD_SIZE + = panic "pprStatics: cannot emit a non-word-sized static literal" pprStatics (CmmStaticLit lit : rest) = pprLit1 lit : pprStatics rest pprStatics (other : rest) @@ -708,21 +714,20 @@ pprGlobalReg gr = case gr of GCFun -> ptext SLIT("stg_gc_fun") pprLocalReg :: LocalReg -> SDoc -pprLocalReg (LocalReg uniq _rep) = char '_' <> ppr uniq +pprLocalReg (LocalReg uniq _ _) = char '_' <> ppr uniq -- ----------------------------------------------------------------------------- -- Foreign Calls -pprCall :: SDoc -> CCallConv -> [(CmmReg,MachHint)] -> [(CmmExpr,MachHint)] - -> Maybe [GlobalReg] -> SDoc +pprCall :: SDoc -> CCallConv -> CmmHintFormals -> CmmActuals -> C_SRT + -> SDoc -pprCall ppr_fn cconv results args vols +pprCall ppr_fn cconv results args _ | not (is_cish cconv) = panic "pprCall: unknown calling convention" | otherwise - = save vols $$ - ptext SLIT("CALLER_SAVE_SYSTEM") $$ + = #if x86_64_TARGET_ARCH -- HACK around gcc optimisations. -- x86_64 needs a __DISCARD__() here, to create a barrier between @@ -734,22 +739,12 @@ pprCall ppr_fn cconv results args vols then ptext SLIT("__DISCARD__();") else empty) $$ #endif - ppr_assign results (ppr_fn <> parens (commafy (map pprArg args))) <> semi $$ - ptext SLIT("CALLER_RESTORE_SYSTEM") $$ - restore vols + ppr_assign results (ppr_fn <> parens (commafy (map pprArg args))) <> semi where ppr_assign [] rhs = rhs - ppr_assign [(reg@(CmmGlobal BaseReg), hint)] rhs - | Just ty <- strangeRegType reg - = ptext SLIT("ASSIGN_BaseReg") <> parens (parens ty <> rhs) - -- BaseReg is special, sometimes it isn't an lvalue and we - -- can't assign to it. ppr_assign [(one,hint)] rhs - | Just ty <- strangeRegType one - = pprReg one <> ptext SLIT(" = ") <> parens ty <> rhs - | otherwise - = pprReg one <> ptext SLIT(" = ") - <> pprUnHint hint (cmmRegRep one) <> rhs + = pprLocalReg one <> ptext SLIT(" = ") + <> pprUnHint hint (localRegRep one) <> rhs ppr_assign _other _rhs = panic "pprCall: multiple results" pprArg (expr, PtrHint) @@ -764,15 +759,6 @@ pprCall ppr_fn cconv results args vols pprUnHint SignedHint rep = parens (machRepCType rep) pprUnHint _ _ = empty - save = save_restore SLIT("CALLER_SAVE") - restore = save_restore SLIT("CALLER_RESTORE") - - -- Nothing says "I don't know what's live; save everything" - -- CALLER_SAVE_USER is defined in ghc/includes/Regs.h - save_restore txt Nothing = ptext txt <> ptext SLIT("_USER") - save_restore txt (Just these) = vcat (map saveRestoreGlobal these) - where saveRestoreGlobal r = ptext txt <> char '_' <> pprGlobalRegName r - pprGlobalRegName :: GlobalReg -> SDoc pprGlobalRegName gr = case gr of VanillaReg n -> char 'R' <> int n -- without the .w suffix @@ -799,7 +785,7 @@ pprDataExterns statics where (_, lbls) = runTE (mapM_ te_Static statics) pprTempDecl :: LocalReg -> SDoc -pprTempDecl l@(LocalReg _uniq rep) +pprTempDecl l@(LocalReg _ rep _) = hcat [ machRepCType rep, space, pprLocalReg l, semi ] pprExternDecl :: Bool -> CLabel -> SDoc @@ -854,7 +840,7 @@ te_Lit _ = return () te_Stmt :: CmmStmt -> TE () te_Stmt (CmmAssign r e) = te_Reg r >> te_Expr e te_Stmt (CmmStore l r) = te_Expr l >> te_Expr r -te_Stmt (CmmCall _ rs es _) = mapM_ (te_Reg.fst) rs >> +te_Stmt (CmmCall _ rs es _) = mapM_ (te_temp.fst) rs >> mapM_ (te_Expr.fst) es te_Stmt (CmmCondBranch e _) = te_Expr e te_Stmt (CmmSwitch e _) = te_Expr e @@ -879,6 +865,18 @@ te_Reg _ = return () cCast :: SDoc -> CmmExpr -> SDoc cCast ty expr = parens ty <> pprExpr1 expr +cLoad :: CmmExpr -> MachRep -> SDoc +#ifdef BEWARE_LOAD_STORE_ALIGNMENT +cLoad expr rep = + let decl = machRepCType rep <+> ptext SLIT("x") <> semi + struct = ptext SLIT("struct") <+> braces (decl) + packed_attr = ptext SLIT("__attribute__((packed))") + cast = parens (struct <+> packed_attr <> char '*') + in parens (cast <+> pprExpr1 expr) <> ptext SLIT("->x") +#else +cLoad expr rep = char '*' <> parens (cCast (machRepPtrCType rep) expr) +#endif + -- This is for finding the types of foreign call arguments. For a pointer -- argument, we always cast the argument to (void *), to avoid warnings from -- the C compiler. @@ -946,46 +944,20 @@ big_doubles | machRepByteWidth F64 == wORD_SIZE = False | otherwise = panic "big_doubles" -#if __GLASGOW_HASKELL__ >= 504 -newFloatArray :: (Int,Int) -> ST s (STUArray s Int Float) -newFloatArray = newArray_ - -newDoubleArray :: (Int,Int) -> ST s (STUArray s Int Double) -newDoubleArray = newArray_ - castFloatToIntArray :: STUArray s Int Float -> ST s (STUArray s Int Int) castFloatToIntArray = castSTUArray castDoubleToIntArray :: STUArray s Int Double -> ST s (STUArray s Int Int) castDoubleToIntArray = castSTUArray -writeFloatArray :: STUArray s Int Float -> Int -> Float -> ST s () -writeFloatArray = writeArray - -writeDoubleArray :: STUArray s Int Double -> Int -> Double -> ST s () -writeDoubleArray = writeArray - -readIntArray :: STUArray s Int Int -> Int -> ST s Int -readIntArray = readArray - -#else - -castFloatToIntArray :: MutableByteArray s t -> ST s (MutableByteArray s t) -castFloatToIntArray = return - -castDoubleToIntArray :: MutableByteArray s t -> ST s (MutableByteArray s t) -castDoubleToIntArray = return - -#endif - -- floats are always 1 word floatToWord :: Rational -> CmmLit floatToWord r = runST (do - arr <- newFloatArray ((0::Int),0) - writeFloatArray arr 0 (fromRational r) + arr <- newArray_ ((0::Int),0) + writeArray arr 0 (fromRational r) arr' <- castFloatToIntArray arr - i <- readIntArray arr' 0 + i <- readArray arr' 0 return (CmmInt (toInteger i) wordRep) ) @@ -993,21 +965,21 @@ doubleToWords :: Rational -> [CmmLit] doubleToWords r | big_doubles -- doubles are 2 words = runST (do - arr <- newDoubleArray ((0::Int),1) - writeDoubleArray arr 0 (fromRational r) + arr <- newArray_ ((0::Int),1) + writeArray arr 0 (fromRational r) arr' <- castDoubleToIntArray arr - i1 <- readIntArray arr' 0 - i2 <- readIntArray arr' 1 + i1 <- readArray arr' 0 + i2 <- readArray arr' 1 return [ CmmInt (toInteger i1) wordRep , CmmInt (toInteger i2) wordRep ] ) | otherwise -- doubles are 1 word = runST (do - arr <- newDoubleArray ((0::Int),0) - writeDoubleArray arr 0 (fromRational r) + arr <- newArray_ ((0::Int),0) + writeArray arr 0 (fromRational r) arr' <- castDoubleToIntArray arr - i <- readIntArray arr' 0 + i <- readArray arr' 0 return [ CmmInt (toInteger i) wordRep ] )