projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
[ghc-hetmet.git]
/
compiler
/
codeGen
/
CgParallel.hs
diff --git
a/compiler/codeGen/CgParallel.hs
b/compiler/codeGen/CgParallel.hs
index
b826a33
..
682f28a
100644
(file)
--- 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
-- Code generation relaed to GpH
-- (a) parallel
-- (b) GranSim
+--
+-----------------------------------------------------------------------------
module CgParallel(
staticGranHdr,staticParHdr,
module CgParallel(
staticGranHdr,staticParHdr,
@@
-9,11
+15,12
@@
module CgParallel(
) where
import CgMonad
) 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 Outputable
+import SMRep
staticParHdr :: [CmmLit]
-- Parallel header words in a static closure
staticParHdr :: [CmmLit]
-- Parallel header words in a static closure
@@
-29,7
+36,7
@@
staticGranHdr = []
doGranAllocate :: CmmExpr -> Code
-- macro DO_GRAN_ALLOCATE
doGranAllocate :: CmmExpr -> Code
-- macro DO_GRAN_ALLOCATE
-doGranAllocate hp
+doGranAllocate _hp
| not opt_GranMacros = nopC
| otherwise = panic "doGranAllocate"
| not opt_GranMacros = nopC
| otherwise = panic "doGranAllocate"
@@
-49,12
+56,14
@@
granFetchAndReschedule regs node_reqd
where
liveness = mkRegLiveness regs 0 0
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
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)])
-- 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
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))])
-- Was : absC (CMacroStmt GRAN_YIELD
-- [mkIntCLit (I# (word2Int# liveness_mask))])