Adapt PArray instance generation to new scheme

[ghc-hetmet.git] / compiler / nativeGen / AsmCodeGen.lhs

diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index c606918..be64428 100644 (file)
--- a/compiler/nativeGen/AsmCodeGen.lhs
+++ b/compiler/nativeGen/AsmCodeGen.lhs
@@ -151,7 +151,7 @@ nativeCodeGen dflags cmms us
        (case catMaybes mLinearStats of
                []      -> return ()
                stats   -> dumpSDoc dflags Opt_D_dump_asm_stats "NCG stats"
-                               $ Linear.pprStats (concat stats))
+                               $ Linear.pprStats (concat native) (concat stats))
 
        return  $ makeAsmDoc (concat native) (concat imports)
 
@@ -227,14 +227,24 @@ cmmNativeGen dflags us cmm
                        Opt_D_dump_asm_coalesce "Reg-Reg moves coalesced"
                        (vcat $ map ppr coalesced)
 
+               -- if any of these dump flags are turned on we want to hang on to
+               --      intermediate structures in the allocator - otherwise ditch
+               --      them early so we don't end up creating space leaks.
+               let generateRegAllocStats = or
+                       [ dopt Opt_D_dump_asm_regalloc_stages dflags
+                       , dopt Opt_D_dump_asm_stats dflags
+                       , dopt Opt_D_dump_asm_conflicts dflags ]
+
                -- graph coloring register allocation
                let ((alloced, regAllocStats), usAlloc)
                        = initUs usCoalesce
                        $ Color.regAlloc
+                               generateRegAllocStats
                                alloc_regs
                                (mkUniqSet [0..maxSpillSlots])
                                coalesced
 
+               -- dump out what happened during register allocation
                dumpIfSet_dyn dflags
                        Opt_D_dump_asm_regalloc "Registers allocated"
                        (vcat $ map (docToSDoc . pprNatCmmTop) alloced)