diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-16 17:45:03 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-16 17:45:03 +0100 |
| commit | 17910899dacc892fd652d9206340d2bc2b2c5fc1 (patch) | |
| tree | c39b870bea8c77390c19e6d9694d38aa931fc2ed /compiler/codeGen/CgForeignCall.hs | |
| parent | a62b56ef0b9d1750289ffd3f77b578dc73452374 (diff) | |
| download | haskell-17910899dacc892fd652d9206340d2bc2b2c5fc1.tar.gz | |
Move wORD_SIZE into platformConstants
Diffstat (limited to 'compiler/codeGen/CgForeignCall.hs')
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index 435fbb0558..824a82635d 100644 --- a/compiler/codeGen/CgForeignCall.hs +++ b/compiler/codeGen/CgForeignCall.hs @@ -30,7 +30,6 @@ import OldCmm import OldCmmUtils import SMRep import ForeignCall -import Constants import DynFlags import Outputable import Module @@ -103,7 +102,7 @@ emitForeignCall results (CCall (CCallSpec target cconv safety)) args live = do | otherwise = Nothing -- ToDo: this might not be correct for 64-bit API - arg_size rep = max (widthInBytes (typeWidth rep)) wORD_SIZE + arg_size rep = max (widthInBytes (typeWidth rep)) (wORD_SIZE dflags) vols <- getVolatileRegs live srt <- getSRTInfo emitForeignCall' safety results @@ -286,7 +285,7 @@ stack_STACK dflags = closureField dflags (oFFSET_StgStack_stack dflags) stack_SP dflags = closureField dflags (oFFSET_StgStack_sp dflags) closureField :: DynFlags -> ByteOff -> ByteOff -closureField dflags off = off + fixedHdrSize dflags * wORD_SIZE +closureField dflags off = off + fixedHdrSize dflags * wORD_SIZE dflags stgSp, stgHp, stgCurrentTSO, stgCurrentNursery :: CmmExpr stgSp = CmmReg sp |