diff options
Diffstat (limited to 'compiler/GHC/CmmToAsm')
35 files changed, 77 insertions, 77 deletions
diff --git a/compiler/GHC/CmmToAsm/BlockLayout.hs b/compiler/GHC/CmmToAsm/BlockLayout.hs index 0665e71433..7ff90e8c40 100644 --- a/compiler/GHC/CmmToAsm/BlockLayout.hs +++ b/compiler/GHC/CmmToAsm/BlockLayout.hs @@ -27,9 +27,9 @@ import GHC.Cmm.Dataflow.Label import GHC.Platform import GHC.Driver.Session (gopt, GeneralFlag(..), DynFlags, targetPlatform) -import UniqFM +import GHC.Types.Unique.FM import Util -import Unique +import GHC.Types.Unique import Digraph import Outputable diff --git a/compiler/GHC/CmmToAsm/CFG.hs b/compiler/GHC/CmmToAsm/CFG.hs index 0995ecab61..dca02b0eb5 100644 --- a/compiler/GHC/CmmToAsm/CFG.hs +++ b/compiler/GHC/CmmToAsm/CFG.hs @@ -60,7 +60,7 @@ import Util import Digraph import Maybes -import Unique +import GHC.Types.Unique import qualified GHC.CmmToAsm.CFG.Dominators as Dom import Data.IntMap.Strict (IntMap) import Data.IntSet (IntSet) diff --git a/compiler/GHC/CmmToAsm/Dwarf.hs b/compiler/GHC/CmmToAsm/Dwarf.hs index 9270a308a8..8075bdd27e 100644 --- a/compiler/GHC/CmmToAsm/Dwarf.hs +++ b/compiler/GHC/CmmToAsm/Dwarf.hs @@ -10,11 +10,11 @@ import Config ( cProjectName, cProjectVersion ) import GHC.Core ( Tickish(..) ) import GHC.Cmm.DebugBlock import GHC.Driver.Session -import Module +import GHC.Types.Module import Outputable import GHC.Platform -import Unique -import UniqSupply +import GHC.Types.Unique +import GHC.Types.Unique.Supply import GHC.CmmToAsm.Dwarf.Constants import GHC.CmmToAsm.Dwarf.Types diff --git a/compiler/GHC/CmmToAsm/Dwarf/Types.hs b/compiler/GHC/CmmToAsm/Dwarf/Types.hs index c54815aff7..eaeb570595 100644 --- a/compiler/GHC/CmmToAsm/Dwarf/Types.hs +++ b/compiler/GHC/CmmToAsm/Dwarf/Types.hs @@ -31,9 +31,9 @@ import Encoding import FastString import Outputable import GHC.Platform -import Unique +import GHC.Types.Unique import GHC.Platform.Reg -import SrcLoc +import GHC.Types.SrcLoc import Util import GHC.CmmToAsm.Dwarf.Constants diff --git a/compiler/GHC/CmmToAsm/Monad.hs b/compiler/GHC/CmmToAsm/Monad.hs index 89e64d5e79..f6e5515705 100644 --- a/compiler/GHC/CmmToAsm/Monad.hs +++ b/compiler/GHC/CmmToAsm/Monad.hs @@ -60,11 +60,11 @@ import GHC.Cmm.Dataflow.Label import GHC.Cmm.CLabel ( CLabel ) import GHC.Cmm.DebugBlock import FastString ( FastString ) -import UniqFM -import UniqSupply -import Unique ( Unique ) +import GHC.Types.Unique.FM +import GHC.Types.Unique.Supply +import GHC.Types.Unique ( Unique ) import GHC.Driver.Session -import Module +import GHC.Types.Module import Control.Monad ( ap ) diff --git a/compiler/GHC/CmmToAsm/PIC.hs b/compiler/GHC/CmmToAsm/PIC.hs index a9668133fc..cb7d82a6c5 100644 --- a/compiler/GHC/CmmToAsm/PIC.hs +++ b/compiler/GHC/CmmToAsm/PIC.hs @@ -70,8 +70,8 @@ import GHC.Cmm.CLabel ( CLabel, ForeignLabelSource(..), pprCLabel, import GHC.Cmm.CLabel ( mkForeignLabel ) -import BasicTypes -import Module +import GHC.Types.Basic +import GHC.Types.Module import Outputable diff --git a/compiler/GHC/CmmToAsm/PPC/CodeGen.hs b/compiler/GHC/CmmToAsm/PPC/CodeGen.hs index d597051b54..e5177b80b3 100644 --- a/compiler/GHC/CmmToAsm/PPC/CodeGen.hs +++ b/compiler/GHC/CmmToAsm/PPC/CodeGen.hs @@ -63,7 +63,7 @@ import Control.Monad ( mapAndUnzipM, when ) import Data.Bits import Data.Word -import BasicTypes +import GHC.Types.Basic import FastString import Util diff --git a/compiler/GHC/CmmToAsm/PPC/Instr.hs b/compiler/GHC/CmmToAsm/PPC/Instr.hs index 26742b5a17..e622d801a8 100644 --- a/compiler/GHC/CmmToAsm/PPC/Instr.hs +++ b/compiler/GHC/CmmToAsm/PPC/Instr.hs @@ -45,8 +45,8 @@ import FastString import GHC.Cmm.CLabel import Outputable import GHC.Platform -import UniqFM (listToUFM, lookupUFM) -import UniqSupply +import GHC.Types.Unique.FM (listToUFM, lookupUFM) +import GHC.Types.Unique.Supply import Control.Monad (replicateM) import Data.Maybe (fromMaybe) diff --git a/compiler/GHC/CmmToAsm/PPC/Ppr.hs b/compiler/GHC/CmmToAsm/PPC/Ppr.hs index a66d1c2f99..90b85023a2 100644 --- a/compiler/GHC/CmmToAsm/PPC/Ppr.hs +++ b/compiler/GHC/CmmToAsm/PPC/Ppr.hs @@ -30,7 +30,7 @@ import GHC.Cmm.BlockId import GHC.Cmm.CLabel import GHC.Cmm.Ppr.Expr () -- For Outputable instances -import Unique ( pprUniqueAlways, getUnique ) +import GHC.Types.Unique ( pprUniqueAlways, getUnique ) import GHC.Platform import FastString import Outputable diff --git a/compiler/GHC/CmmToAsm/PPC/RegInfo.hs b/compiler/GHC/CmmToAsm/PPC/RegInfo.hs index a75040d703..5a48ed28e0 100644 --- a/compiler/GHC/CmmToAsm/PPC/RegInfo.hs +++ b/compiler/GHC/CmmToAsm/PPC/RegInfo.hs @@ -27,7 +27,7 @@ import GHC.Cmm.BlockId import GHC.Cmm import GHC.Cmm.CLabel -import Unique +import GHC.Types.Unique import Outputable (ppr, text, Outputable, (<>)) data JumpDest = DestBlockId BlockId diff --git a/compiler/GHC/CmmToAsm/PPC/Regs.hs b/compiler/GHC/CmmToAsm/PPC/Regs.hs index 90f8a62ab7..86675daf5f 100644 --- a/compiler/GHC/CmmToAsm/PPC/Regs.hs +++ b/compiler/GHC/CmmToAsm/PPC/Regs.hs @@ -57,7 +57,7 @@ import GHC.CmmToAsm.Format import GHC.Cmm import GHC.Cmm.CLabel ( CLabel ) -import Unique +import GHC.Types.Unique import GHC.Platform.Regs import Outputable diff --git a/compiler/GHC/CmmToAsm/Reg/Graph.hs b/compiler/GHC/CmmToAsm/Reg/Graph.hs index 7f0cacfcb4..443072b246 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph.hs @@ -23,9 +23,9 @@ import GHC.Platform.Reg import Bag import Outputable import GHC.Platform -import UniqFM -import UniqSet -import UniqSupply +import GHC.Types.Unique.FM +import GHC.Types.Unique.Set +import GHC.Types.Unique.Supply import Util (seqList) import GHC.CmmToAsm.CFG diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs index 95fa174415..ba3f825149 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs @@ -24,9 +24,9 @@ module GHC.CmmToAsm.Reg.Graph.Base ( import GhcPrelude -import UniqSet -import UniqFM -import Unique +import GHC.Types.Unique.Set +import GHC.Types.Unique.FM +import GHC.Types.Unique import MonadUtils (concatMapM) diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs index d223137dd0..dd28981261 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs @@ -12,9 +12,9 @@ import GHC.Platform.Reg import GHC.Cmm import Bag import Digraph -import UniqFM -import UniqSet -import UniqSupply +import GHC.Types.Unique.FM +import GHC.Types.Unique.Set +import GHC.Types.Unique.Supply -- | Do register coalescing on this top level thing diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs index a0e11433f7..5ae55334a2 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs @@ -18,10 +18,10 @@ import GHC.Cmm.Dataflow.Collections import MonadUtils import State -import Unique -import UniqFM -import UniqSet -import UniqSupply +import GHC.Types.Unique +import GHC.Types.Unique.FM +import GHC.Types.Unique.Set +import GHC.Types.Unique.Supply import Outputable import GHC.Platform diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs b/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs index 6d14c7194b..ac784582e7 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs @@ -37,9 +37,9 @@ import GHC.Platform.Reg import GHC.Cmm.BlockId import GHC.Cmm -import UniqSet -import UniqFM -import Unique +import GHC.Types.Unique.Set +import GHC.Types.Unique.FM +import GHC.Types.Unique import State import Outputable import GHC.Platform diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs b/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs index e3e456e98d..6484a38d79 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs @@ -25,8 +25,8 @@ import GraphBase import GHC.Cmm.Dataflow.Collections (mapLookup) import GHC.Cmm.Dataflow.Label import GHC.Cmm -import UniqFM -import UniqSet +import GHC.Types.Unique.FM +import GHC.Types.Unique.Set import Digraph (flattenSCCs) import Outputable import GHC.Platform diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs index 2285d3e908..a06a22fa05 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs @@ -30,8 +30,8 @@ import GHC.CmmToAsm.Reg.Target import GHC.Platform import Outputable -import UniqFM -import UniqSet +import GHC.Types.Unique.FM +import GHC.Types.Unique.Set import State -- | Holds interesting statistics from the register allocator. diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs b/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs index ec7c5ad13e..4cf3d98eb1 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs @@ -15,7 +15,7 @@ import GHC.Platform.Reg import GraphBase -import UniqSet +import GHC.Types.Unique.Set import GHC.Platform import Panic diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs b/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs index 0d4c56ba21..c673c69c1d 100644 --- a/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs +++ b/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs @@ -18,7 +18,7 @@ module GHC.CmmToAsm.Reg.Graph.X86 ( import GhcPrelude import GHC.CmmToAsm.Reg.Graph.Base (Reg(..), RegSub(..), RegClass(..)) -import UniqSet +import GHC.Types.Unique.Set import qualified Data.Array as A diff --git a/compiler/GHC/CmmToAsm/Reg/Linear.hs b/compiler/GHC/CmmToAsm/Reg/Linear.hs index 155d67c2c2..a093bad83a 100644 --- a/compiler/GHC/CmmToAsm/Reg/Linear.hs +++ b/compiler/GHC/CmmToAsm/Reg/Linear.hs @@ -127,10 +127,10 @@ import GHC.Cmm.Dataflow.Collections import GHC.Cmm hiding (RegSet) import Digraph -import Unique -import UniqSet -import UniqFM -import UniqSupply +import GHC.Types.Unique +import GHC.Types.Unique.Set +import GHC.Types.Unique.FM +import GHC.Types.Unique.Supply import Outputable import GHC.Platform diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs b/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs index 92b3ee19a3..95036adb26 100644 --- a/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs +++ b/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs @@ -25,9 +25,9 @@ import GHC.CmmToAsm.Config import GHC.Platform.Reg import Outputable -import Unique -import UniqFM -import UniqSupply +import GHC.Types.Unique +import GHC.Types.Unique.FM +import GHC.Types.Unique.Supply import GHC.Cmm.BlockId diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs b/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs index 0874cd0dbf..55735913d4 100644 --- a/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs +++ b/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs @@ -24,9 +24,9 @@ import GHC.Cmm.BlockId import GHC.Cmm.Dataflow.Collections import Digraph import Outputable -import Unique -import UniqFM -import UniqSet +import GHC.Types.Unique +import GHC.Types.Unique.FM +import GHC.Types.Unique.Set -- | For a jump instruction at the end of a block, generate fixup code so its -- vregs are in the correct regs for its destination. diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs b/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs index 00fcfd91c8..c2477fc18f 100644 --- a/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs +++ b/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs @@ -22,8 +22,8 @@ where import GhcPrelude -import UniqFM -import Unique +import GHC.Types.Unique.FM +import GHC.Types.Unique -- | Identifier for a stack slot. diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/State.hs b/compiler/GHC/CmmToAsm/Reg/Linear/State.hs index 5a1e3a4c3f..cf8913e211 100644 --- a/compiler/GHC/CmmToAsm/Reg/Linear/State.hs +++ b/compiler/GHC/CmmToAsm/Reg/Linear/State.hs @@ -50,8 +50,8 @@ import GHC.Platform.Reg import GHC.Cmm.BlockId import GHC.Platform -import Unique -import UniqSupply +import GHC.Types.Unique +import GHC.Types.Unique.Supply import Control.Monad (ap) diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs b/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs index 1176b220a3..84acc3a417 100644 --- a/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs +++ b/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs @@ -12,7 +12,7 @@ import GHC.CmmToAsm.Reg.Linear.Base import GHC.CmmToAsm.Reg.Liveness import GHC.CmmToAsm.Instr -import UniqFM +import GHC.Types.Unique.FM import Outputable import State diff --git a/compiler/GHC/CmmToAsm/Reg/Liveness.hs b/compiler/GHC/CmmToAsm/Reg/Liveness.hs index d1c4c8f498..5f5d4c8ff3 100644 --- a/compiler/GHC/CmmToAsm/Reg/Liveness.hs +++ b/compiler/GHC/CmmToAsm/Reg/Liveness.hs @@ -53,9 +53,9 @@ import Digraph import MonadUtils import Outputable import GHC.Platform -import UniqSet -import UniqFM -import UniqSupply +import GHC.Types.Unique.Set +import GHC.Types.Unique.FM +import GHC.Types.Unique.Supply import Bag import State diff --git a/compiler/GHC/CmmToAsm/Reg/Target.hs b/compiler/GHC/CmmToAsm/Reg/Target.hs index a45d70c826..183d329790 100644 --- a/compiler/GHC/CmmToAsm/Reg/Target.hs +++ b/compiler/GHC/CmmToAsm/Reg/Target.hs @@ -28,7 +28,7 @@ import GHC.Platform.Reg.Class import GHC.CmmToAsm.Format import Outputable -import Unique +import GHC.Types.Unique import GHC.Platform import qualified GHC.CmmToAsm.X86.Regs as X86 diff --git a/compiler/GHC/CmmToAsm/SPARC/CodeGen.hs b/compiler/GHC/CmmToAsm/SPARC/CodeGen.hs index 67177ea0c6..ec7d59fe02 100644 --- a/compiler/GHC/CmmToAsm/SPARC/CodeGen.hs +++ b/compiler/GHC/CmmToAsm/SPARC/CodeGen.hs @@ -52,7 +52,7 @@ import GHC.Cmm.CLabel import GHC.CmmToAsm.CPrim -- The rest: -import BasicTypes +import GHC.Types.Basic import GHC.Driver.Session import FastString import OrdList diff --git a/compiler/GHC/CmmToAsm/SPARC/Ppr.hs b/compiler/GHC/CmmToAsm/SPARC/Ppr.hs index 566b23c1d6..a65ac03458 100644 --- a/compiler/GHC/CmmToAsm/SPARC/Ppr.hs +++ b/compiler/GHC/CmmToAsm/SPARC/Ppr.hs @@ -45,7 +45,7 @@ import GHC.Cmm.CLabel import GHC.Cmm.Dataflow.Label import GHC.Cmm.Dataflow.Collections -import Unique ( pprUniqueAlways ) +import GHC.Types.Unique ( pprUniqueAlways ) import Outputable import GHC.Platform import FastString diff --git a/compiler/GHC/CmmToAsm/SPARC/Regs.hs b/compiler/GHC/CmmToAsm/SPARC/Regs.hs index ba22470912..d6d5d87bf6 100644 --- a/compiler/GHC/CmmToAsm/SPARC/Regs.hs +++ b/compiler/GHC/CmmToAsm/SPARC/Regs.hs @@ -39,7 +39,7 @@ import GHC.Platform.Reg import GHC.Platform.Reg.Class import GHC.CmmToAsm.Format -import Unique +import GHC.Types.Unique import Outputable {- diff --git a/compiler/GHC/CmmToAsm/X86/CodeGen.hs b/compiler/GHC/CmmToAsm/X86/CodeGen.hs index deabf01425..1a22fc27f0 100644 --- a/compiler/GHC/CmmToAsm/X86/CodeGen.hs +++ b/compiler/GHC/CmmToAsm/X86/CodeGen.hs @@ -65,9 +65,9 @@ import GHC.Platform.Reg import GHC.Platform -- Our intermediate code: -import BasicTypes +import GHC.Types.Basic import GHC.Cmm.BlockId -import Module ( primUnitId ) +import GHC.Types.Module ( primUnitId ) import GHC.Cmm.Utils import GHC.Cmm.Switch import GHC.Cmm @@ -77,16 +77,16 @@ import GHC.Cmm.Dataflow.Graph import GHC.Cmm.Dataflow.Label import GHC.Cmm.CLabel import GHC.Core ( Tickish(..) ) -import SrcLoc ( srcSpanFile, srcSpanStartLine, srcSpanStartCol ) +import GHC.Types.SrcLoc ( srcSpanFile, srcSpanStartLine, srcSpanStartCol ) -- The rest: -import ForeignCall ( CCallConv(..) ) +import GHC.Types.ForeignCall ( CCallConv(..) ) import OrdList import Outputable import FastString import GHC.Driver.Session import Util -import UniqSupply ( getUniqueM ) +import GHC.Types.Unique.Supply ( getUniqueM ) import Control.Monad import Data.Bits diff --git a/compiler/GHC/CmmToAsm/X86/Instr.hs b/compiler/GHC/CmmToAsm/X86/Instr.hs index 71ee322516..846ef9b72f 100644 --- a/compiler/GHC/CmmToAsm/X86/Instr.hs +++ b/compiler/GHC/CmmToAsm/X86/Instr.hs @@ -38,11 +38,11 @@ import FastString import Outputable import GHC.Platform -import BasicTypes (Alignment) +import GHC.Types.Basic (Alignment) import GHC.Cmm.CLabel -import UniqSet -import Unique -import UniqSupply +import GHC.Types.Unique.Set +import GHC.Types.Unique +import GHC.Types.Unique.Supply import GHC.Cmm.DebugBlock (UnwindTable) import Control.Monad diff --git a/compiler/GHC/CmmToAsm/X86/Ppr.hs b/compiler/GHC/CmmToAsm/X86/Ppr.hs index 0dfd394d8e..357e24a9cc 100644 --- a/compiler/GHC/CmmToAsm/X86/Ppr.hs +++ b/compiler/GHC/CmmToAsm/X86/Ppr.hs @@ -36,12 +36,12 @@ import GHC.CmmToAsm.Ppr import GHC.Cmm.Dataflow.Collections import GHC.Cmm.Dataflow.Label -import BasicTypes (Alignment, mkAlignment, alignmentBytes) +import GHC.Types.Basic (Alignment, mkAlignment, alignmentBytes) import GHC.Driver.Session import GHC.Cmm hiding (topInfoTable) import GHC.Cmm.BlockId import GHC.Cmm.CLabel -import Unique ( pprUniqueAlways ) +import GHC.Types.Unique ( pprUniqueAlways ) import GHC.Platform import FastString import Outputable diff --git a/compiler/GHC/CmmToAsm/X86/RegInfo.hs b/compiler/GHC/CmmToAsm/X86/RegInfo.hs index 597efe1c3e..5b2464c415 100644 --- a/compiler/GHC/CmmToAsm/X86/RegInfo.hs +++ b/compiler/GHC/CmmToAsm/X86/RegInfo.hs @@ -15,9 +15,9 @@ import GHC.Platform.Reg import Outputable import GHC.Platform -import Unique +import GHC.Types.Unique -import UniqFM +import GHC.Types.Unique.FM import GHC.CmmToAsm.X86.Regs |