X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAllocColor.hs;h=5ce2a6cb317c2357be145722dddf721288d9c012;hb=f2cd56cf9fc310c9b587ecb5dfaee4ad6b580355;hp=40e3bc38ff080265ab808235bc698d64c7862ad8;hpb=ab676aa34302b346cc05181100b46d8490023971;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAllocColor.hs b/compiler/nativeGen/RegAllocColor.hs
index 40e3bc3..5ce2a6c 100644
--- a/compiler/nativeGen/RegAllocColor.hs
+++ b/compiler/nativeGen/RegAllocColor.hs
@@ -63,7 +63,7 @@ regAlloc regsFree slotsFree code
 		<- regAlloc_spin 0 trivColorable regsFree slotsFree [] code
 	
 	return	( code_final
-		, debug_codeGraphs )
+		, reverse debug_codeGraphs )
 
 regAlloc_spin (spinCount :: Int) triv regsFree slotsFree debug_codeGraphs code 
  = do
@@ -84,6 +84,16 @@ regAlloc_spin (spinCount :: Int) triv regsFree slotsFree debug_codeGraphs code
 	let fmLife	= plusUFMs_C (\(r1, l1) (r2, l2) -> (r1, l1 + l2))
 			$ map lifetimeCount code
 
+	-- record startup state
+	let stat1	=
+		if spinCount == 0
+		 then	Just $ RegAllocStatsStart
+		 	{ raLiveCmm	= code
+			, raGraph	= graph
+			, raLifetimes	= fmLife }
+		 else	Nothing
+
+
 	-- the function to choose regs to leave uncolored
 	let spill	= chooseSpill_maxLife fmLife
 	
@@ -101,13 +111,11 @@ regAlloc_spin (spinCount :: Int) triv regsFree slotsFree debug_codeGraphs code
 		-- record what happened in this stage for debugging
 		let stat		=
 			RegAllocStatsColored
-			{ raLiveCmm	= code
-			, raGraph	= graph_colored
-			, raPatchedCmm	= code_patched
-			, raLifetimes	= fmLife }
+			{ raGraph	= graph_colored
+			, raPatchedCmm	= code_patched }
 
 		return	( code_nat
-			, debug_codeGraphs ++ [stat]
+			, maybeToList stat1 ++ [stat] ++ debug_codeGraphs
 			, graph_colored)
 
 	 else do
@@ -122,14 +130,14 @@ regAlloc_spin (spinCount :: Int) triv regsFree slotsFree debug_codeGraphs code
 		-- record what happened in this stage for debugging
 		let stat	=
 			RegAllocStatsSpill
-			{ raLiveCmm	= code_spilled
-			, raGraph	= graph_colored
+			{ raGraph	= graph_colored
 			, raSpillStats	= spillStats
-			, raLifetimes	= fmLife }
+			, raLifetimes	= fmLife
+			, raSpilled	= code_spilled }
 			    	
 		-- try again
 		regAlloc_spin (spinCount + 1) triv regsFree slotsFree' 
-			(debug_codeGraphs ++ [stat])
+			(maybeToList stat1 ++ [stat] ++ debug_codeGraphs)
 			code_relive