diff options
| author | Michael D. Adams <t-madams@microsoft.com> | 2007-06-27 15:21:30 +0000 |
|---|---|---|
| committer | Michael D. Adams <t-madams@microsoft.com> | 2007-06-27 15:21:30 +0000 |
| commit | d31dfb32ea936c22628b508c28a36c12e631430a (patch) | |
| tree | 76bc1a29b3c5646a8f552af820a81abff49aa492 /compiler/codeGen/CgForeignCall.hs | |
| parent | c9c4951cc1d76273be541fc4791e131e418956aa (diff) | |
| download | haskell-d31dfb32ea936c22628b508c28a36c12e631430a.tar.gz | |
Implemented and fixed bugs in CmmInfo handling
Diffstat (limited to 'compiler/codeGen/CgForeignCall.hs')
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index b2ca5b166a..5d84da773c 100644 --- a/compiler/codeGen/CgForeignCall.hs +++ b/compiler/codeGen/CgForeignCall.hs @@ -116,7 +116,7 @@ emitForeignCall' safety results target args vols srt temp_args <- load_args_into_temps args let (caller_save, caller_load) = callerSaveVolatileRegs vols stmtsC caller_save - stmtC (CmmCall target results temp_args srt) + stmtC (CmmCall target results temp_args CmmUnsafe) stmtsC caller_load | otherwise = do @@ -129,17 +129,20 @@ emitForeignCall' safety results target args vols srt let (caller_save, caller_load) = callerSaveVolatileRegs vols emitSaveThreadState stmtsC caller_save - -- Using the same SRT for each of these is a little bit conservative - -- but it should work for now. + -- The CmmUnsafe arguments are only correct because this part + -- of the code hasn't been moved into the CPS pass yet. + -- Once that happens, this function will just emit a (CmmSafe srt) call, + -- and the CPS will will be the one to convert that + -- to this sequence of three CmmUnsafe calls. stmtC (CmmCall (CmmForeignCall suspendThread CCallConv) [ (id,PtrHint) ] [ (CmmReg (CmmGlobal BaseReg), PtrHint) ] - srt) - stmtC (CmmCall temp_target results temp_args srt) + CmmUnsafe) + stmtC (CmmCall temp_target results temp_args CmmUnsafe) stmtC (CmmCall (CmmForeignCall resumeThread CCallConv) [ (new_base, PtrHint) ] [ (CmmReg (CmmLocal id), PtrHint) ] - srt) + CmmUnsafe) -- Assign the result to BaseReg: we -- might now have a different Capability! stmtC (CmmAssign (CmmGlobal BaseReg) (CmmReg (CmmLocal new_base))) |