From d06edb8e93d6d19bbd898e2b2e26755598bb11f3 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 13 Jun 2012 12:13:00 +0100 Subject: Remove PlatformOutputable We can now get the Platform from the DynFlags inside an SDoc, so we no longer need to pass the Platform in. --- compiler/nativeGen/RegAlloc/Graph/Main.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/nativeGen/RegAlloc/Graph/Main.hs') diff --git a/compiler/nativeGen/RegAlloc/Graph/Main.hs b/compiler/nativeGen/RegAlloc/Graph/Main.hs index 0a4dc49881..4e359a1c79 100644 --- a/compiler/nativeGen/RegAlloc/Graph/Main.hs +++ b/compiler/nativeGen/RegAlloc/Graph/Main.hs @@ -45,7 +45,7 @@ maxSpinCount = 10 -- | The top level of the graph coloring register allocator. regAlloc - :: (PlatformOutputable statics, PlatformOutputable instr, Instruction instr) + :: (Outputable statics, Outputable instr, Instruction instr) => DynFlags -> UniqFM (UniqSet RealReg) -- ^ the registers we can use for allocation -> UniqSet Int -- ^ the set of available spill slots. @@ -73,8 +73,8 @@ regAlloc dflags regsFree slotsFree code , reverse debug_codeGraphs ) regAlloc_spin :: (Instruction instr, - PlatformOutputable instr, - PlatformOutputable statics) + Outputable instr, + Outputable statics) => DynFlags -> Int -> Color.Triv VirtualReg RegClass RealReg @@ -329,7 +329,7 @@ graphAddCoalesce _ _ -- | Patch registers in code using the reg -> reg mapping in this graph. patchRegsFromGraph - :: (PlatformOutputable statics, PlatformOutputable instr, Instruction instr) + :: (Outputable statics, Outputable instr, Instruction instr) => Platform -> Color.Graph VirtualReg RegClass RealReg -> LiveCmmDecl statics instr -> LiveCmmDecl statics instr @@ -352,7 +352,7 @@ patchRegsFromGraph platform graph code | otherwise = pprPanic "patchRegsFromGraph: register mapping failed." ( text "There is no node in the graph for register " <> ppr reg - $$ pprPlatform platform code + $$ ppr code $$ Color.dotGraph (\_ -> text "white") (trivColorable platform -- cgit v1.2.1