Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
43d9be89
Commit
43d9be89
authored
Jun 14, 2008
by
Ian Lynagh
Browse files
Remove more ifdeffery
parent
ba58376a
Changes
2
Hide whitespace changes
Inline
Side-by-side
compiler/ghci/Linker.lhs
View file @
43d9be89
...
...
@@ -230,13 +230,12 @@ dataConInfoPtrToName x = do
-}
getConDescAddress :: Ptr StgInfoTable -> IO (Ptr Word8)
getConDescAddress ptr
= do
#ifdef GHCI_TABLES_NEXT_TO_CODE
getConDescAddress ptr
| ghciTablesNextToCode = do
offsetToString <- peek $ ptr `plusPtr` (- wORD_SIZE)
return $ (ptr `plusPtr` stdInfoTableSizeB) `plusPtr` (fromIntegral (offsetToString :: StgWord))
#else
| otherwise =
peek $ intPtrToPtr $ (ptrToIntPtr ptr) + fromIntegral stdInfoTableSizeB
#endif
-- parsing names is a little bit fiddly because we have a string in the form:
-- pkg:A.B.C.foo, and we want to split it into three parts: ("pkg", "A.B.C", "foo").
...
...
compiler/utils/Util.lhs
View file @
43d9be89
...
...
@@ -6,7 +6,8 @@
\begin{code}
module Util (
debugIsOn, isWindowsHost, isWindowsTarget, isDarwinTarget,
debugIsOn, ghciTablesNextToCode,
isWindowsHost, isWindowsTarget, isDarwinTarget,
-- general list processing
zipEqual, zipWithEqual, zipWith3Equal, zipWith4Equal,
...
...
@@ -118,6 +119,13 @@ debugIsOn = True
debugIsOn = False
#endif
ghciTablesNextToCode :: Bool
#ifdef GHCI_TABLES_NEXT_TO_CODE
ghciTablesNextToCode = True
#else
ghciTablesNextToCode = False
#endif
isWindowsHost :: Bool
#ifdef mingw32_HOST_OS
isWindowsHost = True
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment