diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-12 16:32:34 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-12 16:32:34 +0100 |
| commit | 2b7319a67de0771d31626091e43dd3b60827a0ea (patch) | |
| tree | cb1542cb4e9e7e6826e06f2fb94fd590dca2f834 /compiler/codeGen/CgForeignCall.hs | |
| parent | 44b5f471a314d964948c38684ce74b7a87df4ed8 (diff) | |
| download | haskell-2b7319a67de0771d31626091e43dd3b60827a0ea.tar.gz | |
Pass DynFlags down to wordWidth
Diffstat (limited to 'compiler/codeGen/CgForeignCall.hs')
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index 213745d59d..b835e784e1 100644 --- a/compiler/codeGen/CgForeignCall.hs +++ b/compiler/codeGen/CgForeignCall.hs @@ -152,7 +152,7 @@ emitForeignCall' safety results target args vols _srt ret stmtC (CmmCall (CmmCallee suspendThread CCallConv) [ CmmHinted id AddrHint ] [ CmmHinted (CmmReg (CmmGlobal BaseReg)) AddrHint - , CmmHinted (CmmLit (CmmInt (fromIntegral (fromEnum (playInterruptible safety))) wordWidth)) NoHint] + , CmmHinted (CmmLit (CmmInt (fromIntegral (fromEnum (playInterruptible safety))) (wordWidth dflags))) NoHint] ret) stmtC (CmmCall temp_target results temp_args ret) stmtC (CmmCall (CmmCallee resumeThread CCallConv) @@ -243,7 +243,7 @@ emitLoadThreadState = do -- HpAlloc = 0; -- HpAlloc is assumed to be set to non-zero only by a failed -- a heap check, see HeapStackCheck.cmm:GC_GENERIC - CmmAssign hpAlloc (CmmLit zeroCLit) + CmmAssign hpAlloc (CmmLit (zeroCLit dflags)) ] emitOpenNursery -- and load the current cost centre stack from the TSO when profiling: @@ -264,10 +264,10 @@ emitOpenNursery = (cmmOffsetExpr dflags (CmmLoad (nursery_bdescr_start dflags) (bWord dflags)) (cmmOffset dflags - (CmmMachOp mo_wordMul [ - CmmMachOp (MO_SS_Conv W32 wordWidth) + (CmmMachOp (mo_wordMul dflags) [ + CmmMachOp (MO_SS_Conv W32 (wordWidth dflags)) [CmmLoad (nursery_bdescr_blocks dflags) b32], - mkIntExpr bLOCK_SIZE + mkIntExpr dflags bLOCK_SIZE ]) (-1) ) |