X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FAsmCodeGen.lhs;h=126d1b8abd439bf353f39f9e3617d9c4ad6f1325;hb=c2e459becafc3e80832eed152a1f9312a6d3580e;hp=507d96b0cb3082c922fda9d5900917a68ed5e39b;hpb=12d0b38821771fd9820d655ed73b29c688cb7b59;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index 507d96b..126d1b8 100644
--- a/compiler/nativeGen/AsmCodeGen.lhs
+++ b/compiler/nativeGen/AsmCodeGen.lhs
@@ -129,7 +129,7 @@ nativeCodeGen dflags h us cmms
 	let split_cmms	= concat $ map add_split cmms
 
  	(imports, prof)
-		<- cmmNativeGens dflags h us split_cmms [] []
+		<- cmmNativeGens dflags h us split_cmms [] [] 0
 
 	let (native, colorStats, linearStats)
 		= unzip3 prof
@@ -179,13 +179,13 @@ nativeCodeGen dflags h us cmms
 
 -- | Do native code generation on all these cmms.
 --
-cmmNativeGens dflags h us [] impAcc profAcc
+cmmNativeGens dflags h us [] impAcc profAcc count
 	= return (reverse impAcc, reverse profAcc)
 
-cmmNativeGens dflags h us (cmm : cmms) impAcc profAcc
+cmmNativeGens dflags h us (cmm : cmms) impAcc profAcc count
  = do
  	(us', native, imports, colorStats, linearStats)
-		<- cmmNativeGen dflags us cmm
+		<- cmmNativeGen dflags us cmm count
 
 	Pretty.printDoc Pretty.LeftMode h
 		$ {-# SCC "pprNativeCode" #-} Pretty.vcat $ map pprNatCmmTop native
@@ -196,13 +196,18 @@ cmmNativeGens dflags h us (cmm : cmms) impAcc profAcc
 			then native
 			else []
 
+	let count'	= count + 1;
+
+
 	-- force evaulation all this stuff to avoid space leaks
 	seqString (showSDoc $ vcat $ map ppr imports) `seq` return ()
 	lsPprNative 	`seq` return ()
+	count'		`seq` return ()
 
 	cmmNativeGens dflags h us' cmms
 			(imports : impAcc)
 			((lsPprNative, colorStats, linearStats) : profAcc)
+			count'
 
  where	seqString []		= ()
 	seqString (x:xs)	= x `seq` seqString xs `seq` ()
@@ -215,13 +220,14 @@ cmmNativeGen
 	:: DynFlags
 	-> UniqSupply
 	-> RawCmmTop				-- ^ the cmm to generate code for
+	-> Int					-- ^ sequence number of this top thing
 	-> IO	( UniqSupply
 		, [NatCmmTop]			-- native code
 		, [CLabel]			-- things imported by this cmm
 		, Maybe [Color.RegAllocStats]	-- stats for the coloring register allocator
 		, Maybe [Linear.RegAllocStats])	-- stats for the linear register allocators
 
-cmmNativeGen dflags us cmm
+cmmNativeGen dflags us cmm count
  = do
 
 	-- rewrite assignments to global regs
@@ -288,7 +294,8 @@ cmmNativeGen dflags us cmm
 		dumpIfSet_dyn dflags
 			Opt_D_dump_asm_regalloc_stages "Build/spill stages"
 			(vcat 	$ map (\(stage, stats)
-					-> text " Stage " <> int stage
+					-> text "# --------------------------"
+					$$ text "#  cmm " <> int count <> text " Stage " <> int stage
 					$$ ppr stats)
 				$ zip [0..] regAllocStats)
 
@@ -449,7 +456,7 @@ sequenceBlocks (entry:blocks) =
   -- the first block is the entry point ==> it must remain at the start.
 
 sccBlocks :: [NatBasicBlock] -> [SCC (NatBasicBlock,Unique,[Unique])]
-sccBlocks blocks = stronglyConnCompR (map mkNode blocks)
+sccBlocks blocks = stronglyConnCompFromEdgedVerticesR (map mkNode blocks)
 
 getOutEdges :: [Instr] -> [Unique]
 getOutEdges instrs = case jumpDests (last instrs) [] of
@@ -712,9 +719,9 @@ cmmStmtConFold stmt
 			        e' <- cmmExprConFold CallReference e
 			        return $ CmmCallee e' conv
 			      other -> return other
-                 args' <- mapM (\(arg, hint) -> do
+                 args' <- mapM (\(CmmKinded arg hint) -> do
                                   arg' <- cmmExprConFold DataReference arg
-                                  return (arg', hint)) args
+                                  return (CmmKinded arg' hint)) args
 	         return $ CmmCall target' regs args' srt returns
 
         CmmCondBranch test dest
@@ -767,11 +774,11 @@ cmmExprConFold referenceKind expr
         CmmReg (CmmGlobal GCEnter1)
           | not opt_PIC
           -> cmmExprConFold referenceKind $
-             CmmLit (CmmLabel (mkRtsCodeLabel SLIT( "__stg_gc_enter_1"))) 
+             CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_gc_enter_1"))) 
         CmmReg (CmmGlobal GCFun)
           | not opt_PIC
           -> cmmExprConFold referenceKind $
-             CmmLit (CmmLabel (mkRtsCodeLabel SLIT( "__stg_gc_fun")))
+             CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_gc_fun")))
 #endif
 
         CmmReg (CmmGlobal mid)