X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FMachOp.hs;h=f2aadcf897d4bb4ee755d38e0c73a3762150765e;hb=d502cd03812e1c6452927d40e31e81c0594e899e;hp=5bbff6de7837491bebc9803dc5805605aae035e4;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/cmm/MachOp.hs b/compiler/cmm/MachOp.hs
index 5bbff6d..f2aadcf 100644
--- a/compiler/cmm/MachOp.hs
+++ b/compiler/cmm/MachOp.hs
@@ -1,6 +1,13 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -----------------------------------------------------------------------------
 --
--- (c) The University of Glasgow 2002-2004
+-- (c) The University of Glasgow 2002-2006
 --
 -- Low-level machine operations, used in the Cmm datatype.
 --
@@ -83,6 +90,7 @@ module MachOp 	(
 
 import Constants
 import Outputable
+import FastString
 
 -- -----------------------------------------------------------------------------
 -- MachRep
@@ -118,14 +126,14 @@ data MachRep
   | F80		-- extended double-precision, used in x86 native codegen only.
   deriving (Eq, Ord, Show)
 
-mrStr I8   = SLIT("I8")
-mrStr I16  = SLIT("I16")
-mrStr I32  = SLIT("I32")
-mrStr I64  = SLIT("I64")
-mrStr I128 = SLIT("I128")
-mrStr F32  = SLIT("F32")
-mrStr F64  = SLIT("F64")
-mrStr F80  = SLIT("F80")
+mrStr I8   = sLit "I8"
+mrStr I16  = sLit "I16"
+mrStr I32  = sLit "I32"
+mrStr I64  = sLit "I64"
+mrStr I128 = sLit "I128"
+mrStr F32  = sLit "F32"
+mrStr F64  = sLit "F64"
+mrStr F80  = sLit "F80"
 
 instance Outputable MachRep where
    ppr rep = ptext (mrStr rep)
@@ -276,10 +284,10 @@ data MachHint
   | FloatHint
   deriving Eq
 
-mhStr NoHint     = SLIT("NoHint")
-mhStr PtrHint    = SLIT("PtrHint")
-mhStr SignedHint = SLIT("SignedHint")
-mhStr FloatHint  = SLIT("FloatHint")
+mhStr NoHint     = sLit "NoHint"
+mhStr PtrHint    = sLit "PtrHint"
+mhStr SignedHint = sLit "SignedHint"
+mhStr FloatHint  = sLit "FloatHint"
 
 instance Outputable MachHint where
    ppr hint = ptext (mhStr hint)
@@ -385,6 +393,7 @@ data CallishMachOp
   | MO_F32_Log
   | MO_F32_Exp
   | MO_F32_Sqrt
+  | MO_WriteBarrier
   deriving (Eq, Show)
 
 pprCallishMachOp :: CallishMachOp -> SDoc