X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FAsmCodeGen.lhs;h=e9db2bc26d300bf1380678e8c505c12059f9c50d;hb=2984649a87ffad1753be0c950ed18cfc40f55fea;hp=29f4be42fe22413a9293e3954cea9a4a91edd74f;hpb=176fa33f17dd78355cc572e006d2ab26898e2c69;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index 29f4be4..e9db2bc 100644
--- a/compiler/nativeGen/AsmCodeGen.lhs
+++ b/compiler/nativeGen/AsmCodeGen.lhs
@@ -27,11 +27,13 @@ import RegAllocInfo
 import NCGMonad
 import PositionIndependentCode
 import RegLiveness
-import RegCoalesce
-import qualified RegAllocLinear	as Linear
-import qualified RegAllocColor	as Color
-import qualified RegAllocStats	as Color
-import qualified GraphColor	as Color
+
+import qualified RegAlloc.Linear.Main	as Linear
+
+import qualified GraphColor			as Color
+import qualified RegAlloc.Graph.Main		as Color
+import qualified RegAlloc.Graph.Stats		as Color
+import qualified RegAlloc.Graph.Coalesce	as Color
 
 import Cmm
 import CmmOpt		( cmmMiniInline, cmmMachOpFold )
@@ -53,6 +55,7 @@ import Module
 
 import Digraph
 import qualified Pretty
+import BufWrite
 import Outputable
 import FastString
 import UniqSet
@@ -127,8 +130,12 @@ nativeCodeGen dflags h us cmms
  = do
 	let split_cmms	= concat $ map add_split cmms
 
- 	(imports, prof)
-		<- cmmNativeGens dflags h us split_cmms [] [] 0
+        -- BufHandle is a performance hack.  We could hide it inside
+        -- Pretty if it weren't for the fact that we do lots of little
+        -- printDocs here (in order to do codegen in constant space).
+        bufh <- newBufHandle h
+ 	(imports, prof) <- cmmNativeGens dflags bufh us split_cmms [] [] 0
+        bFlush bufh
 
 	let (native, colorStats, linearStats)
 		= unzip3 prof
@@ -186,7 +193,7 @@ cmmNativeGens dflags h us (cmm : cmms) impAcc profAcc count
  	(us', native, imports, colorStats, linearStats)
 		<- cmmNativeGen dflags us cmm count
 
-	Pretty.printDoc Pretty.LeftMode h
+	Pretty.bufLeftRender h
 		$ {-# SCC "pprNativeCode" #-} Pretty.vcat $ map pprNatCmmTop native
 
 	let lsPprNative =