X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgParallel.hs;h=682f28aad4ba6333524b8c275b1df9606ad1a6e8;hp=b826a33cba31e44d9423caf2c52066938250a8ca;hb=2c8aabcad1d2f2c469cb8a10afa7b66beeaedd45;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/compiler/codeGen/CgParallel.hs b/compiler/codeGen/CgParallel.hs
index b826a33..682f28a 100644
--- a/compiler/codeGen/CgParallel.hs
+++ b/compiler/codeGen/CgParallel.hs
@@ -1,6 +1,12 @@
+-----------------------------------------------------------------------------
+--
+-- (c) The University of Glasgow -2006
+--
 -- Code generation relaed to GpH
 -- 	(a) parallel
 --	(b) GranSim
+--
+-----------------------------------------------------------------------------
 
 module CgParallel(
 	staticGranHdr,staticParHdr,
@@ -9,11 +15,12 @@ module CgParallel(
   ) where
 
 import CgMonad
-import CgCallConv	( mkRegLiveness )
-import Id		( Id )
-import Cmm		( CmmLit, GlobalReg(..), node, CmmExpr )
-import StaticFlags	( opt_GranMacros )
+import CgCallConv
+import Id
+import OldCmm
+import StaticFlags
 import Outputable
+import SMRep
 
 staticParHdr :: [CmmLit]
 -- Parallel header words in a static closure
@@ -29,7 +36,7 @@ staticGranHdr = []
 
 doGranAllocate :: CmmExpr -> Code	
 -- macro DO_GRAN_ALLOCATE
-doGranAllocate hp 
+doGranAllocate _hp
   | not opt_GranMacros = nopC
   | otherwise	       = panic "doGranAllocate"
 
@@ -49,12 +56,14 @@ granFetchAndReschedule regs node_reqd
   where
     liveness = mkRegLiveness regs 0 0
 
+fetch :: FCode ()
 fetch = panic "granFetch"
 	-- Was: absC (CMacroStmt GRAN_FETCH [])
 	--HWL: generate GRAN_FETCH macro for GrAnSim
  	--     currently GRAN_FETCH and GRAN_FETCH_AND_RESCHEDULE are miai
 
-reschedule liveness node_reqd = panic "granReschedule"
+reschedule :: StgWord -> Bool -> Code
+reschedule _liveness _node_reqd = panic "granReschedule"
 	-- Was: absC  (CMacroStmt GRAN_RESCHEDULE [
   	--                mkIntCLit (I# (word2Int# liveness_mask)), 
     	--		  mkIntCLit (if node_reqd then 1 else 0)])
@@ -83,7 +92,8 @@ granYield regs node_reqd
   where
      liveness = mkRegLiveness regs 0 0
 
-yield liveness = panic "granYield"
+yield :: StgWord -> Code
+yield _liveness = panic "granYield"
 	-- Was : absC (CMacroStmt GRAN_YIELD 
         --                  [mkIntCLit (I# (word2Int# liveness_mask))])