From: Michael D. Adams Date: Sun, 15 Jul 2007 01:11:41 +0000 (+0000) Subject: Fixed CPS to account for info tables not being next to code X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a9eda06434ea9fb4764c2a587ccd53df09f7c470 Fixed CPS to account for info tables not being next to code --- diff --git a/compiler/cmm/CmmCPSGen.hs b/compiler/cmm/CmmCPSGen.hs index 5a98ae1..da72b54 100644 --- a/compiler/cmm/CmmCPSGen.hs +++ b/compiler/cmm/CmmCPSGen.hs @@ -17,6 +17,7 @@ import CmmCallConv import CgProf (curCCS, curCCSAddr) import CgUtils (cmmOffsetW) +import CgInfoTbls (entryCode) import SMRep import ForeignCall @@ -178,7 +179,7 @@ continuationToProc (max_stack, update_frame_size, formats) stack_use uniques FinalSwitch expr targets -> [CmmSwitch expr targets] FinalReturn arguments -> tail_call curr_stack - (CmmLoad (CmmReg spReg) wordRep) + (entryCode (CmmLoad (CmmReg spReg) wordRep)) arguments FinalJump target arguments -> tail_call curr_stack target arguments