X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FnativeGen%2FPprMach.hs;h=55e3930786dc161c3b2a253bdde2c011f8a7dfce;hp=eb880fca6ab2f199bf3f8ab5308469f7eafc2ead;hb=232e72122fa7f08690e3be2bb9f8a7f8024e37d5;hpb=5269b0c1e565a23bafee6e4a835f5fc483fdb897

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index eb880fc..55e3930 100644
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -21,15 +21,16 @@
 
 module PprMach ( 
 	pprNatCmmTop, pprBasicBlock, pprSectionHeader, pprData,
-	pprInstr, pprSize, pprUserReg
+	pprInstr, pprSize, pprUserReg, pprImm
   ) where
 
 #include "HsVersions.h"
 
 import BlockId
 import Cmm
-import MachRegs		-- may differ per-platform
-import MachInstrs
+import Regs		-- may differ per-platform
+import Instrs
+import Regs
 
 import CLabel		( CLabel, pprCLabel, externallyVisibleCLabel,
 			  labelDynamic, mkAsmTempLabel, entryLblToInfoLbl )
@@ -402,11 +403,14 @@ pprSize x = ptext (case x of
 	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
@@ -689,7 +693,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 +2006,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 [
@@ -2073,6 +2087,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
@@ -2096,6 +2111,7 @@ pprInstr (BF cond b (BlockId id))
     ]
 
 pprInstr (JMP addr) = (<>) (ptext (sLit "\tjmp\t")) (pprAddr addr)
+pprInstr (JMP_TBL op ids)  = pprInstr (JMP op)
 
 pprInstr (CALL (Left imm) n _)
   = hcat [ ptext (sLit "\tcall\t"), pprImm imm, comma, int n ]