X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAlloc%2FLinear%2FMain.hs;h=c83830199a1e016ca5a8a0feb5545f7d3661187e;hb=4fb7d5bac50c9fe5572dcb1ba4146e3c68cebadb;hp=46954cec7562c1ddffc8aee70255d5937371bda6;hpb=a842f3d5e7c9026a642589948ef67dbaf6272396;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs
index 46954ce..c838301 100644
--- a/compiler/nativeGen/RegAlloc/Linear/Main.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs
@@ -96,12 +96,14 @@ import RegAlloc.Linear.StackMap
 import RegAlloc.Linear.FreeRegs
 import RegAlloc.Linear.Stats
 import RegAlloc.Linear.JoinToTargets
+import RegAlloc.Liveness
+
+-- import PprMach
 
 import BlockId
-import MachRegs
-import MachInstrs
+import Regs
+import Instrs
 import RegAllocInfo
-import RegLiveness
 import Cmm hiding (RegSet)
 
 import Digraph
@@ -247,8 +249,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 +325,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)