NCG: Refactor representation of code with liveness info

[ghc-hetmet.git] / compiler / nativeGen / RegAlloc / Graph / Stats.hs

diff --git a/compiler/nativeGen/RegAlloc/Graph/Stats.hs b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
index 339bd41..cdce1b6 100644 (file)
--- a/compiler/nativeGen/RegAlloc/Graph/Stats.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
@@ -258,15 +258,15 @@ countSRM_block (BasicBlock i instrs)
        return  $ BasicBlock i instrs'
 
 countSRM_instr li
-       | SPILL _ _     <- li
-       = do    modify  $ \(s, r, m)    -> (s + 1, r, m)
+       | LiveInstr SPILL{} _    <- li
+       = do    modify  $ \(s, r, m)    -> (s + 1, r, m)
                return li
 
-       | RELOAD _ _    <- li
-       = do    modify  $ \(s, r, m)    -> (s, r + 1, m)
+       | LiveInstr RELOAD{} _  <- li
+       = do    modify  $ \(s, r, m)    -> (s, r + 1, m)
                return li
-
-       | Instr instr _ <- li
+       
+       | LiveInstr instr _     <- li
        , Just _        <- takeRegRegMoveInstr instr
        = do    modify  $ \(s, r, m)    -> (s, r, m + 1)
                return li