diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-19 00:15:15 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-19 00:15:15 +0100 |
| commit | 62bb618911c3bfe11a989ed6397434ca89a628d7 (patch) | |
| tree | a34544c4b497dc88b7f4047bca9e6fd010fa9b99 /compiler/codeGen | |
| parent | 0176c3f297e58080ae1c308453cf5233f60f1f21 (diff) | |
| download | haskell-62bb618911c3bfe11a989ed6397434ca89a628d7.tar.gz | |
Add some LDV_* constants to platformConstants
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgProf.hs | 18 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmProf.hs | 18 |
2 files changed, 8 insertions, 28 deletions
diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs index 9848d345e9..b21ae262fd 100644 --- a/compiler/codeGen/CgProf.hs +++ b/compiler/codeGen/CgProf.hs @@ -25,9 +25,6 @@ module CgProf ( #include "HsVersions.h" #include "../includes/MachDeps.h" -- For WORD_SIZE_IN_BITS only. -#include "../includes/rts/Constants.h" - -- For LDV_CREATE_MASK, LDV_STATE_USE - -- which are StgWords #include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- For REP_xxx constants, which are MachReps @@ -265,7 +262,7 @@ staticLdvInit = zeroCLit dynLdvInit :: DynFlags -> CmmExpr dynLdvInit dflags = -- (era << LDV_SHIFT) | LDV_STATE_CREATE CmmMachOp (mo_wordOr dflags) [ - CmmMachOp (mo_wordShl dflags) [loadEra dflags, mkIntExpr dflags lDV_SHIFT ], + CmmMachOp (mo_wordShl dflags) [loadEra dflags, mkIntExpr dflags (lDV_SHIFT dflags)], CmmLit (mkWordCLit dflags (lDV_STATE_CREATE dflags)) ] @@ -316,17 +313,10 @@ ldvWord :: DynFlags -> CmmExpr -> CmmExpr ldvWord dflags closure_ptr = cmmOffsetB dflags closure_ptr (oFFSET_StgHeader_ldvw dflags) --- LDV constants, from ghc/includes/Constants.h -lDV_SHIFT :: Int -lDV_SHIFT = LDV_SHIFT ---lDV_STATE_MASK :: StgWord ---lDV_STATE_MASK = LDV_STATE_MASK lDV_CREATE_MASK :: DynFlags -> StgWord -lDV_CREATE_MASK dflags = toStgWord dflags LDV_CREATE_MASK ---lDV_LAST_MASK :: StgWord ---lDV_LAST_MASK = LDV_LAST_MASK +lDV_CREATE_MASK dflags = toStgWord dflags (iLDV_CREATE_MASK dflags) lDV_STATE_CREATE :: DynFlags -> StgWord -lDV_STATE_CREATE dflags = toStgWord dflags LDV_STATE_CREATE +lDV_STATE_CREATE dflags = toStgWord dflags (iLDV_STATE_CREATE dflags) lDV_STATE_USE :: DynFlags -> StgWord -lDV_STATE_USE dflags = toStgWord dflags LDV_STATE_USE +lDV_STATE_USE dflags = toStgWord dflags (iLDV_STATE_USE dflags) diff --git a/compiler/codeGen/StgCmmProf.hs b/compiler/codeGen/StgCmmProf.hs index 30ced9a1ff..56c182d214 100644 --- a/compiler/codeGen/StgCmmProf.hs +++ b/compiler/codeGen/StgCmmProf.hs @@ -33,9 +33,6 @@ module StgCmmProf ( #include "HsVersions.h" #include "../includes/MachDeps.h" -- For WORD_SIZE_IN_BITS only. -#include "../includes/rts/Constants.h" - -- For LDV_CREATE_MASK, LDV_STATE_USE - -- which are StgWords #include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- For REP_xxx constants, which are MachReps @@ -328,7 +325,7 @@ staticLdvInit = zeroCLit dynLdvInit :: DynFlags -> CmmExpr dynLdvInit dflags = -- (era << LDV_SHIFT) | LDV_STATE_CREATE CmmMachOp (mo_wordOr dflags) [ - CmmMachOp (mo_wordShl dflags) [loadEra dflags, mkIntExpr dflags lDV_SHIFT ], + CmmMachOp (mo_wordShl dflags) [loadEra dflags, mkIntExpr dflags (lDV_SHIFT dflags)], CmmLit (mkWordCLit dflags (lDV_STATE_CREATE dflags)) ] @@ -379,17 +376,10 @@ ldvWord :: DynFlags -> CmmExpr -> CmmExpr ldvWord dflags closure_ptr = cmmOffsetB dflags closure_ptr (oFFSET_StgHeader_ldvw dflags) --- LDV constants, from ghc/includes/Constants.h -lDV_SHIFT :: Int -lDV_SHIFT = LDV_SHIFT ---lDV_STATE_MASK :: StgWord ---lDV_STATE_MASK = LDV_STATE_MASK lDV_CREATE_MASK :: DynFlags -> StgWord -lDV_CREATE_MASK dflags = toStgWord dflags LDV_CREATE_MASK ---lDV_LAST_MASK :: StgWord ---lDV_LAST_MASK = LDV_LAST_MASK +lDV_CREATE_MASK dflags = toStgWord dflags (iLDV_CREATE_MASK dflags) lDV_STATE_CREATE :: DynFlags -> StgWord -lDV_STATE_CREATE dflags = toStgWord dflags LDV_STATE_CREATE +lDV_STATE_CREATE dflags = toStgWord dflags (iLDV_STATE_CREATE dflags) lDV_STATE_USE :: DynFlags -> StgWord -lDV_STATE_USE dflags = toStgWord dflags LDV_STATE_USE +lDV_STATE_USE dflags = toStgWord dflags (iLDV_STATE_USE dflags) |