Fix trac #921: generate *q instructions for int-float conversions

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

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index afa5bcd..6ca3bde 100644 (file)
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -39,20 +39,15 @@ import qualified Outputable
 
 import StaticFlags      ( opt_PIC, opt_Static )
 
-#if __GLASGOW_HASKELL__ >= 504
 import Data.Array.ST
 import Data.Word       ( Word8 )
-#else
-import MutableArray
-#endif
-
-import MONAD_ST
-import Char            ( chr, ord )
-import Maybe            ( isJust )
+import Control.Monad.ST
+import Data.Char       ( chr, ord )
+import Data.Maybe       ( isJust )
 
 #if powerpc_TARGET_ARCH || darwin_TARGET_OS
-import DATA_WORD(Word32)
-import DATA_BITS
+import Data.Word(Word32)
+import Data.Bits
 #endif
 
 -- -----------------------------------------------------------------------------
@@ -1309,10 +1304,10 @@ pprInstr (FDIV size op1 op2) = pprSizeOpOp SLIT("div") size op1 op2
 
 pprInstr (CVTSS2SD from to) = pprRegReg SLIT("cvtss2sd") from to
 pprInstr (CVTSD2SS from to) = pprRegReg SLIT("cvtsd2ss") from to
-pprInstr (CVTSS2SI from to) = pprOpReg  SLIT("cvtss2si") from to
-pprInstr (CVTSD2SI from to) = pprOpReg  SLIT("cvtsd2si") from to
-pprInstr (CVTSI2SS from to) = pprOpReg  SLIT("cvtsi2ss") from to
-pprInstr (CVTSI2SD from to) = pprOpReg  SLIT("cvtsi2sd") from to
+pprInstr (CVTSS2SI from to) = pprOpReg  SLIT("cvtss2siq") from to
+pprInstr (CVTSD2SI from to) = pprOpReg  SLIT("cvtsd2siq") from to
+pprInstr (CVTSI2SS from to) = pprOpReg  SLIT("cvtsi2ssq") from to
+pprInstr (CVTSI2SD from to) = pprOpReg  SLIT("cvtsi2sdq") from to
 #endif
 
     -- FETCHGOT for PIC on ELF platforms