%
-% (c) The University of Glasgow 2000
+% (c) The University of Glasgow 2000-2006
%
-\section[ByteCodeItbls]{Generate infotables for interpreter-made bytecodes}
+ByteCodeItbls: Generate infotables for interpreter-made bytecodes
\begin{code}
-
{-# OPTIONS -optc-DNON_POSIX_SOURCE #-}
module ByteCodeItbls ( ItblEnv, ItblPtr, mkITbls ) where
import Foreign
import Foreign.C
-import DATA_BITS ( Bits(..), shiftR )
+import Data.Bits ( Bits(..), shiftR )
import GHC.Exts ( Int(I#), addr2Int# )
-#if __GLASGOW_HASKELL__ < 503
-import Ptr ( Ptr(..) )
-#else
import GHC.Ptr ( Ptr(..) )
-#endif
\end{code}
%************************************************************************
| ptrs + nptrs >= mIN_PAYLOAD_SIZE = nptrs
| otherwise = mIN_PAYLOAD_SIZE - ptrs
itbl = StgInfoTable {
+#ifndef GHCI_TABLES_NEXT_TO_CODE
+ entry = entry_addr,
+#endif
ptrs = fromIntegral ptrs,
nptrs = fromIntegral nptrs_really,
tipe = fromIntegral cONSTR,
- srtlen = fromIntegral conNo,
- code = code
+ srtlen = fromIntegral conNo
+#ifdef GHCI_TABLES_NEXT_TO_CODE
+ , code = code
+#endif
}
-- Make a piece of code to jump to "entry_label".
-- This is the only arch-dependent bit.
--putStrLn ("# ptrs of itbl is " ++ show ptrs)
--putStrLn ("# nptrs of itbl is " ++ show nptrs_really)
poke addr itbl
- return (getName dcon, addr `plusPtr` (2 * wORD_SIZE))
+ return (getName dcon, addr
+#ifdef GHCI_TABLES_NEXT_TO_CODE
+ `plusPtr` (2 * wORD_SIZE)
+#endif
+ )
-- Make code which causes a jump to the given address. This is the
#endif
data StgInfoTable = StgInfoTable {
+#ifndef GHCI_TABLES_NEXT_TO_CODE
+ entry :: Ptr (),
+#endif
ptrs :: HalfWord,
nptrs :: HalfWord,
tipe :: HalfWord,
- srtlen :: HalfWord,
- code :: [ItblCode]
-}
+ srtlen :: HalfWord
+#ifdef GHCI_TABLES_NEXT_TO_CODE
+ , code :: [ItblCode]
+#endif
+ }
instance Storable StgInfoTable where
sizeOf itbl
= sum
- [fieldSz ptrs itbl,
+ [
+#ifndef GHCI_TABLES_NEXT_TO_CODE
+ fieldSz entry itbl,
+#endif
+ fieldSz ptrs itbl,
fieldSz nptrs itbl,
fieldSz tipe itbl,
- fieldSz srtlen itbl,
- fieldSz (head.code) itbl * itblCodeLength]
+ fieldSz srtlen itbl
+#ifdef GHCI_TABLES_NEXT_TO_CODE
+ ,fieldSz (head.code) itbl * itblCodeLength
+#endif
+ ]
alignment itbl
= SIZEOF_VOID_P
poke a0 itbl
= runState (castPtr a0)
- $ do store (ptrs itbl)
+ $ do
+#ifndef GHCI_TABLES_NEXT_TO_CODE
+ store (entry itbl)
+#endif
+ store (ptrs itbl)
store (nptrs itbl)
store (tipe itbl)
store (srtlen itbl)
+#ifdef GHCI_TABLES_NEXT_TO_CODE
sequence_ (map store (code itbl))
+#endif
peek a0
= runState (castPtr a0)
- $ do ptrs <- load
+ $ do
+#ifndef GHCI_TABLES_NEXT_TO_CODE
+ entry <- load
+#endif
+ ptrs <- load
nptrs <- load
tipe <- load
srtlen <- load
+#ifdef GHCI_TABLES_NEXT_TO_CODE
code <- sequence (replicate itblCodeLength load)
+#endif
return
StgInfoTable {
+#ifndef GHCI_TABLES_NEXT_TO_CODE
+ entry = entry,
+#endif
ptrs = ptrs,
nptrs = nptrs,
tipe = tipe,
- srtlen = srtlen,
- code = code
+ srtlen = srtlen
+#ifdef GHCI_TABLES_NEXT_TO_CODE
+ ,code = code
+#endif
}
fieldSz :: (Storable a, Storable b) => (a -> b) -> a -> Int
load = do addr <- advance
lift (peek addr)
-foreign import ccall unsafe "stgMallocBytesRWX"
- _stgMallocBytesRWX :: CInt -> IO (Ptr a)
+foreign import ccall unsafe "allocateExec"
+ _allocateExec :: CUInt -> IO (Ptr a)
malloc_exec :: Int -> IO (Ptr a)
-malloc_exec bytes = _stgMallocBytesRWX (fromIntegral bytes)
+malloc_exec bytes = _allocateExec (fromIntegral bytes)
\end{code}