X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FPprMach.hs;h=88a8f3fce56c33b1a16f58f62ed36fefba0407a4;hb=e28dc9b9e45ff351a5e40fd4de9d0fc746540526;hp=2da4b358d0d474f9e353e553310badac13c26642;hpb=6822f86c440bece1fc053336a75dac264325d077;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index 2da4b35..88a8f3f 100644
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -28,8 +28,9 @@ module PprMach (
 
 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,13 @@ 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 s) <> int bytes
+    where s =
+#if defined(solaris2_TARGET_OS)
+              ".skip "
+#else
+              ".space "
+#endif
 pprData (CmmStaticLit lit)       = pprDataItem lit
 
 pprGloblDecl :: CLabel -> Doc
@@ -2107,6 +2117,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 ]