From ee6bba6f3d80c56b47bc623bc6e4f076be1f046f Mon Sep 17 00:00:00 2001
From: "Ben.Lippmeier@anu.edu.au" <unknown>
Date: Wed, 4 Feb 2009 03:52:50 +0000
Subject: [PATCH] NCG: Move RegLiveness -> RegAlloc.Liveness

---
 compiler/ghc.cabal.in                                       |    2 +-
 compiler/nativeGen/AsmCodeGen.lhs                           |    2 +-
 compiler/nativeGen/RegAlloc/Graph/Coalesce.hs               |    2 +-
 compiler/nativeGen/RegAlloc/Graph/Main.hs                   |    2 +-
 compiler/nativeGen/RegAlloc/Graph/Spill.hs                  |    2 +-
 compiler/nativeGen/RegAlloc/Graph/SpillClean.hs             |    2 +-
 compiler/nativeGen/RegAlloc/Graph/SpillCost.hs              |    4 ++--
 compiler/nativeGen/RegAlloc/Graph/Stats.hs                  |    2 +-
 compiler/nativeGen/RegAlloc/Linear/Base.hs                  |    3 +--
 compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs         |    2 +-
 compiler/nativeGen/RegAlloc/Linear/Main.hs                  |    2 +-
 compiler/nativeGen/RegAlloc/Linear/State.hs                 |    2 +-
 compiler/nativeGen/RegAlloc/Linear/Stats.hs                 |    3 ++-
 compiler/nativeGen/{RegLiveness.hs => RegAlloc/Liveness.hs} |    2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)
 rename compiler/nativeGen/{RegLiveness.hs => RegAlloc/Liveness.hs} (99%)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 49569b3..a6a34a5 100644
--- a/compiler/ghc.cabal.in
+++ b/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
diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index b9ae956..ce411ed 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 6cea26a..18e4b0e 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 1f04d7f..fe99aba 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 886f9d4..b5a6451 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 ac46b99..b68648b 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 c897a4d..1d37cf7 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 36d507a..8082f9e 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 ebd3107..60d0175 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 5c63346..d9e3994 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 1d2c78b..ce28c4e 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 a7f49d1..94a8f7b 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 c139db7..95bf8ed 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
similarity index 99%
rename from compiler/nativeGen/RegLiveness.hs
rename to compiler/nativeGen/RegAlloc/Liveness.hs
index ea608bc..8445034 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,
-- 
1.7.10.4