projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
massive convulsion in ZipDataflow
[ghc-hetmet.git]
/
compiler
/
cmm
/
ZipCfgExtras.hs
diff --git
a/compiler/cmm/ZipCfgExtras.hs
b/compiler/cmm/ZipCfgExtras.hs
index
1cd2fa9
..
787a58a
100644
(file)
--- a/
compiler/cmm/ZipCfgExtras.hs
+++ b/
compiler/cmm/ZipCfgExtras.hs
@@
-16,8
+16,6
@@
import Maybes
import Panic
import ZipCfg
import Panic
import ZipCfg
-import UniqFM
-
import Prelude hiding (zip, unzip, last)
import Prelude hiding (zip, unzip, last)
@@
-31,12
+29,14
@@
unfocus :: FGraph m l -> LGraph m l -- lose focus
-- the current focus.
-- The new focus can be at either the entry edge or the exit edge.
-- the current focus.
-- The new focus can be at either the entry edge or the exit edge.
+{-
splice_focus_entry :: FGraph m l -> LGraph m l -> FGraph m l
splice_focus_exit :: FGraph m l -> LGraph m l -> FGraph m l
splice_focus_entry :: FGraph m l -> LGraph m l -> FGraph m l
splice_focus_exit :: FGraph m l -> LGraph m l -> FGraph m l
+-}
_unused :: ()
_unused = all `seq` ()
_unused :: ()
_unused = all `seq` ()
- where all = ( exit, focusp, unfocus, splice_focus_entry, splice_focus_exit
+ where all = ( exit, focusp, unfocus {- , splice_focus_entry, splice_focus_exit -}
, fold_fwd_block, foldM_fwd_block (\_ a -> Just a)
)
, fold_fwd_block, foldM_fwd_block (\_ a -> Just a)
)
@@
-49,13
+49,16
@@
exit g@(LGraph eid _) = FGraph eid (ZBlock h (ZLast l)) others
where FGraph _ b others = focusp is_exit g `orElse` panic "no exit in flow graph"
(h, l) = goto_end b
where FGraph _ b others = focusp is_exit g `orElse` panic "no exit in flow graph"
(h, l) = goto_end b
+
+{-
splice_focus_entry (FGraph eid (ZBlock head tail) blocks) g =
let (tail', g') = splice_tail g tail in
splice_focus_entry (FGraph eid (ZBlock head tail) blocks) g =
let (tail', g') = splice_tail g tail in
- FGraph eid (ZBlock head tail') (plusUFM (gr_blocks g') blocks)
+ FGraph eid (ZBlock head tail') (plusUFM (lg_blocks g') blocks)
splice_focus_exit (FGraph eid (ZBlock head tail) blocks) g =
let (g', head') = splice_head head g in
splice_focus_exit (FGraph eid (ZBlock head tail) blocks) g =
let (g', head') = splice_head head g in
- FGraph eid (ZBlock head' tail) (plusUFM (gr_blocks g') blocks)
+ FGraph eid (ZBlock head' tail) (plusUFM (lg_blocks g') blocks)
+-}
-- | Fold from first to last
fold_fwd_block ::
-- | Fold from first to last
fold_fwd_block ::