x86-64: fix a problem exposed by negative offsets in vector tables

[ghc-hetmet.git] / compiler / prelude / PrelNames.lhs

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index d656fbf..9fd1419 100644 (file)
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -110,8 +110,6 @@ basicKnownKeyNames
        rationalTyConName,
        ratioDataConName,
        ratioTyConName,
-       byteArrayTyConName,
-       mutableByteArrayTyConName,
        integerTyConName, smallIntegerDataConName, largeIntegerDataConName,
 
        --  Classes.  *Must* include:
@@ -186,8 +184,8 @@ basicKnownKeyNames
        -- Others
        otherwiseIdName, 
        plusIntegerName, timesIntegerName,
-       eqStringName, assertName, breakpointName, assertErrorName,
-        runSTRepName,
+       eqStringName, assertName, breakpointName, breakpointCondName,
+        assertErrorName, runSTRepName,
        printName, fstName, sndName,
 
        -- MonadFix
@@ -240,7 +238,6 @@ pREL_CONC   = mkModule "GHC.Conc"
 pREL_IO_BASE   = mkModule "GHC.IOBase"
 pREL_ST                = mkModule "GHC.ST"
 pREL_ARR       = mkModule "GHC.Arr"
-pREL_BYTEARR   = mkModule "PrelByteArr"
 pREL_STABLE    = mkModule "GHC.Stable"
 pREL_ADDR      = mkModule "GHC.Addr"
 pREL_PTR       = mkModule "GHC.Ptr"
@@ -456,6 +453,9 @@ unpackCStringFoldrName  = varQual pREL_BASE FSLIT("unpackFoldrCString#") unpackC
 unpackCStringUtf8Name   = varQual pREL_BASE FSLIT("unpackCStringUtf8#") unpackCStringUtf8IdKey
 eqStringName           = varQual pREL_BASE FSLIT("eqString")  eqStringIdKey
 
+-- The 'inline' function
+inlineIdName           = varQual pREL_BASE FSLIT("inline") inlineIdKey
+
 -- Base classes (Eq, Ord, Functor)
 eqClassName      = clsQual pREL_BASE FSLIT("Eq")      eqClassKey
 eqName           = methName eqClassName FSLIT("==")   eqClassOpKey
@@ -480,11 +480,17 @@ andName             = varQual pREL_BASE FSLIT("&&")         andIdKey
 orName           = varQual pREL_BASE FSLIT("||")         orIdKey
 assertName        = varQual pREL_BASE FSLIT("assert")     assertIdKey
 breakpointName    = varQual pREL_BASE FSLIT("breakpoint") breakpointIdKey
+breakpointCondName= varQual pREL_BASE FSLIT("breakpointCond") breakpointCondIdKey
 breakpointJumpName
     = mkInternalName
         breakpointJumpIdKey
         (mkOccNameFS varName FSLIT("breakpointJump"))
         noSrcLoc
+breakpointCondJumpName
+    = mkInternalName
+        breakpointCondJumpIdKey
+        (mkOccNameFS varName FSLIT("breakpointCondJump"))
+        noSrcLoc
 
 -- PrelTup
 fstName                  = varQual pREL_TUP FSLIT("fst") fstIdKey
@@ -605,10 +611,6 @@ addrTyConName        = tcQual   aDDR FSLIT("Addr") addrTyConKey
 ptrTyConName     = tcQual   pREL_PTR FSLIT("Ptr") ptrTyConKey
 funPtrTyConName          = tcQual   pREL_PTR FSLIT("FunPtr") funPtrTyConKey
 
--- Byte array types
-byteArrayTyConName       = tcQual pREL_BYTEARR  FSLIT("ByteArray") byteArrayTyConKey
-mutableByteArrayTyConName = tcQual pREL_BYTEARR  FSLIT("MutableByteArray") mutableByteArrayTyConKey
-
 -- Foreign objects and weak pointers
 stablePtrTyConName    = tcQual   pREL_STABLE FSLIT("StablePtr") stablePtrTyConKey
 newStablePtrName      = varQual  pREL_STABLE FSLIT("newStablePtr") newStablePtrIdKey
@@ -762,10 +764,8 @@ stablePtrTyConKey                  = mkPreludeTyConUnique 36
 statePrimTyConKey                      = mkPreludeTyConUnique 50
 stableNamePrimTyConKey                 = mkPreludeTyConUnique 51
 stableNameTyConKey                     = mkPreludeTyConUnique 52
-mutableByteArrayTyConKey               = mkPreludeTyConUnique 53
 mutVarPrimTyConKey                     = mkPreludeTyConUnique 55
 ioTyConKey                             = mkPreludeTyConUnique 56
-byteArrayTyConKey                      = mkPreludeTyConUnique 57
 wordPrimTyConKey                       = mkPreludeTyConUnique 58
 wordTyConKey                           = mkPreludeTyConUnique 59
 word8TyConKey                          = mkPreludeTyConUnique 60
@@ -910,7 +910,11 @@ lazyIdKey                = mkPreludeMiscIdUnique 60
 assertErrorIdKey             = mkPreludeMiscIdUnique 61
 
 breakpointIdKey               = mkPreludeMiscIdUnique 62
-breakpointJumpIdKey           = mkPreludeMiscIdUnique 63
+breakpointCondIdKey           = mkPreludeMiscIdUnique 63
+breakpointJumpIdKey           = mkPreludeMiscIdUnique 64
+breakpointCondJumpIdKey       = mkPreludeMiscIdUnique 65
+
+inlineIdKey                  = mkPreludeMiscIdUnique 66
 
 -- Parallel array functions
 nullPIdKey                   = mkPreludeMiscIdUnique 80
@@ -998,8 +1002,6 @@ numericTyKeys =
 cCallishTyKeys = 
        [ addrTyConKey
        , wordTyConKey
-       , byteArrayTyConKey
-       , mutableByteArrayTyConKey
        , stablePtrTyConKey
        , int8TyConKey
        , int16TyConKey