NCG: Move RegLiveness -> RegAlloc.Liveness

compiler/ghc.cabal.in

@@ -469,8 +469,8 @@ Library
             NCGMonad
             PositionIndependentCode
             PprMach
-            RegLiveness
             RegAllocInfo
+            RegAlloc.Liveness
             RegAlloc.Graph.Main
             RegAlloc.Graph.Stats
             RegAlloc.Graph.ArchBase

compiler/nativeGen/AsmCodeGen.lhs

@@ -26,7 +26,7 @@ import PprMach
 import RegAllocInfo
 import NCGMonad
 import PositionIndependentCode
-import RegLiveness
+import RegAlloc.Liveness
 
 import qualified RegAlloc.Linear.Main	as Linear
 

compiler/nativeGen/RegAlloc/Graph/Coalesce.hs

@@ -10,7 +10,7 @@ where
 
 import Cmm
 import Regs
-import RegLiveness
+import RegAlloc.Liveness
 import RegAllocInfo
 
 import Bag

compiler/nativeGen/RegAlloc/Graph/Main.hs

@@ -12,7 +12,7 @@ module RegAlloc.Graph.Main (
 where
 
 import qualified GraphColor	as Color
-import RegLiveness
+import RegAlloc.Liveness
 import RegAlloc.Graph.Spill
 import RegAlloc.Graph.SpillClean
 import RegAlloc.Graph.SpillCost

compiler/nativeGen/RegAlloc/Graph/Spill.hs

@@ -9,7 +9,7 @@ module RegAlloc.Graph.Spill (
 
 where
 
-import RegLiveness
+import RegAlloc.Liveness
 import RegAllocInfo
 import Regs
 import Instrs

compiler/nativeGen/RegAlloc/Graph/SpillClean.hs

@@ -30,7 +30,7 @@ module RegAlloc.Graph.SpillClean (
 where
 
 import BlockId
-import RegLiveness
+import RegAlloc.Liveness
 import RegAllocInfo
 import Regs
 import Instrs

compiler/nativeGen/RegAlloc/Graph/SpillCost.hs

@@ -17,7 +17,7 @@ module RegAlloc.Graph.SpillCost (
 where
 
 import GraphBase
-import RegLiveness
+import RegAlloc.Liveness
 import RegAllocInfo
 import Instrs
 import Regs
@@ -83,7 +83,7 @@ slurpSpillCostInfo cmm
 		= countLIs rsLiveEntry instrs
 
 		| otherwise
-		= error "RegLiveness.slurpSpillCostInfo: bad block"
+		= error "RegAlloc.SpillCost.slurpSpillCostInfo: bad block"
 
 	countLIs _      []
 		= return ()

compiler/nativeGen/RegAlloc/Graph/Stats.hs

@@ -21,7 +21,7 @@ where
 #include "nativeGen/NCG.h"
 
 import qualified GraphColor as Color
-import RegLiveness
+import RegAlloc.Liveness
 import RegAllocInfo
 import RegAlloc.Graph.Spill
 import RegAlloc.Graph.SpillCost

compiler/nativeGen/RegAlloc/Linear/Base.hs

@@ -20,8 +20,7 @@ where
 
 import RegAlloc.Linear.FreeRegs
 import RegAlloc.Linear.StackMap
-
-import RegLiveness
+import RegAlloc.Liveness
 import Regs
 
 import Outputable

compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs

@@ -18,12 +18,12 @@ where
 import RegAlloc.Linear.State
 import RegAlloc.Linear.Base
 import RegAlloc.Linear.FreeRegs
+import RegAlloc.Liveness
 
 import BlockId
 import Instrs
 import Regs
 import RegAllocInfo
-import RegLiveness
 import Cmm	hiding (RegSet)
 
 import Digraph

compiler/nativeGen/RegAlloc/Linear/Main.hs

@@ -96,12 +96,12 @@ import RegAlloc.Linear.StackMap
 import RegAlloc.Linear.FreeRegs
 import RegAlloc.Linear.Stats
 import RegAlloc.Linear.JoinToTargets
+import RegAlloc.Liveness
 
 import BlockId
 import Regs
 import Instrs
 import RegAllocInfo
-import RegLiveness
 import Cmm hiding (RegSet)
 
 import Digraph

compiler/nativeGen/RegAlloc/Linear/State.hs

@@ -33,12 +33,12 @@ import RegAlloc.Linear.Stats
 import RegAlloc.Linear.StackMap
 import RegAlloc.Linear.Base
 import RegAlloc.Linear.FreeRegs
+import RegAlloc.Liveness
 
 
 import Instrs
 import Regs
 import RegAllocInfo
-import RegLiveness
 
 import Unique
 import UniqSupply

compiler/nativeGen/RegAlloc/Linear/Stats.hs

@@ -7,7 +7,8 @@ module RegAlloc.Linear.Stats (
 where
 
 import RegAlloc.Linear.Base
-import RegLiveness
+import RegAlloc.Liveness
+
 import RegAllocInfo
 import Instrs
 import Cmm		(GenBasicBlock(..))

compiler/nativeGen/RegLiveness.hs → compiler/nativeGen/RegAlloc/Liveness.hs

@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------------
 {-# OPTIONS -Wall -fno-warn-name-shadowing #-}
 
-module RegLiveness (
+module RegAlloc.Liveness (
 	RegSet,
 	RegMap, emptyRegMap,
 	BlockMap, emptyBlockMap,