diff options
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgClosure.lhs | 4 | ||||
| -rw-r--r-- | compiler/codeGen/CgCon.lhs | 4 | ||||
| -rw-r--r-- | compiler/codeGen/CgHeapery.lhs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/CgInfoTbls.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/CgMonad.lhs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/CgTailCall.lhs | 10 | ||||
| -rw-r--r-- | compiler/codeGen/CgUtils.hs | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/compiler/codeGen/CgClosure.lhs b/compiler/codeGen/CgClosure.lhs index 96e6395e95..8e599c3fb5 100644 --- a/compiler/codeGen/CgClosure.lhs +++ b/compiler/codeGen/CgClosure.lhs @@ -374,7 +374,7 @@ mkSlowEntryCode cl_info reg_args stk_adj_pop = CmmAssign spReg (cmmRegOffW spReg final_stk_offset) stk_adj_push = CmmAssign spReg (cmmRegOffW spReg (- final_stk_offset)) - jump_to_entry = CmmJump (mkLblExpr (entryLabelFromCI cl_info)) [] + jump_to_entry = CmmJump (mkLblExpr (entryLabelFromCI cl_info)) \end{code} @@ -590,7 +590,7 @@ link_caf cl_info _is_upd = do -- assuming lots of things, like the stack pointer hasn't -- moved since we entered the CAF. let target = entryCode (closureInfoPtr (CmmReg nodeReg)) in - stmtC (CmmJump target []) + stmtC (CmmJump target) ; returnFC hp_rel } where diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs index 17bb9d0ad8..99690945cb 100644 --- a/compiler/codeGen/CgCon.lhs +++ b/compiler/codeGen/CgCon.lhs @@ -352,8 +352,8 @@ cgReturnDataCon con amodes } where enter_it = stmtsC [ CmmAssign nodeReg (cmmUntag (CmmReg nodeReg)), - CmmJump (entryCode (closureInfoPtr (CmmReg nodeReg))) [] ] - jump_to lbl = stmtC (CmmJump (CmmLit lbl) []) + CmmJump (entryCode (closureInfoPtr (CmmReg nodeReg)))] + jump_to lbl = stmtC (CmmJump (CmmLit lbl)) build_it_then return_code = do { -- BUILD THE OBJECT IN THE HEAP -- The first "con" says that the name bound to this diff --git a/compiler/codeGen/CgHeapery.lhs b/compiler/codeGen/CgHeapery.lhs index 03b5deb058..d8ac298b58 100644 --- a/compiler/codeGen/CgHeapery.lhs +++ b/compiler/codeGen/CgHeapery.lhs @@ -464,7 +464,7 @@ do_checks' stk_expr hp_expr stk_nonzero hp_nonzero reg_save_code rts_lbl -- the appropriate RTS stub. ; exit_blk_id <- forkLabelledCode $ do { ; emitStmts reg_save_code - ; stmtC (CmmJump rts_lbl []) } + ; stmtC (CmmJump rts_lbl) } -- In the case of a heap-check failure, we must also set -- HpAlloc. NB. HpAlloc is *only* set if Hp has been diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs index 25ba154d12..9f003a2302 100644 --- a/compiler/codeGen/CgInfoTbls.hs +++ b/compiler/codeGen/CgInfoTbls.hs @@ -253,7 +253,7 @@ emitAlgReturnTarget name branches mb_deflt fam_sz emitReturnInstr :: Code emitReturnInstr = do { info_amode <- getSequelAmode - ; stmtC (CmmJump (entryCode info_amode) []) } + ; stmtC (CmmJump (entryCode info_amode)) } ----------------------------------------------------------------------------- -- diff --git a/compiler/codeGen/CgMonad.lhs b/compiler/codeGen/CgMonad.lhs index 490f9520f1..4617aaa8a3 100644 --- a/compiler/codeGen/CgMonad.lhs +++ b/compiler/codeGen/CgMonad.lhs @@ -249,7 +249,7 @@ flattenCgStmts id stmts = where (block,blocks) = flatten ss isJump :: CmmStmt -> Bool -isJump (CmmJump _ _) = True +isJump (CmmJump _ ) = True isJump (CmmBranch _ ) = True isJump (CmmSwitch _ _) = True isJump (CmmReturn _ ) = True diff --git a/compiler/codeGen/CgTailCall.lhs b/compiler/codeGen/CgTailCall.lhs index fb8f854c0b..07be7f23fa 100644 --- a/compiler/codeGen/CgTailCall.lhs +++ b/compiler/codeGen/CgTailCall.lhs @@ -123,7 +123,7 @@ performTailCall fun_info arg_amodes pending_assts EnterIt -> do { emitSimultaneously (node_asst `plusStmts` pending_assts) ; let target = entryCode (closureInfoPtr (CmmReg nodeReg)) - enterClosure = stmtC (CmmJump target []) + enterClosure = stmtC (CmmJump target) -- If this is a scrutinee -- let's check if the closure is a constructor -- so we can directly jump to the alternatives switch @@ -203,7 +203,7 @@ performTailCall fun_info arg_amodes pending_assts -- No, enter the closure. ; enterClosure ; labelC is_constr - ; stmtC (CmmJump (entryCode $ CmmLit (CmmLabel lbl)) []) + ; stmtC (CmmJump (entryCode $ CmmLit (CmmLabel lbl))) } {- -- This is a scrutinee for a case expression @@ -218,7 +218,7 @@ performTailCall fun_info arg_amodes pending_assts ; stmtC (CmmCondBranch (cond1 tag) no_cons) ; stmtC (CmmCondBranch (cond2 tag) no_cons) -- Yes, jump to switch statement - ; stmtC (CmmJump (CmmLit (CmmLabel lbl)) []) + ; stmtC (CmmJump (CmmLit (CmmLabel lbl))) ; labelC no_cons -- No, enter the closure. ; enterClosure @@ -438,9 +438,9 @@ pushReturnAddress _ = nopC -- ----------------------------------------------------------------------------- -- Misc. -jumpToLbl :: CLabel -> Code -- Passes no argument to the destination procedure -jumpToLbl lbl = stmtC (CmmJump (CmmLit (CmmLabel lbl)) [{- No args -}]) +jumpToLbl :: CLabel -> Code +jumpToLbl lbl = stmtC (CmmJump (CmmLit (CmmLabel lbl))) assignToRegs :: [(CmmExpr, GlobalReg)] -> CmmStmts assignToRegs reg_args diff --git a/compiler/codeGen/CgUtils.hs b/compiler/codeGen/CgUtils.hs index 5274a176a0..2a524a182c 100644 --- a/compiler/codeGen/CgUtils.hs +++ b/compiler/codeGen/CgUtils.hs @@ -1020,7 +1020,7 @@ fixStgRegStmt stmt CmmSwitch expr ids -> CmmSwitch (fixStgRegExpr expr) ids - CmmJump addr regs -> CmmJump (fixStgRegExpr addr) regs + CmmJump addr -> CmmJump (fixStgRegExpr addr) -- CmmNop, CmmComment, CmmBranch, CmmReturn _other -> stmt |