diff options
Diffstat (limited to 'compiler/cmm/SMRep.hs')
| -rw-r--r-- | compiler/cmm/SMRep.hs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/compiler/cmm/SMRep.hs b/compiler/cmm/SMRep.hs index d40af4ff1c..743631527e 100644 --- a/compiler/cmm/SMRep.hs +++ b/compiler/cmm/SMRep.hs @@ -9,7 +9,7 @@ module SMRep ( -- * Words and bytes WordOff, ByteOff, wordsToBytes, bytesToWordsRoundUp, - roundUpToWords, + roundUpToWords, roundUpTo, StgWord, fromStgWord, toStgWord, StgHalfWord, fromStgHalfWord, toStgHalfWord, @@ -47,8 +47,7 @@ module SMRep ( pprWord8String, stringToWord8s ) where -#include "../HsVersions.h" -#include "../includes/MachDeps.h" +import GhcPrelude import BasicTypes( ConTagZ ) import DynFlags @@ -77,8 +76,11 @@ type ByteOff = Int -- | Round up the given byte count to the next byte count that's a -- multiple of the machine's word size. roundUpToWords :: DynFlags -> ByteOff -> ByteOff -roundUpToWords dflags n = - (n + (wORD_SIZE dflags - 1)) .&. (complement (wORD_SIZE dflags - 1)) +roundUpToWords dflags n = roundUpTo n (wORD_SIZE dflags) + +-- | Round up @base@ to a multiple of @size@. +roundUpTo :: ByteOff -> ByteOff -> ByteOff +roundUpTo base size = (base + (size - 1)) .&. (complement (size - 1)) -- | Convert the given number of words to a number of bytes. -- @@ -277,10 +279,10 @@ isConRep (HeapRep _ _ _ Constr{}) = True isConRep _ = False isThunkRep :: SMRep -> Bool -isThunkRep (HeapRep _ _ _ Thunk{}) = True +isThunkRep (HeapRep _ _ _ Thunk) = True isThunkRep (HeapRep _ _ _ ThunkSelector{}) = True -isThunkRep (HeapRep _ _ _ BlackHole{}) = True -isThunkRep (HeapRep _ _ _ IndStatic{}) = True +isThunkRep (HeapRep _ _ _ BlackHole) = True +isThunkRep (HeapRep _ _ _ IndStatic) = True isThunkRep _ = False isFunRep :: SMRep -> Bool @@ -384,10 +386,10 @@ heapClosureSizeW _ _ = panic "SMRep.heapClosureSize" closureTypeHdrSize :: DynFlags -> ClosureTypeInfo -> WordOff closureTypeHdrSize dflags ty = case ty of - Thunk{} -> thunkHdrSize dflags + Thunk -> thunkHdrSize dflags ThunkSelector{} -> thunkHdrSize dflags - BlackHole{} -> thunkHdrSize dflags - IndStatic{} -> thunkHdrSize dflags + BlackHole -> thunkHdrSize dflags + IndStatic -> thunkHdrSize dflags _ -> fixedHdrSizeW dflags -- All thunks use thunkHdrSize, even if they are non-updatable. -- this is because we don't have separate closure types for @@ -446,21 +448,19 @@ rtsClosureType rep HeapRep False 0 2 Fun{} -> FUN_0_2 HeapRep False _ _ Fun{} -> FUN - HeapRep False 1 0 Thunk{} -> THUNK_1_0 - HeapRep False 0 1 Thunk{} -> THUNK_0_1 - HeapRep False 2 0 Thunk{} -> THUNK_2_0 - HeapRep False 1 1 Thunk{} -> THUNK_1_1 - HeapRep False 0 2 Thunk{} -> THUNK_0_2 - HeapRep False _ _ Thunk{} -> THUNK + HeapRep False 1 0 Thunk -> THUNK_1_0 + HeapRep False 0 1 Thunk -> THUNK_0_1 + HeapRep False 2 0 Thunk -> THUNK_2_0 + HeapRep False 1 1 Thunk -> THUNK_1_1 + HeapRep False 0 2 Thunk -> THUNK_0_2 + HeapRep False _ _ Thunk -> THUNK HeapRep False _ _ ThunkSelector{} -> THUNK_SELECTOR - HeapRep True _ _ Fun{} -> FUN_STATIC - HeapRep True _ _ Thunk{} -> THUNK_STATIC - - HeapRep False _ _ BlackHole{} -> BLACKHOLE - - HeapRep False _ _ IndStatic{} -> IND_STATIC + HeapRep True _ _ Fun{} -> FUN_STATIC + HeapRep True _ _ Thunk -> THUNK_STATIC + HeapRep False _ _ BlackHole -> BLACKHOLE + HeapRep False _ _ IndStatic -> IND_STATIC _ -> panic "rtsClosureType" |