NCG: Move RegLiveness -> RegAlloc.Liveness

13 files changed, 15 insertions, 15 deletions

diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index b9ae9567d3..ce411ed6fe 100644
--- a/compiler/nativeGen/AsmCodeGen.lhs
+++ b/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
 
diff --git a/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs b/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
index 6cea26a2bd..18e4b0edd1 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
@@ -10,7 +10,7 @@ where
 
 import Cmm
 import Regs
-import RegLiveness
+import RegAlloc.Liveness
 import RegAllocInfo
 
 import Bag
diff --git a/compiler/nativeGen/RegAlloc/Graph/Main.hs b/compiler/nativeGen/RegAlloc/Graph/Main.hs
index 1f04d7ff72..fe99aba120 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Main.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Graph/Spill.hs b/compiler/nativeGen/RegAlloc/Graph/Spill.hs
index 886f9d4254..b5a645188f 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Spill.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs b/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs
index ac46b99892..b68648bdaf 100644
--- a/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
index c897a4d724..1d37cf71d6 100644
--- a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
+++ b/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 ()
diff --git a/compiler/nativeGen/RegAlloc/Graph/Stats.hs b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
index 36d507ad28..8082f9e975 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Stats.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Linear/Base.hs b/compiler/nativeGen/RegAlloc/Linear/Base.hs
index ebd31076e3..60d0175c94 100644
--- a/compiler/nativeGen/RegAlloc/Linear/Base.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
index 5c6334685a..d9e3994b36 100644
--- a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs
index 1d2c78b25f..ce28c4e96e 100644
--- a/compiler/nativeGen/RegAlloc/Linear/Main.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Linear/State.hs b/compiler/nativeGen/RegAlloc/Linear/State.hs
index a7f49d12d5..94a8f7b52e 100644
--- a/compiler/nativeGen/RegAlloc/Linear/State.hs
+++ b/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
diff --git a/compiler/nativeGen/RegAlloc/Linear/Stats.hs b/compiler/nativeGen/RegAlloc/Linear/Stats.hs
index c139db731c..95bf8ede82 100644
--- a/compiler/nativeGen/RegAlloc/Linear/Stats.hs
+++ b/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(..))
diff --git a/compiler/nativeGen/RegLiveness.hs b/compiler/nativeGen/RegAlloc/Liveness.hs
index ea608bc280..8445034ab9 100644
--- a/compiler/nativeGen/RegLiveness.hs
+++ b/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,