X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FPprMach.hs;h=a2ae0e38eb21dc9525ec873d6bc5e363068e4931;hb=4839f119310cd82dec679239e0897e4a2a26ee92;hp=446495a5fe8be980e6b9a73b1d6104f0485e2420;hpb=27b81b461fbc754779b2c941b9e1b9e49d54211b;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index 446495a..a2ae0e3 100644
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -13,8 +13,8 @@
 #include "nativeGen/NCG.h"
 
 module PprMach ( 
-	pprNatCmmTop, pprBasicBlock,
-	pprInstr, pprSize, pprUserReg,
+	pprNatCmmTop, pprBasicBlock, pprSectionHeader, pprData,
+	pprInstr, pprSize, pprUserReg
   ) where
 
 
@@ -36,6 +36,7 @@ import Unique		( pprUnique )
 import Pretty
 import FastString
 import qualified Outputable
+import Outputable	( Outputable )
 
 import Data.Array.ST
 import Data.Word	( Word8 )
@@ -646,9 +647,9 @@ pprSectionHeader RelocatableReadOnlyData
 	 IF_ARCH_alpha(SLIT("\t.data\n\t.align 3")
 	,IF_ARCH_sparc(SLIT(".data\n\t.align 8") {-<8 will break double constants -}
 	,IF_ARCH_i386(IF_OS_darwin(SLIT(".const_data\n.align 2"),
-                                   SLIT(".section .rodata\n\t.align 4"))
+                                   SLIT(".section .data\n\t.align 4"))
 	,IF_ARCH_x86_64(IF_OS_darwin(SLIT(".const_data\n.align 3"),
-                                     SLIT(".section .rodata\n\t.align 8"))
+                                     SLIT(".section .data\n\t.align 8"))
         ,IF_ARCH_powerpc(IF_OS_darwin(SLIT(".const_data\n.align 2"),
                                       SLIT(".data\n\t.align 2"))
 	,)))))
@@ -692,8 +693,18 @@ pprGloblDecl lbl
 				    SLIT(".globl ")) <>
 		pprCLabel_asm lbl
 
+pprTypeAndSizeDecl :: CLabel -> Doc
+pprTypeAndSizeDecl lbl
+#if linux_TARGET_OS
+  | not (externallyVisibleCLabel lbl) = empty
+  | otherwise = ptext SLIT(".type ") <>
+		pprCLabel_asm lbl <> ptext SLIT(", @object")
+#else
+  = empty
+#endif
+
 pprLabel :: CLabel -> Doc
-pprLabel lbl = pprGloblDecl lbl $$ (pprCLabel_asm lbl <> char ':')
+pprLabel lbl = pprGloblDecl lbl $$ pprTypeAndSizeDecl lbl $$ (pprCLabel_asm lbl <> char ':')
 
 
 pprASCII str
@@ -770,7 +781,6 @@ pprDataItem lit
 	   | otherwise =
 		[ptext SLIT("\t.quad\t") <> pprImm imm]
 	   where
-		isRelativeReloc (CmmLabelOff _ _)       = True
 		isRelativeReloc (CmmLabelDiffOff _ _ _) = True
 		isRelativeReloc _ = False
 #endif
@@ -789,6 +799,9 @@ pprDataItem lit
 -- -----------------------------------------------------------------------------
 -- pprInstr: print an 'Instr'
 
+instance Outputable Instr where
+    ppr	 instr	= Outputable.docToSDoc $ pprInstr instr
+
 pprInstr :: Instr -> Doc
 
 --pprInstr (COMMENT s) = empty -- nuke 'em
@@ -816,6 +829,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"),
@@ -1198,7 +1227,8 @@ pprSizeRegRegReg name size reg1 reg2 reg3
 
 #if i386_TARGET_ARCH || x86_64_TARGET_ARCH
 
-pprInstr v@(MOV size s@(OpReg src) d@(OpReg dst)) -- hack
+{-									-- 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 */
@@ -1206,6 +1236,23 @@ pprInstr v@(MOV size s@(OpReg src) d@(OpReg dst)) -- hack
 #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
@@ -1768,6 +1815,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
@@ -2042,6 +2105,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"),