X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FPprMach.hs;h=51159559edaa298848516776933f3d9fa2ba035a;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hp=6a7226588e6633d9d4fe0b6e06e7bd38d68d2913;hpb=0f7d268d00795a58a06ae3c92ebbd14571295b84;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index 6a72265..5115955 100644
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -----------------------------------------------------------------------------
 --
 -- Pretty-printing assembly language
@@ -61,27 +68,23 @@ pprNatCmmTop (CmmData section dats) =
   pprSectionHeader section $$ vcat (map pprData dats)
 
  -- special case for split markers:
-pprNatCmmTop (CmmProc [] lbl _ []) = pprLabel lbl
+pprNatCmmTop (CmmProc [] lbl _ (ListGraph [])) = pprLabel lbl
 
-pprNatCmmTop (CmmProc info lbl params blocks) = 
+pprNatCmmTop (CmmProc info lbl params (ListGraph blocks)) = 
   pprSectionHeader Text $$
-  (if not (null info)
-	then
+  (if null info then -- blocks guaranteed not null, so label needed
+       pprLabel lbl
+   else
 #if HAVE_SUBSECTIONS_VIA_SYMBOLS
             pprCLabel_asm (mkDeadStripPreventer $ entryLblToInfoLbl lbl)
                 <> char ':' $$
 #endif
-            vcat (map pprData info) $$
-            pprLabel (entryLblToInfoLbl lbl)
-	else empty) $$
-  (case blocks of
-	[] -> empty
-	(BasicBlock _ instrs : rest) -> 
-		(if null info then pprLabel lbl else empty) $$
-		-- the first block doesn't get a label:
-		vcat (map pprInstr instrs) $$
-		vcat (map pprBasicBlock rest)
-  )
+       vcat (map pprData info) $$
+       pprLabel (entryLblToInfoLbl lbl)
+  ) $$
+  vcat (map pprBasicBlock blocks)
+     -- ^ Even the first block gets a label, because with branch-chain
+     -- elimination, it might be the target of a goto.
 #if HAVE_SUBSECTIONS_VIA_SYMBOLS
         -- If we are using the .subsections_via_symbols directive
         -- (available on recent versions of Darwin),
@@ -829,6 +832,22 @@ pprInstr (LDATA _ _)
 
 #if alpha_TARGET_ARCH
 
+pprInstr (SPILL reg slot)
+   = hcat [
+   	ptext SLIT("\tSPILL"),
+	char '\t',
+	pprReg reg,
+	comma,
+	ptext SLIT("SLOT") <> parens (int slot)]
+
+pprInstr (RELOAD slot reg)
+   = hcat [
+   	ptext SLIT("\tRELOAD"),
+	char '\t',
+	ptext SLIT("SLOT") <> parens (int slot),
+	comma,
+	pprReg reg]
+
 pprInstr (LD size reg addr)
   = hcat [
 	ptext SLIT("\tld"),
@@ -1211,16 +1230,21 @@ pprSizeRegRegReg name size reg1 reg2 reg3
 
 #if i386_TARGET_ARCH || x86_64_TARGET_ARCH
 
-{-									-- BUGS: changed for coloring allocator
-pprInstr v@(MOV size s@(OpReg src) d@(OpReg dst)) -- hack		-- write a pass for this and patch linear allocator with it
-  | src == dst
-  =
-#if 0 /* #ifdef DEBUG */
-    (<>) (ptext SLIT("# warning: ")) (pprSizeOpOp SLIT("mov") size s d)
-#else
-    empty
-#endif
--}
+pprInstr (SPILL reg slot)
+   = hcat [
+   	ptext SLIT("\tSPILL"),
+	char ' ',
+	pprUserReg reg,
+	comma,
+	ptext SLIT("SLOT") <> parens (int slot)]
+
+pprInstr (RELOAD slot reg)
+   = hcat [
+   	ptext SLIT("\tRELOAD"),
+	char ' ',
+	ptext SLIT("SLOT") <> parens (int slot),
+	comma,
+	pprUserReg reg]
 
 pprInstr (MOV size src dst)
   = pprSizeOpOp SLIT("mov") size src dst
@@ -1783,6 +1807,22 @@ pprCondInstr name cond arg
 -- reads (bytearrays).
 --
 
+pprInstr (SPILL reg slot)
+   = hcat [
+   	ptext SLIT("\tSPILL"),
+	char '\t',
+	pprReg reg,
+	comma,
+	ptext SLIT("SLOT") <> parens (int slot)]
+
+pprInstr (RELOAD slot reg)
+   = hcat [
+   	ptext SLIT("\tRELOAD"),
+	char '\t',
+	ptext SLIT("SLOT") <> parens (int slot),
+	comma,
+	pprReg reg]
+
 -- Translate to the following:
 --    add g1,g2,g1
 --    ld  [g1],%fn
@@ -2057,6 +2097,23 @@ pp_comma_a	  = text ",a"
 -- pprInstr for PowerPC
 
 #if powerpc_TARGET_ARCH
+
+pprInstr (SPILL reg slot)
+   = hcat [
+   	ptext SLIT("\tSPILL"),
+	char '\t',
+	pprReg reg,
+	comma,
+	ptext SLIT("SLOT") <> parens (int slot)]
+
+pprInstr (RELOAD slot reg)
+   = hcat [
+   	ptext SLIT("\tRELOAD"),
+	char '\t',
+	ptext SLIT("SLOT") <> parens (int slot),
+	comma,
+	pprReg reg]
+
 pprInstr (LD sz reg addr) = hcat [
 	char '\t',
 	ptext SLIT("l"),