Fix the build on amd64/Linux

[ghc-hetmet.git] / compiler / nativeGen / PprMach.hs

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index 2da4b35..55e3930 100644 (file)
--- 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,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
@@ -2107,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 ]