NCG: Split RegAllocInfo into arch specific modules

[ghc-hetmet.git] / compiler / nativeGen / RegAlloc / Linear / Main.hs

diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs
index 46954ce..7f977d1 100644 (file)
--- 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 MachRegs
-import MachInstrs
+import Regs
+import Instrs
 import RegAllocInfo
-import RegLiveness
 import Cmm hiding (RegSet)
 
 import Digraph
@@ -247,8 +247,8 @@ linearRA
        -> BlockId                      -- ^ id of the current block, for debugging.
        -> [LiveInstr]                  -- ^ liveness annotated instructions in this block.
 
-       -> RegM ( [Instr]               -- ^ instructions after register allocation
-               , [NatBasicBlock])      -- ^ fresh blocks of fixup code.
+       -> RegM ( [Instr]               --   instructions after register allocation
+               , [NatBasicBlock])      --   fresh blocks of fixup code.
 
 
 linearRA _          accInstr accFixup _ []
@@ -323,7 +323,7 @@ raInsn block_live new_instrs id (Instr instr (Just live))
                        (uniqSetToList $ liveDieWrite live)
 
 
-raInsn _ _ id instr
+raInsn _ _ _ instr
        = pprPanic "raInsn" (text "no match for:" <> ppr instr)