[project @ 2004-07-21 09:25:42 by simonpj]

[ghc-hetmet.git] / ghc / compiler / codeGen / CgRetConv.lhs

diff --git a/ghc/compiler/codeGen/CgRetConv.lhs b/ghc/compiler/codeGen/CgRetConv.lhs
index f3ef813..ecf7d52 100644 (file)
--- a/ghc/compiler/codeGen/CgRetConv.lhs
+++ b/ghc/compiler/codeGen/CgRetConv.lhs
@@ -1,7 +1,7 @@
 %
 % (c) The GRASP Project, Glasgow University, 1992-1998
 %
-% $Id: CgRetConv.lhs,v 1.31 2002/01/28 16:52:37 simonpj Exp $
+% $Id: CgRetConv.lhs,v 1.34 2003/10/09 11:58:46 simonpj Exp $
 %
 \section[CgRetConv]{Return conventions for the code generator}
 
@@ -26,7 +26,7 @@ import Constants      ( mAX_FAMILY_SIZE_FOR_VEC_RETURNS,
                          mAX_Real_Double_REG, mAX_Real_Long_REG
                        )
 import CmdLineOpts     ( opt_Unregisterised )
-import Maybes          ( catMaybes )
+import Maybes          ( mapCatMaybes )
 import PrimRep         ( isFloatingRep, PrimRep(..), is64BitRep )
 import TyCon           ( TyCon, tyConFamilySize )
 import Util            ( isn'tIn )
@@ -79,6 +79,7 @@ ctrlReturnConvAlg tycon
 \begin{code}
 dataReturnConvPrim :: PrimRep -> MagicId
 
+dataReturnConvPrim PtrRep       = VanillaReg PtrRep  (_ILIT 1)
 dataReturnConvPrim IntRep      = VanillaReg IntRep  (_ILIT 1)
 dataReturnConvPrim WordRep     = VanillaReg WordRep (_ILIT 1)
 dataReturnConvPrim Int32Rep    = VanillaReg Int32Rep (_ILIT 1)
@@ -90,18 +91,9 @@ dataReturnConvPrim CharRep   = VanillaReg CharRep (_ILIT 1)
 dataReturnConvPrim Int8Rep     = VanillaReg Int8Rep (_ILIT 1)
 dataReturnConvPrim FloatRep    = FloatReg  (_ILIT 1)
 dataReturnConvPrim DoubleRep   = DoubleReg (_ILIT 1)
+dataReturnConvPrim StablePtrRep = VanillaReg StablePtrRep  (_ILIT 1)
 dataReturnConvPrim VoidRep     = VoidReg
 
--- Return a primitive-array pointer in the usual register:
-dataReturnConvPrim ArrayRep     = VanillaReg ArrayRep     (_ILIT 1)
-dataReturnConvPrim ByteArrayRep = VanillaReg ByteArrayRep (_ILIT 1)
-dataReturnConvPrim PrimPtrRep   = VanillaReg PrimPtrRep   (_ILIT 1)
-dataReturnConvPrim ThreadIdRep  = VanillaReg ThreadIdRep  (_ILIT 1)
-
-dataReturnConvPrim StablePtrRep  = VanillaReg StablePtrRep  (_ILIT 1)
-dataReturnConvPrim ForeignObjRep = VanillaReg ForeignObjRep (_ILIT 1)
-dataReturnConvPrim WeakPtrRep    = VanillaReg WeakPtrRep    (_ILIT 1)
-
 #ifdef DEBUG
 dataReturnConvPrim rep         = pprPanic "dataReturnConvPrim:" (ppr rep)
 #endif
@@ -232,10 +224,10 @@ mkRegTbl_allRegs regs_in_use
 mkRegTbl' regs_in_use vanillas floats doubles longs
   = (ok_vanilla, ok_float, ok_double, ok_long)
   where
-    ok_vanilla = catMaybes (map (select (VanillaReg VoidRep))  vanillas)
-    ok_float   = catMaybes (map (select FloatReg)             floats)
-    ok_double  = catMaybes (map (select DoubleReg)            doubles)
-    ok_long    = catMaybes (map (select (LongReg Int64Rep))    longs)   
+    ok_vanilla = mapCatMaybes (select (VanillaReg VoidRep)) vanillas
+    ok_float   = mapCatMaybes (select FloatReg)                    floats
+    ok_double  = mapCatMaybes (select DoubleReg)           doubles
+    ok_long    = mapCatMaybes (select (LongReg Int64Rep))   longs   
                                    -- rep isn't looked at, hence we can use any old rep.
 
     select :: (FastInt -> MagicId) -> Int{-cand-} -> Maybe Int