X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FPprMach.hs;h=8fc9e3dc46bedf0effa6f3b1e02bb93e58eef4bd;hb=c0ea29afb7fcc3e8a69df60704d170d2c45e3d90;hp=eb373fe98ce7080ff09f1f83a03f1500055b0428;hpb=8db404018f101a182c92cc724a8de08cf5ab10ba;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index eb373fe..8fc9e3d 100644
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -21,7 +21,7 @@
 
 module PprMach ( 
 	pprNatCmmTop, pprBasicBlock, pprSectionHeader, pprData,
-	pprInstr, pprSize, pprUserReg
+	pprInstr, pprSize, pprUserReg, pprImm
   ) where
 
 #include "HsVersions.h"
@@ -395,18 +395,21 @@ pprSize x = ptext (case x of
 	FF64  -> sLit "sd"	-- "scalar double-precision float" (SSE2)
 #endif
 #if sparc_TARGET_ARCH
-	II8   -> sLit "sb"
-        II16  -> sLit "sh"
+	II8   -> sLit "ub"
+        II16  -> sLit "uh"
 	II32  -> sLit ""
 	II64  -> sLit "d"
 	FF32  -> sLit ""
 	FF64  -> sLit "d"
     )
+
+-- suffix to store/ ST instruction
 pprStSize :: Size -> Doc
 pprStSize x = ptext (case x of
 	II8   -> sLit "b"
 	II16  -> sLit "h"
 	II32  -> sLit ""
+	II64  -> sLit "x"
 	FF32  -> sLit ""
 	FF64  -> sLit "d"
 #endif
@@ -482,14 +485,14 @@ pprImm (ImmFloat _)  = ptext (sLit "naughty float immediate")
 pprImm (ImmDouble _) = ptext (sLit "naughty double immediate")
 
 pprImm (ImmConstantSum a b) = pprImm a <> char '+' <> pprImm b
-#if sparc_TARGET_ARCH
+-- #if sparc_TARGET_ARCH
 -- ToDo: This should really be fixed in the PIC support, but only
 -- print a for now.
-pprImm (ImmConstantDiff a b) = pprImm a 
-#else
+-- pprImm (ImmConstantDiff a b) = pprImm a 
+-- #else
 pprImm (ImmConstantDiff a b) = pprImm a <> char '-'
                             <> lparen <> pprImm b <> rparen
-#endif
+-- #endif
 
 #if sparc_TARGET_ARCH
 pprImm (LO i)
@@ -640,7 +643,7 @@ pprSectionHeader Data
 pprSectionHeader ReadOnlyData
     = ptext
 	 (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_sparc(sLit ".text\n\t.align 8" {-<8 will break double constants -}
 	,IF_ARCH_i386(IF_OS_darwin(sLit ".const\n.align 2",
                                    sLit ".section .rodata\n\t.align 4")
 	,IF_ARCH_x86_64(IF_OS_darwin(sLit ".const\n.align 3",
@@ -651,7 +654,7 @@ pprSectionHeader ReadOnlyData
 pprSectionHeader RelocatableReadOnlyData
     = ptext
 	 (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_sparc(sLit ".text\n\t.align 8" {-<8 will break double constants -}
 	,IF_ARCH_i386(IF_OS_darwin(sLit ".const_data\n.align 2",
                                    sLit ".section .data\n\t.align 4")
 	,IF_ARCH_x86_64(IF_OS_darwin(sLit ".const_data\n.align 3",
@@ -689,7 +692,7 @@ pprData :: CmmStatic -> Doc
 pprData (CmmAlign bytes)         = pprAlign bytes
 pprData (CmmDataLabel lbl)       = pprLabel lbl
 pprData (CmmString str)          = pprASCII str
-pprData (CmmUninitialised bytes) = ptext (sLit ".space ") <> int bytes
+pprData (CmmUninitialised bytes) = ptext (sLit ".skip ") <> int bytes
 pprData (CmmStaticLit lit)       = pprDataItem lit
 
 pprGloblDecl :: CLabel -> Doc
@@ -2002,9 +2005,19 @@ pprInstr (SLL reg1 ri reg2) = pprRegRIReg (sLit "sll") False reg1 ri reg2
 pprInstr (SRL reg1 ri reg2) = pprRegRIReg (sLit "srl") False reg1 ri reg2
 pprInstr (SRA reg1 ri reg2) = pprRegRIReg (sLit "sra") False reg1 ri reg2
 
-pprInstr (RDY rd) = ptext (sLit "\trd\t%y,") <> pprReg rd
-pprInstr (SMUL b reg1 ri reg2) = pprRegRIReg (sLit "smul")  b reg1 ri reg2
-pprInstr (UMUL b reg1 ri reg2) = pprRegRIReg (sLit "umul")  b reg1 ri reg2
+pprInstr (RDY rd) 		= ptext (sLit "\trd\t%y,") <> pprReg rd
+pprInstr (WRY reg1 reg2) 	
+	= ptext (sLit "\twr\t") 
+		<> pprReg reg1 
+		<> char ','
+		<> pprReg reg2
+		<> char ','
+		<> ptext (sLit "%y") 
+
+pprInstr (SMUL b reg1 ri reg2)	= pprRegRIReg (sLit "smul")  b reg1 ri reg2
+pprInstr (UMUL b reg1 ri reg2)	= pprRegRIReg (sLit "umul")  b reg1 ri reg2
+pprInstr (SDIV b reg1 ri reg2)	= pprRegRIReg (sLit "sdiv")  b reg1 ri reg2
+pprInstr (UDIV b reg1 ri reg2)	= pprRegRIReg (sLit "udiv")  b reg1 ri reg2
 
 pprInstr (SETHI imm reg)
   = hcat [
@@ -2034,6 +2047,9 @@ pprInstr (FDIV size reg1 reg2 reg3)
   = pprSizeRegRegReg (sLit "fdiv") size reg1 reg2 reg3
 
 pprInstr (FMOV FF32 reg1 reg2) = pprSizeRegReg (sLit "fmov") FF32 reg1 reg2
+pprInstr (FMOV FF64 reg1 reg2) = pprSizeRegReg (sLit "fmov") FF64 reg1 reg2
+
+{-
 pprInstr (FMOV FF64 reg1 reg2)
  = let	Just reg1H	= fPair reg1
  	Just reg2H	= fPair reg2
@@ -2042,6 +2058,7 @@ pprInstr (FMOV FF64 reg1 reg2)
     (if (reg1 == reg2) then empty
      else (<>) (char '\n')
     	  (pprSizeRegReg (sLit "fmov") FF32 reg1H reg2H))
+-}
 
 pprInstr (FMUL size reg1 reg2 reg3)
   = pprSizeRegRegReg (sLit "fmul") size reg1 reg2 reg3
@@ -2069,6 +2086,7 @@ pprInstr (FxTOy size1 size2 reg1 reg2)
 	ptext
     	(case size2 of
     	    II32  -> sLit "i\t"
+	    II64  -> sLit "x\t"
     	    FF32  -> sLit "s\t"
     	    FF64  -> sLit "d\t"),
 	pprReg reg1, comma, pprReg reg2