X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectCore.hs;h=c78f8cad16fe56c46d661a5e3cc8e90ef827e5a4;hb=e79c9ce01d0ce4412bd4bcd99c8c728a6a2ec569;hp=9118214b4ce02a368e8cb53905099adaf73d707f;hpb=02cff9dfe0e5f6b9a92949ee988989e16d764f8b;p=ghc-hetmet.git

diff --git a/compiler/vectorise/VectCore.hs b/compiler/vectorise/VectCore.hs
index 9118214..c78f8ca 100644
--- a/compiler/vectorise/VectCore.hs
+++ b/compiler/vectorise/VectCore.hs
@@ -7,12 +7,16 @@ module VectCore (
   vNonRec, vRec,
 
   vVar, vType, vNote, vLet,
-  mkVLams, mkVVarApps
+  vLams, vLamsWithoutLC, vVarApps,
+  vCaseDEFAULT, vCaseProd
 ) where
 
 #include "HsVersions.h"
 
 import CoreSyn
+import MkCore	      ( mkWildCase )
+import CoreUtils      ( exprType )
+import DataCon        ( DataCon )
 import Type           ( Type )
 import Var
 
@@ -54,14 +58,35 @@ vRec vs es = (Rec (zip vvs ves), Rec (zip lvs les))
 vLet :: VBind -> VExpr -> VExpr
 vLet = zipWithVect Let
 
-mkVLams :: [VVar] -> VExpr -> VExpr
-mkVLams vvs (ve,le) = (mkLams vs ve, mkLams ls le)
+vLams :: Var -> [VVar] -> VExpr -> VExpr
+vLams lc vs (ve, le) = (mkLams vvs ve, mkLams (lc:lvs) le)
+  where
+    (vvs,lvs) = unzip vs
+
+vLamsWithoutLC :: [VVar] -> VExpr -> VExpr
+vLamsWithoutLC vvs (ve,le) = (mkLams vs ve, mkLams ls le)
   where
     (vs,ls) = unzip vvs
 
-mkVVarApps :: Var -> VExpr -> [VVar] -> VExpr
-mkVVarApps lc (ve, le) vvs = (ve `mkVarApps` vs, le `mkVarApps` (lc : ls))
+vVarApps :: Var -> VExpr -> [VVar] -> VExpr
+vVarApps lc (ve, le) vvs = (ve `mkVarApps` vs, le `mkVarApps` (lc : ls))
   where
     (vs,ls) = unzip vvs 
 
-
+vCaseDEFAULT :: VExpr -> VVar -> Type -> Type -> VExpr -> VExpr
+vCaseDEFAULT (vscrut, lscrut) (vbndr, lbndr) vty lty (vbody, lbody)
+  = (Case vscrut vbndr vty (mkDEFAULT vbody),
+     Case lscrut lbndr lty (mkDEFAULT lbody))
+  where
+    mkDEFAULT e = [(DEFAULT, [], e)]
+
+vCaseProd :: VExpr -> Type -> Type
+          -> DataCon -> DataCon -> [Var] -> [VVar] -> VExpr -> VExpr
+vCaseProd (vscrut, lscrut) vty lty vdc ldc sh_bndrs bndrs
+          (vbody,lbody)
+  = (mkWildCase vscrut (exprType vscrut) vty
+          [(DataAlt vdc, vbndrs, vbody)],
+     mkWildCase lscrut (exprType lscrut) lty
+          [(DataAlt ldc, sh_bndrs ++ lbndrs, lbody)])
+  where
+    (vbndrs, lbndrs) = unzip bndrs