projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix to i386_insert_ffrees (#2724, #1944)
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
RegLiveness.hs
diff --git
a/compiler/nativeGen/RegLiveness.hs
b/compiler/nativeGen/RegLiveness.hs
index
dce5de4
..
039a5de
100644
(file)
--- a/
compiler/nativeGen/RegLiveness.hs
+++ b/
compiler/nativeGen/RegLiveness.hs
@@
-244,14
+244,14
@@
slurpConflicts live
, moves) lis
, moves) lis
--- | For spill/reloads
+-- | For spill\/reloads
--
-- SPILL v1, slot1
-- ...
-- RELOAD slot1, v2
--
-- If we can arrange that v1 and v2 are allocated to the same hreg it's more likely
--
-- SPILL v1, slot1
-- ...
-- RELOAD slot1, v2
--
-- If we can arrange that v1 and v2 are allocated to the same hreg it's more likely
--- the spill/reload instrs can be cleaned and replaced by a nop reg-reg move.
+-- the spill\/reload instrs can be cleaned and replaced by a nop reg-reg move.
--
--
slurpReloadCoalesce :: LiveCmmTop -> Bag (Reg, Reg)
--
--
slurpReloadCoalesce :: LiveCmmTop -> Bag (Reg, Reg)
@@
-502,7
+502,7
@@
regLiveness (CmmProc info lbl params (ListGraph blocks@(first : _)))
sccBlocks :: [NatBasicBlock] -> [SCC NatBasicBlock]
sccBlocks :: [NatBasicBlock] -> [SCC NatBasicBlock]
-sccBlocks blocks = stronglyConnComp graph
+sccBlocks blocks = stronglyConnCompFromEdgedVertices graph
where
getOutEdges :: [Instr] -> [BlockId]
getOutEdges instrs = foldl' (\a x -> jumpDests x a) [] instrs
where
getOutEdges :: [Instr] -> [BlockId]
getOutEdges instrs = foldl' (\a x -> jumpDests x a) [] instrs