diff options
| author | sof <unknown> | 1998-08-14 11:51:01 +0000 |
|---|---|---|
| committer | sof <unknown> | 1998-08-14 11:51:01 +0000 |
| commit | ee67797fcd3b833c3b1a90a543e9520f36f9a6b9 (patch) | |
| tree | 900501c1851825b0ec351462b3bafa3819adb28c | |
| parent | 227a9182a2402e2e922a3a318d9768cb76892ff1 (diff) | |
| download | haskell-ee67797fcd3b833c3b1a90a543e9520f36f9a6b9.tar.gz | |
[project @ 1998-08-14 11:50:58 by sof]
Reflect CCallOp change
| -rw-r--r-- | ghc/compiler/codeGen/CgCase.lhs | 2 | ||||
| -rw-r--r-- | ghc/compiler/codeGen/CgCon.lhs | 3 | ||||
| -rw-r--r-- | ghc/compiler/codeGen/CgExpr.lhs | 2 | ||||
| -rw-r--r-- | ghc/compiler/codeGen/CgTailCall.lhs | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/ghc/compiler/codeGen/CgCase.lhs b/ghc/compiler/codeGen/CgCase.lhs index e5a7adf200..305a28332d 100644 --- 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 bfabcf774f..ea44e5cece 100644 --- 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 904dd5504e..0fa89666f2 100644 --- 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 fb09a0e96b..abf287e639 100644 --- 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 ] |