X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgCallConv.hs;h=f3013cd5a6f4f1bef1bc5da240d586696c712776;hp=8a1ae8be0cb3d89a10e3ecdd45efc95faedeb16f;hb=2c8aabcad1d2f2c469cb8a10afa7b66beeaedd45;hpb=a02e7f40afc1aab7fe466f949f505c1d7250713d

diff --git a/compiler/codeGen/CgCallConv.hs b/compiler/codeGen/CgCallConv.hs
index 8a1ae8b..f3013cd 100644
--- a/compiler/codeGen/CgCallConv.hs
+++ b/compiler/codeGen/CgCallConv.hs
@@ -32,13 +32,13 @@ import CgUtils
 import CgMonad
 import SMRep
 
-import Cmm
+import OldCmm
 import CLabel
 
 import Constants
 import ClosureInfo
 import CgStackery
-import CmmUtils
+import OldCmmUtils
 import Maybes
 import Id
 import Name
@@ -150,7 +150,7 @@ mkLiveness name size bits
   = let
         small_bits = case bits of 
 			[]  -> 0
-			[b] -> fromIntegral b
+                        [b] -> b
 			_   -> panic "livenessToAddrMode"
     in
     return (smallLiveness size small_bits)
@@ -284,7 +284,6 @@ getSequelAmode
 	    OnStack -> do { sp_rel <- getSpRelOffset virt_sp
 			  ; returnFC (CmmLoad sp_rel bWord) }
 
-	    UpdateCode 	      -> returnFC (CmmLit (CmmLabel mkUpdInfoLabel))
 	    CaseAlts lbl _ _  -> returnFC (CmmLit (CmmLabel lbl))
 	}