X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgTicky.hs;h=34d1dad8731ec1aeb21bfa5744fde9e95c66ec63;hb=4c6a3f787abcaed009a574196d82237d9ae64fc8;hp=f5524d2865c8bf6c89bea045794ec2b35dbcec7a;hpb=a01188d12783adf93b1b6c5a08de1dfa0abf55f2;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs
index f5524d2..34d1dad 100644
--- a/compiler/codeGen/CgTicky.hs
+++ b/compiler/codeGen/CgTicky.hs
@@ -1,3 +1,10 @@
+{-# 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
+
 -----------------------------------------------------------------------------
 --
 -- Code generation for ticky-ticky profiling
@@ -318,13 +325,13 @@ bumpHistogram lbl n
 
 bumpHistogramE :: LitString -> CmmExpr -> Code
 bumpHistogramE lbl n 
-  = do  t <- newTemp cLongRep
-	stmtC (CmmAssign t n)
-	emitIf (CmmMachOp (MO_U_Le cLongRep) [CmmReg t, eight]) $
-		stmtC (CmmAssign t eight)
+  = do  t <- newNonPtrTemp cLongRep
+	stmtC (CmmAssign (CmmLocal t) n)
+	emitIf (CmmMachOp (MO_U_Le cLongRep) [CmmReg (CmmLocal t), eight]) $
+		stmtC (CmmAssign (CmmLocal t) eight)
 	stmtC (addToMemLong (cmmIndexExpr cLongRep 
 				(CmmLit (CmmLabel (mkRtsDataLabel lbl)))
-				(CmmReg t))
+				(CmmReg (CmmLocal t)))
 			    1)
   where 
    eight = CmmLit (CmmInt 8 cLongRep)
@@ -366,8 +373,6 @@ showTypeCategory ty
 	  else if utc == intDataConKey     then 'I'
 	  else if utc == floatDataConKey   then 'F'
 	  else if utc == doubleDataConKey  then 'D'
-	  else if utc == smallIntegerDataConKey ||
-		  utc == largeIntegerDataConKey   then 'J'
 	  else if utc == charPrimTyConKey  then 'c'
 	  else if (utc == intPrimTyConKey || utc == wordPrimTyConKey
 		|| utc == addrPrimTyConKey)		   then 'i'