X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmCPSGen.hs;h=45d0aebe3c3e023249824243ea2b3d0cbdfc45e4;hp=5d691f8e5c6f32b8c79592fdac1fa293435e8fdd;hb=edc0bafd3fcd01b85a2e8894e5dfe149eb0e0857;hpb=984a288119983912d40a80845c674ee4b83a19ce

diff --git a/compiler/cmm/CmmCPSGen.hs b/compiler/cmm/CmmCPSGen.hs
index 5d691f8..45d0aeb 100644
--- a/compiler/cmm/CmmCPSGen.hs
+++ b/compiler/cmm/CmmCPSGen.hs
@@ -20,6 +20,7 @@ import CgInfoTbls
 import SMRep
 import ForeignCall
 
+import Module
 import Constants
 import StaticFlags
 import Unique
@@ -231,7 +232,9 @@ foreignCall uniques call results arguments =
     caller_save ++
     [CmmCall (CmmCallee suspendThread CCallConv)
 		 [ CmmHinted id AddrHint ]
-		 [ CmmHinted (CmmReg (CmmGlobal BaseReg)) AddrHint ]
+		 [ CmmHinted (CmmReg (CmmGlobal BaseReg)) AddrHint
+		 -- XXX: allow for interruptible suspension
+		 , CmmHinted (CmmLit (CmmInt 0 wordWidth)) NoHint ]
 		 CmmUnsafe
                  CmmMayReturn,
      CmmCall call results new_args CmmUnsafe CmmMayReturn,
@@ -259,8 +262,8 @@ foreignCall uniques call results arguments =
 -- Save/restore the thread state in the TSO
 
 suspendThread, resumeThread :: CmmExpr
-suspendThread = CmmLit (CmmLabel (mkRtsCodeLabel (fsLit "suspendThread")))
-resumeThread  = CmmLit (CmmLabel (mkRtsCodeLabel (fsLit "resumeThread")))
+suspendThread = CmmLit (CmmLabel (mkCmmCodeLabel rtsPackageId (fsLit "suspendThread")))
+resumeThread  = CmmLit (CmmLabel (mkCmmCodeLabel rtsPackageId (fsLit "resumeThread")))
 
 -- This stuff can't be done in suspendThread/resumeThread, because it
 -- refers to global registers which aren't available in the C world.
@@ -328,8 +331,8 @@ nursery_bdescr_start  = cmmOffset stgCurrentNursery oFFSET_bdescr_start
 nursery_bdescr_blocks = cmmOffset stgCurrentNursery oFFSET_bdescr_blocks
 
 tso_SP, tso_STACK, tso_CCCS :: ByteOff
-tso_SP    = tsoFieldB     oFFSET_StgTSO_sp
-tso_STACK = tsoFieldB     oFFSET_StgTSO_stack
+tso_SP    = tsoFieldB     undefined --oFFSET_StgTSO_sp
+tso_STACK = tsoFieldB     undefined --oFFSET_StgTSO_stack
 tso_CCCS  = tsoProfFieldB oFFSET_StgTSO_CCCS
 
 -- The TSO struct has a variable header, and an optional StgTSOProfInfo in