X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FMachCodeGen.hs;h=3abe820c9e638994de3bdc1f5bfd91a1f75ff99c;hb=b71b86cf18374f8011120c92e24ca293986e86ea;hp=4d96bb0a2f30e9d1e1ec57442bb33061c22ba03e;hpb=4b0d51372d354687f0b2f7b2c2583bed059ce315;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/MachCodeGen.hs b/compiler/nativeGen/MachCodeGen.hs
index 4d96bb0..3abe820 100644
--- a/compiler/nativeGen/MachCodeGen.hs
+++ b/compiler/nativeGen/MachCodeGen.hs
@@ -3049,7 +3049,7 @@ genCCall (CmmPrim MO_WriteBarrier) _ _ = return nilOL
 	-- we keep it this long in order to prevent earlier optimisations.
 
 -- we only cope with a single result for foreign calls
-genCCall (CmmPrim op) [CmmHinted r _] args = do
+genCCall (CmmPrim op) [CmmKinded r _] args = do
   case op of
 	MO_F32_Sqrt -> actuallyInlineFloatOp F32  (GSQRT F32) args
 	MO_F64_Sqrt -> actuallyInlineFloatOp F64 (GSQRT F64) args
@@ -3065,14 +3065,14 @@ genCCall (CmmPrim op) [CmmHinted r _] args = do
 	
 	other_op    -> outOfLineFloatOp op r args
  where
-  actuallyInlineFloatOp rep instr [CmmHinted x _]
+  actuallyInlineFloatOp rep instr [CmmKinded x _]
 	= do res <- trivialUFCode rep instr x
 	     any <- anyReg res
  	     return (any (getRegisterReg (CmmLocal r)))
 
 genCCall target dest_regs args = do
     let
-        sizes               = map (arg_size . cmmExprRep . hintlessCmm) (reverse args)
+        sizes               = map (arg_size . cmmExprRep . kindlessCmm) (reverse args)
 #if !darwin_TARGET_OS        
         tot_arg_size        = sum sizes
 #else
@@ -3124,7 +3124,7 @@ genCCall target dest_regs args = do
     let
 	-- assign the results, if necessary
 	assign_code []     = nilOL
-	assign_code [CmmHinted dest _hint] = 
+	assign_code [CmmKinded dest _hint] = 
 	  case rep of
 		I64 -> toOL [MOV I32 (OpReg eax) (OpReg r_dest),
 			     MOV I32 (OpReg edx) (OpReg r_dest_hi)]
@@ -3151,10 +3151,10 @@ genCCall target dest_regs args = do
                 | otherwise = x + a - (x `mod` a)
 
 
-    push_arg :: (CmmHinted CmmExpr){-current argument-}
+    push_arg :: (CmmKinded CmmExpr){-current argument-}
                     -> NatM InstrBlock  -- code
 
-    push_arg (CmmHinted arg _hint) -- we don't need the hints on x86
+    push_arg (CmmKinded arg _hint) -- we don't need the hints on x86
       | arg_rep == I64 = do
         ChildCode64 code r_lo <- iselExpr64 arg
         delta <- getDeltaNat
@@ -3208,13 +3208,13 @@ outOfLineFloatOp mop res args
         
       if localRegRep res == F64
         then
-          stmtToInstrs (CmmCall target [CmmHinted res FloatHint] args CmmUnsafe CmmMayReturn)
+          stmtToInstrs (CmmCall target [CmmKinded res FloatHint] args CmmUnsafe CmmMayReturn)
         else do
           uq <- getUniqueNat
           let 
             tmp = LocalReg uq F64 GCKindNonPtr
           -- in
-          code1 <- stmtToInstrs (CmmCall target [CmmHinted tmp FloatHint] args CmmUnsafe CmmMayReturn)
+          code1 <- stmtToInstrs (CmmCall target [CmmKinded tmp FloatHint] args CmmUnsafe CmmMayReturn)
           code2 <- stmtToInstrs (CmmAssign (CmmLocal res) (CmmReg (CmmLocal tmp)))
           return (code1 `appOL` code2)
   where
@@ -3264,7 +3264,7 @@ genCCall (CmmPrim MO_WriteBarrier) _ _ = return nilOL
 	-- we keep it this long in order to prevent earlier optimisations.
 
 
-genCCall (CmmPrim op) [CmmHinted r _] args = 
+genCCall (CmmPrim op) [CmmKinded r _] args = 
   outOfLineFloatOp op r args
 
 genCCall target dest_regs args = do
@@ -3344,7 +3344,7 @@ genCCall target dest_regs args = do
     let
 	-- assign the results, if necessary
 	assign_code []     = nilOL
-	assign_code [CmmHinted dest _hint] = 
+	assign_code [CmmKinded dest _hint] = 
 	  case rep of
 		F32 -> unitOL (MOV rep (OpReg xmm0) (OpReg r_dest))
 		F64 -> unitOL (MOV rep (OpReg xmm0) (OpReg r_dest))
@@ -3364,16 +3364,16 @@ genCCall target dest_regs args = do
   where
     arg_size = 8 -- always, at the mo
 
-    load_args :: [CmmHinted CmmExpr]
+    load_args :: [CmmKinded CmmExpr]
 	      -> [Reg] 			-- int regs avail for args
 	      -> [Reg] 			-- FP regs avail for args
 	      -> InstrBlock
-	      -> NatM ([CmmHinted CmmExpr],[Reg],[Reg],InstrBlock)
+	      -> NatM ([CmmKinded CmmExpr],[Reg],[Reg],InstrBlock)
     load_args args [] [] code     =  return (args, [], [], code)
 	-- no more regs to use
     load_args [] aregs fregs code =  return ([], aregs, fregs, code)
 	-- no more args to push
-    load_args ((CmmHinted arg hint) : rest) aregs fregs code
+    load_args ((CmmKinded arg hint) : rest) aregs fregs code
 	| isFloatingRep arg_rep = 
 	case fregs of
 	  [] -> push_this_arg
@@ -3391,10 +3391,10 @@ genCCall target dest_regs args = do
 
 	  push_this_arg = do
 	    (args',ars,frs,code') <- load_args rest aregs fregs code
-	    return ((CmmHinted arg hint):args', ars, frs, code')
+	    return ((CmmKinded arg hint):args', ars, frs, code')
 
     push_args [] code = return code
-    push_args ((CmmHinted arg hint):rest) code
+    push_args ((CmmKinded arg hint):rest) code
        | isFloatingRep arg_rep = do
 	 (arg_reg, arg_code) <- getSomeReg arg
          delta <- getDeltaNat
@@ -3455,7 +3455,7 @@ genCCall target dest_regs args = do
 
 genCCall target dest_regs argsAndHints = do
     let
-        args = map hintlessCmm argsAndHints
+        args = map kindlessCmm argsAndHints
     argcode_and_vregs <- mapM arg_to_int_vregs args
     let 
         (argcodes, vregss) = unzip argcode_and_vregs
@@ -3690,7 +3690,7 @@ genCCall target dest_regs argsAndHints
         initialStackOffset = 8
         stackDelta finalStack = roundTo 16 finalStack
 #endif
-	args = map hintlessCmm argsAndHints
+	args = map kindlessCmm argsAndHints
 	argReps = map cmmExprRep args
 
 	roundTo a x | x `mod` a == 0 = x
@@ -3805,7 +3805,7 @@ genCCall target dest_regs argsAndHints
         moveResult reduceToF32 =
             case dest_regs of
                 [] -> nilOL
-                [CmmHinted dest _hint]
+                [CmmKinded dest _hint]
                     | reduceToF32 && rep == F32 -> unitOL (FRSP r_dest f1)
                     | rep == F32 || rep == F64 -> unitOL (MR r_dest f1)
                     | rep == I64 -> toOL [MR (getHiVRegFromLo r_dest) r3,