X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgParallel.hs;h=682f28aad4ba6333524b8c275b1df9606ad1a6e8;hp=46341315146f593a3e40783220f6276cf652d907;hb=b2bd63f99d643f6b3eb30bb72bb9ae26d4183252;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf

diff --git a/compiler/codeGen/CgParallel.hs b/compiler/codeGen/CgParallel.hs
index 4634131..682f28a 100644
--- a/compiler/codeGen/CgParallel.hs
+++ b/compiler/codeGen/CgParallel.hs
@@ -8,13 +8,6 @@
 --
 -----------------------------------------------------------------------------
 
-{-# OPTIONS_GHC -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/WorkingConventions#Warnings
--- for details
-
 module CgParallel(
 	staticGranHdr,staticParHdr,
 	granFetchAndReschedule, granYield,
@@ -24,9 +17,10 @@ module CgParallel(
 import CgMonad
 import CgCallConv
 import Id
-import Cmm
+import OldCmm
 import StaticFlags
 import Outputable
+import SMRep
 
 staticParHdr :: [CmmLit]
 -- Parallel header words in a static closure
@@ -42,7 +36,7 @@ staticGranHdr = []
 
 doGranAllocate :: CmmExpr -> Code	
 -- macro DO_GRAN_ALLOCATE
-doGranAllocate hp 
+doGranAllocate _hp
   | not opt_GranMacros = nopC
   | otherwise	       = panic "doGranAllocate"
 
@@ -62,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)])
@@ -96,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))])