X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2FbasicTypes%2FUnique.lhs;h=5c76485b9591e3702bdf68279bdeb8080a6089db;hb=f1e626d0add71aa523457c55c28c8e53d77e5a58;hp=81e137ded156fd7dc1d5802d998bd4e034bee051;hpb=aae367819798b0883de61ea4d91ea2c47452884e;p=ghc-hetmet.git diff --git a/ghc/compiler/basicTypes/Unique.lhs b/ghc/compiler/basicTypes/Unique.lhs index 81e137d..5c76485 100644 --- a/ghc/compiler/basicTypes/Unique.lhs +++ b/ghc/compiler/basicTypes/Unique.lhs @@ -16,7 +16,7 @@ Haskell). \begin{code} module Unique ( - Unique, Uniquable(..), + Unique, Uniquable(..), hasKey, u2i, -- hack: used in UniqFM pprUnique, pprUnique10, @@ -26,17 +26,18 @@ module Unique ( getKey, -- Used in Var only! incrUnique, -- Used for renumbering + deriveUnique, -- Ditto initTyVarUnique, initTidyUniques, + isTupleKey, + -- now all the built-in Uniques (and functions to make them) -- [the Oh-So-Wonderful Haskell module system wins again...] mkAlphaTyVarUnique, mkPrimOpIdUnique, mkTupleDataConUnique, - mkUbxTupleDataConUnique, mkTupleTyConUnique, - mkUbxTupleTyConUnique, getBuiltinUniques, mkBuiltinUnique, mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3, @@ -49,6 +50,7 @@ module Unique ( arrayPrimTyConKey, assertIdKey, augmentIdKey, + bcoPrimTyConKey, bindIOIdKey, boolTyConKey, boundedClassKey, @@ -135,7 +137,6 @@ module Unique ( ordClassKey, orderingTyConKey, otherwiseIdKey, - packCStringIdKey, parErrorIdKey, parIdKey, patErrorIdKey, @@ -151,7 +152,9 @@ module Unique ( recConErrorIdKey, recSelErrIdKey, recUpdErrorIdKey, + returnIOIdKey, returnMClassOpKey, + runSTRepIdKey, showClassKey, ioTyConKey, ioDataConKey, @@ -174,7 +177,7 @@ module Unique ( trueDataConKey, unboundKey, unboxedConKey, - unpackCString2IdKey, + unpackCStringUtf8IdKey, unpackCStringAppendIdKey, unpackCStringFoldrIdKey, unpackCStringIdKey, @@ -194,6 +197,7 @@ module Unique ( #include "HsVersions.h" +import BasicTypes ( Boxity(..) ) import FastString ( FastString, uniqueOfFS ) import GlaExts import ST @@ -232,6 +236,9 @@ mkUniqueGrimily :: Int# -> Unique -- A trap-door for UniqSupply getKey :: Unique -> Int# -- for Var incrUnique :: Unique -> Unique +deriveUnique :: Unique -> Int -> Unique + +isTupleKey :: Unique -> Bool \end{code} @@ -243,6 +250,10 @@ getKey (MkUnique x) = x incrUnique (MkUnique i) = MkUnique (i +# 1#) +-- deriveUnique uses an 'X' tag so that it won't clash with +-- any of the uniques produced any other way +deriveUnique (MkUnique i) delta = mkUnique 'X' (I# i + delta) + -- pop the Char in the top 8 bits of the Unique(Supply) -- No 64-bit bugs here, as long as we have at least 32 bits. --JSM @@ -252,12 +263,15 @@ i2w x = int2Word# x i2w_s x = (x::Int#) mkUnique (C# c) (I# i) - = MkUnique (w2i (((i2w (ord# c)) `shiftL#` (i2w_s 24#)) `or#` (i2w i))) + = MkUnique (w2i (tag `or#` bits)) + where + tag = i2w (ord# c) `shiftL#` i2w_s 24# + bits = i2w i `and#` (i2w 16777215#){-``0x00ffffff''-} unpkUnique (MkUnique u) = let tag = C# (chr# (w2i ((i2w u) `shiftr` (i2w_s 24#)))) - i = I# (w2i ((i2w u) `and#` (i2w 16777215#){-``0x00ffffff''-})) + i = I# (w2i ((i2w u) `and#` (i2w 16777215#){-``0x00ffffff''-})) in (tag, i) where @@ -276,6 +290,9 @@ unpkUnique (MkUnique u) class Uniquable a where getUnique :: a -> Unique +hasKey :: Uniquable a => a -> Unique -> Bool +x `hasKey` k = getUnique x == k + instance Uniquable FastString where getUnique fs = mkUniqueGrimily (uniqueOfFS fs) @@ -364,7 +381,11 @@ iToBase62 :: Int -> SDoc iToBase62 n@(I# n#) = ASSERT(n >= 0) let +#if __GLASGOW_HASKELL__ < 405 bytes = case chars62 of { BYTE_ARRAY bounds_who_needs_'em bytes -> bytes } +#else + bytes = case chars62 of { BYTE_ARRAY _ _ bytes -> bytes } +#endif in if n# <# 62# then case (indexCharArray# bytes n#) of { c -> @@ -403,6 +424,7 @@ Allocation of unique supply characters: other a-z: lower case chars for unique supplies (see Main.lhs) B: builtin C-E: pseudo uniques (used in native-code generator) + X: uniques derived by deriveUnique _: unifiable tyvars (above) 0-9: prelude things below @@ -411,12 +433,23 @@ mkAlphaTyVarUnique i = mkUnique '1' i mkPreludeClassUnique i = mkUnique '2' i mkPreludeTyConUnique i = mkUnique '3' i -mkTupleTyConUnique a = mkUnique '4' a -mkUbxTupleTyConUnique a = mkUnique '5' a +mkTupleTyConUnique Boxed a = mkUnique '4' a +mkTupleTyConUnique Unboxed a = mkUnique '5' a -mkPreludeDataConUnique i = mkUnique '6' i -- must be alphabetic -mkTupleDataConUnique a = mkUnique '7' a -- ditto (*may* be used in C labels) -mkUbxTupleDataConUnique a = mkUnique '8' a +-- Data constructor keys occupy *two* slots. The first is used for the +-- data constructor itself and its wrapper function (the function that +-- evaluates arguments as necessary and calls the worker). The second is +-- used for the worker function (the function that builds the constructor +-- representation). + +mkPreludeDataConUnique i = mkUnique '6' (2*i) -- Must be alphabetic +mkTupleDataConUnique Boxed a = mkUnique '7' (2*a) -- ditto (*may* be used in C labels) +mkTupleDataConUnique Unboxed a = mkUnique '8' (2*a) + +-- This one is used for a tiresome reason +-- to improve a consistency-checking error check in the renamer +isTupleKey u = case unpkUnique u of + (tag,_) -> tag == '4' || tag == '5' || tag == '7' || tag == '8' mkPrimOpIdUnique op = mkUnique '9' op mkPreludeMiscIdUnique i = mkUnique '0' i @@ -430,13 +463,15 @@ initTyVarUnique = mkUnique 't' 0 initTidyUniques :: (Unique, Unique) -- Global and local initTidyUniques = (mkUnique 'g' 0, mkUnique 'x' 0) -mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3, - mkBuiltinUnique :: Int -> Unique +mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3, + mkBuiltinUnique :: Int -> Unique mkBuiltinUnique i = mkUnique 'B' i mkPseudoUnique1 i = mkUnique 'C' i -- used for getUnique on Regs -mkPseudoUnique2 i = mkUnique 'D' i -- ditto -mkPseudoUnique3 i = mkUnique 'E' i -- ditto +mkPseudoUnique2 i = mkUnique 'D' i -- used in NCG for getUnique on RealRegs +mkPseudoUnique3 i = mkUnique 'E' i -- used in NCG spiller to create spill VirtualRegs + + getBuiltinUniques :: Int -> [Unique] getBuiltinUniques n = map (mkUnique 'B') [1 .. n] @@ -533,6 +568,7 @@ kindConKey = mkPreludeTyConUnique 67 boxityConKey = mkPreludeTyConUnique 68 typeConKey = mkPreludeTyConUnique 69 threadIdPrimTyConKey = mkPreludeTyConUnique 70 +bcoPrimTyConKey = mkPreludeTyConUnique 71 \end{code} %************************************************************************ @@ -542,24 +578,24 @@ threadIdPrimTyConKey = mkPreludeTyConUnique 70 %************************************************************************ \begin{code} -addrDataConKey = mkPreludeDataConUnique 1 -charDataConKey = mkPreludeDataConUnique 2 -consDataConKey = mkPreludeDataConUnique 3 -doubleDataConKey = mkPreludeDataConUnique 4 -falseDataConKey = mkPreludeDataConUnique 5 -floatDataConKey = mkPreludeDataConUnique 6 -intDataConKey = mkPreludeDataConUnique 7 -smallIntegerDataConKey = mkPreludeDataConUnique 12 -largeIntegerDataConKey = mkPreludeDataConUnique 13 -foreignObjDataConKey = mkPreludeDataConUnique 14 -nilDataConKey = mkPreludeDataConUnique 15 -ratioDataConKey = mkPreludeDataConUnique 16 -stablePtrDataConKey = mkPreludeDataConUnique 17 -stableNameDataConKey = mkPreludeDataConUnique 18 -trueDataConKey = mkPreludeDataConUnique 34 -wordDataConKey = mkPreludeDataConUnique 35 -stDataConKey = mkPreludeDataConUnique 40 -ioDataConKey = mkPreludeDataConUnique 42 +addrDataConKey = mkPreludeDataConUnique 0 +charDataConKey = mkPreludeDataConUnique 1 +consDataConKey = mkPreludeDataConUnique 2 +doubleDataConKey = mkPreludeDataConUnique 3 +falseDataConKey = mkPreludeDataConUnique 4 +floatDataConKey = mkPreludeDataConUnique 5 +intDataConKey = mkPreludeDataConUnique 6 +smallIntegerDataConKey = mkPreludeDataConUnique 7 +largeIntegerDataConKey = mkPreludeDataConUnique 8 +foreignObjDataConKey = mkPreludeDataConUnique 9 +nilDataConKey = mkPreludeDataConUnique 10 +ratioDataConKey = mkPreludeDataConUnique 11 +stablePtrDataConKey = mkPreludeDataConUnique 12 +stableNameDataConKey = mkPreludeDataConUnique 13 +trueDataConKey = mkPreludeDataConUnique 14 +wordDataConKey = mkPreludeDataConUnique 15 +stDataConKey = mkPreludeDataConUnique 16 +ioDataConKey = mkPreludeDataConUnique 17 \end{code} %************************************************************************ @@ -587,7 +623,6 @@ irrefutPatErrorIdKey = mkPreludeMiscIdUnique 15 lexIdKey = mkPreludeMiscIdUnique 16 noMethodBindingErrorIdKey = mkPreludeMiscIdUnique 17 nonExhaustiveGuardsErrorIdKey = mkPreludeMiscIdUnique 18 -packCStringIdKey = mkPreludeMiscIdUnique 19 parErrorIdKey = mkPreludeMiscIdUnique 20 parIdKey = mkPreludeMiscIdUnique 21 patErrorIdKey = mkPreludeMiscIdUnique 22 @@ -595,7 +630,7 @@ realWorldPrimIdKey = mkPreludeMiscIdUnique 23 recConErrorIdKey = mkPreludeMiscIdUnique 24 recUpdErrorIdKey = mkPreludeMiscIdUnique 25 traceIdKey = mkPreludeMiscIdUnique 26 -unpackCString2IdKey = mkPreludeMiscIdUnique 27 +unpackCStringUtf8IdKey = mkPreludeMiscIdUnique 27 unpackCStringAppendIdKey = mkPreludeMiscIdUnique 28 unpackCStringFoldrIdKey = mkPreludeMiscIdUnique 29 unpackCStringIdKey = mkPreludeMiscIdUnique 30 @@ -605,9 +640,10 @@ concatIdKey = mkPreludeMiscIdUnique 33 filterIdKey = mkPreludeMiscIdUnique 34 zipIdKey = mkPreludeMiscIdUnique 35 bindIOIdKey = mkPreludeMiscIdUnique 36 -deRefStablePtrIdKey = mkPreludeMiscIdUnique 37 -makeStablePtrIdKey = mkPreludeMiscIdUnique 38 -getTagIdKey = mkPreludeMiscIdUnique 39 +returnIOIdKey = mkPreludeMiscIdUnique 37 +deRefStablePtrIdKey = mkPreludeMiscIdUnique 38 +makeStablePtrIdKey = mkPreludeMiscIdUnique 39 +getTagIdKey = mkPreludeMiscIdUnique 40 \end{code} Certain class operations from Prelude classes. They get their own @@ -640,4 +676,5 @@ mapIdKey = mkPreludeMiscIdUnique 120 \begin{code} assertIdKey = mkPreludeMiscIdUnique 121 +runSTRepIdKey = mkPreludeMiscIdUnique 122 \end{code}