X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FMachCodeGen.hs;h=eed63fb803d4cf79272cae88bfab940698db6dba;hb=c01eaa1d3eb3db5c8fd036aae7e3525909454c64;hp=8f6cfcb5165d2abe4ca07f5bda5f49986011c6d5;hpb=d76b6a05ab36066e8aeb67d58e25992d1ef83a8a;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/MachCodeGen.hs b/compiler/nativeGen/MachCodeGen.hs
index 8f6cfcb..eed63fb 100644
--- a/compiler/nativeGen/MachCodeGen.hs
+++ b/compiler/nativeGen/MachCodeGen.hs
@@ -45,13 +45,9 @@ import OrdList
 import Pretty
 import Outputable
 import FastString
-import FastTypes	( isFastTrue )
+import FastBool		( isFastTrue )
 import Constants	( wORD_SIZE )
 
-#ifdef DEBUG
-import Outputable	( assertPanic )
-import Debug.Trace	( trace )
-#endif
 import Debug.Trace	( trace )
 
 import Control.Monad	( mapAndUnzipM )
@@ -305,7 +301,7 @@ assignMem_I64Code addrTree valueTree = do
          mov_lo = ST I32 rlo (AddrRegImm src (ImmInt 4))
      return (vcode `appOL` code `snocOL` mov_hi `snocOL` mov_lo)
 
-assignReg_I64Code (CmmLocal (LocalReg u_dst pk)) valueTree = do
+assignReg_I64Code (CmmLocal (LocalReg u_dst pk _)) valueTree = do
      ChildCode64 vcode r_src_lo <- iselExpr64 valueTree    
      let 
          r_dst_lo = mkVReg u_dst pk
@@ -335,7 +331,7 @@ iselExpr64 (CmmLoad addrTree I64) = do
                          rlo
           )
 
-iselExpr64 (CmmReg (CmmLocal (LocalReg uq I64))) = do
+iselExpr64 (CmmReg (CmmLocal (LocalReg uq I64 _))) = do
      r_dst_lo <-  getNewRegNat I32
      let r_dst_hi = getHiVRegFromLo r_dst_lo
          r_src_lo = mkVReg uq I32
@@ -1046,8 +1042,7 @@ getRegister (CmmMachOp mop [x]) -- unary MachOps
 
 
 getRegister e@(CmmMachOp mop [x, y]) -- dyadic MachOps
-  = ASSERT2(cmmExprRep x /= I8, pprExpr e)
-    case mop of
+  = case mop of
       MO_Eq F32   -> condFltReg EQQ x y
       MO_Ne F32   -> condFltReg NE x y
       MO_S_Gt F32 -> condFltReg GTT x y
@@ -3994,7 +3989,7 @@ genSwitch expr ids
                     ]
         return code
 #else
-genSwitch expr ids = panic "ToDo: genSwitch"
+#error "ToDo: genSwitch"
 #endif
 
 jumpTableEntry Nothing = CmmStaticLit (CmmInt 0 wordRep)