[project @ 1998-08-14 11:50:58 by sof]

Reflect CCallOp change

diff --git a/ghc/compiler/codeGen/CgCase.lhs b/ghc/compiler/codeGen/CgCase.lhs
index e5a7adf..305a283 100644 (file)
--- a/ghc/compiler/codeGen/CgCase.lhs
+++ b/ghc/compiler/codeGen/CgCase.lhs
@@ -248,7 +248,7 @@ cgCase (StgPrim op args _) live_in_whole_case live_in_alts uniq alts
     -- on as the first "argument"
     -- ToDo: un-duplicate?
 
-    pin_liveness (CCallOp _ _ _ _ _) _ args = args
+    pin_liveness (CCallOp _ _ _ _ _ _) _ args = args
     pin_liveness other_op liveness_arg args
       = liveness_arg :args
 

diff --git a/ghc/compiler/codeGen/CgCon.lhs b/ghc/compiler/codeGen/CgCon.lhs
index bfabcf7..ea44e5c 100644 (file)
--- a/ghc/compiler/codeGen/CgCon.lhs
+++ b/ghc/compiler/codeGen/CgCon.lhs
@@ -303,7 +303,8 @@ buildDynCon binder cc con [arg_amode] all_zero_size_args@False
   where
     (temp_amode, temp_id_info) = newTempAmodeAndIdInfo binder (mkConLFInfo con)
 
-    in_range_int_lit (CLit (MachInt val _)) = val <= mAX_INTLIKE && val >= mIN_INTLIKE
+    in_range_int_lit (CLit (MachInt val _)) = val <= mAX_INTLIKE && 
+                                             val >= mIN_INTLIKE
     in_range_int_lit other_amode           = False
 \end{code}
 

diff --git a/ghc/compiler/codeGen/CgExpr.lhs b/ghc/compiler/codeGen/CgExpr.lhs
index 904dd55..0fa8966 100644 (file)
--- a/ghc/compiler/codeGen/CgExpr.lhs
+++ b/ghc/compiler/codeGen/CgExpr.lhs
@@ -195,7 +195,7 @@ cgExpr x@(StgPrim op args live_vars)
     -- on as the first "argument"
     -- ToDo: un-duplicate?
 
-    pin_liveness (CCallOp _ _ _ _ _) _ args = args
+    pin_liveness (CCallOp _ _ _ _ _ _) _ args = args
     pin_liveness other_op liveness_arg args
       = liveness_arg :args
 

diff --git a/ghc/compiler/codeGen/CgTailCall.lhs b/ghc/compiler/codeGen/CgTailCall.lhs
index fb09a0e..abf287e 100644 (file)
--- a/ghc/compiler/codeGen/CgTailCall.lhs
+++ b/ghc/compiler/codeGen/CgTailCall.lhs
@@ -436,7 +436,7 @@ tailCallBusiness fun fun_amode lf_info arg_amodes live_vars pending_assts
                        = load_regs_and_profiling_code          `mkAbsCStmts`
                          CJump (CLbl join_lbl CodePtrRep)
 
-                   semi_tagged_alts = [ (mkMachInt (toInteger (tag - fIRST_TAG)),
+                   semi_tagged_alts = [ (mkMachInt (fromInt (tag - fIRST_TAG)),
                                          join_details_to_code join_details)
                                       | (tag, join_details) <- st_alts
                                       ]