Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/afcbc8add0652b4fba8057b1bb0ff450c9688f76 >--------------------------------------------------------------- commit afcbc8add0652b4fba8057b1bb0ff450c9688f76 Author: David Terei <[email protected]> Date: Sat May 21 15:36:22 2011 -0700 SafeHaskell: More fixing to work with safe base >--------------------------------------------------------------- compiler/ghci/ByteCodeItbls.lhs | 2 +- compiler/prelude/PrelNames.lhs | 4 ++-- compiler/utils/FastMutInt.lhs | 5 ++--- compiler/utils/Pretty.lhs | 10 ++++++---- rts/Prelude.h | 28 ++++++++++++++-------------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/compiler/ghci/ByteCodeItbls.lhs b/compiler/ghci/ByteCodeItbls.lhs index 696ed0f..4ff9e0a 100644 --- a/compiler/ghci/ByteCodeItbls.lhs +++ b/compiler/ghci/ByteCodeItbls.lhs @@ -36,7 +36,7 @@ import Foreign.C.String import Data.Bits ( Bits(..), shiftR ) import GHC.Exts ( Int(I#), addr2Int# ) -import GHC.Ptr ( Ptr(..) ) +import GHC.Ptr.Unsafe ( Ptr(..) ) import Debug.Trace import Text.Printf diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 0c06336..9224051 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -313,9 +313,9 @@ dATA_TRAVERSABLE= mkBaseModule (fsLit "Data.Traversable") gHC_CONC = mkBaseModule (fsLit "GHC.Conc") gHC_IO = mkBaseModule (fsLit "GHC.IO") gHC_IO_Exception = mkBaseModule (fsLit "GHC.IO.Exception") -gHC_ST = mkBaseModule (fsLit "GHC.ST") +gHC_ST = mkBaseModule (fsLit "GHC.ST.Imp") gHC_ARR = mkBaseModule (fsLit "GHC.Arr.Imp") -gHC_STABLE = mkBaseModule (fsLit "GHC.Stable") +gHC_STABLE = mkBaseModule (fsLit "GHC.Stable.Imp") gHC_PTR = mkBaseModule (fsLit "GHC.Ptr.Imp") gHC_ERR = mkBaseModule (fsLit "GHC.Err") gHC_REAL = mkBaseModule (fsLit "GHC.Real") diff --git a/compiler/utils/FastMutInt.lhs b/compiler/utils/FastMutInt.lhs index 8f7de90..b27f9cf 100644 --- a/compiler/utils/FastMutInt.lhs +++ b/compiler/utils/FastMutInt.lhs @@ -26,10 +26,9 @@ module FastMutInt( #endif import GHC.Base +import GHC.Ptr #if __GLASGOW_HASKELL__ >= 701 -import GHC.Ptr.Unsafe ( Ptr(..) ) -#else -import GHC.Ptr ( Ptr(..) ) +import GHC.Ptr.Unsafe #endif #else /* ! __GLASGOW_HASKELL__ */ diff --git a/compiler/utils/Pretty.lhs b/compiler/utils/Pretty.lhs index f0ca69c..7b2702d 100644 --- a/compiler/utils/Pretty.lhs +++ b/compiler/utils/Pretty.lhs @@ -188,13 +188,16 @@ import Panic import StaticFlags import Numeric (fromRat) import System.IO ---import Foreign.Ptr (castPtr) #if defined(__GLASGOW_HASKELL__) --for a RULES import GHC.Base ( unpackCString# ) import GHC.Exts ( Int# ) -import GHC.Ptr ( Ptr(..) ) +#if __GLASGOW_HASKELL__ >= 701 +import GHC.Ptr.Unsafe ( Ptr(..) ) +#else +import GHC.Ptr ( Ptr(..) ) +#endif #endif -- Don't import Util( assertPanic ) because it makes a loop in the module structure @@ -562,8 +565,7 @@ text s = case iUnbox (length s) of {sl -> textBeside_ (Str s) sl Empty} ftext :: FastString -> Doc ftext s = case iUnbox (lengthFS s) of {sl -> textBeside_ (PStr s) sl Empty} ptext :: LitString -> Doc -ptext s_= case iUnbox (lengthLS s) of {sl -> textBeside_ (LStr s sl) sl Empty} - where s = {-castPtr-} s_ +ptext s = case iUnbox (lengthLS s) of {sl -> textBeside_ (LStr s sl) sl Empty} zeroWidthText s = textBeside_ (Str s) (_ILIT(0)) Empty #if defined(__GLASGOW_HASKELL__) diff --git a/rts/Prelude.h b/rts/Prelude.h index 86bb609..e32980e 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -43,7 +43,7 @@ PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitelyOnSTM_closure); PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure); PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure); -PRELUDE_CLOSURE(base_GHCziConcziSync_runSparks_closure); +PRELUDE_CLOSURE(base_GHCziConcziSyncziImp_runSparks_closure); PRELUDE_CLOSURE(base_GHCziConcziIO_ensureIOManagerIsRunning_closure); PRELUDE_CLOSURE(base_GHCziConcziSignal_runHandlers_closure); @@ -52,8 +52,8 @@ PRELUDE_INFO(ghczmprim_GHCziTypes_Izh_static_info); PRELUDE_INFO(ghczmprim_GHCziTypes_Fzh_static_info); PRELUDE_INFO(ghczmprim_GHCziTypes_Dzh_static_info); PRELUDE_INFO(base_Addr_Azh_static_info); -PRELUDE_INFO(base_GHCziPtr_Ptr_static_info); -PRELUDE_INFO(base_GHCziPtr_FunPtr_static_info); +PRELUDE_INFO(base_GHCziPtrziImp_Ptr_static_info); +PRELUDE_INFO(base_GHCziPtrziImp_FunPtr_static_info); PRELUDE_INFO(base_GHCziInt_I8zh_static_info); PRELUDE_INFO(base_GHCziInt_I16zh_static_info); PRELUDE_INFO(base_GHCziInt_I32zh_static_info); @@ -67,8 +67,8 @@ PRELUDE_INFO(ghczmprim_GHCziTypes_Czh_con_info); PRELUDE_INFO(ghczmprim_GHCziTypes_Izh_con_info); PRELUDE_INFO(ghczmprim_GHCziTypes_Fzh_con_info); PRELUDE_INFO(ghczmprim_GHCziTypes_Dzh_con_info); -PRELUDE_INFO(base_GHCziPtr_Ptr_con_info); -PRELUDE_INFO(base_GHCziPtr_FunPtr_con_info); +PRELUDE_INFO(base_GHCziPtrziImp_Ptr_con_info); +PRELUDE_INFO(base_GHCziPtrziImp_FunPtr_con_info); PRELUDE_INFO(base_Addr_Azh_con_info); PRELUDE_INFO(base_GHCziWord_Wzh_con_info); PRELUDE_INFO(base_GHCziInt_I8zh_con_info); @@ -79,8 +79,8 @@ PRELUDE_INFO(base_GHCziWord_W8zh_con_info); PRELUDE_INFO(base_GHCziWord_W16zh_con_info); PRELUDE_INFO(base_GHCziWord_W32zh_con_info); PRELUDE_INFO(base_GHCziWord_W64zh_con_info); -PRELUDE_INFO(base_GHCziStable_StablePtr_static_info); -PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); +PRELUDE_INFO(base_GHCziStableziImp_StablePtr_static_info); +PRELUDE_INFO(base_GHCziStableziImp_StablePtr_con_info); #define True_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_True_closure) #define False_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_False_closure) @@ -88,7 +88,7 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); #define runFinalizerBatch_closure DLL_IMPORT_DATA_REF(base_GHCziWeak_runFinalizzerBatch_closure) #define mainIO_closure (&ZCMain_main_closure) -#define runSparks_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSync_runSparks_closure) +#define runSparks_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSyncziImp_runSparks_closure) #define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ensureIOManagerIsRunning_closure) #define runHandlers_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSignal_runHandlers_closure) @@ -113,8 +113,8 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); #define W16zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W16zh_static_info) #define W32zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W32zh_static_info) #define W64zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W64zh_static_info) -#define Ptr_static_info DLL_IMPORT_DATA_REF(base_GHCziPtr_Ptr_static_info) -#define FunPtr_static_info DLL_IMPORT_DATA_REF(base_GHCziPtr_FunPtr_static_info) +#define Ptr_static_info DLL_IMPORT_DATA_REF(base_GHCziPtrziImp_Ptr_static_info) +#define FunPtr_static_info DLL_IMPORT_DATA_REF(base_GHCziPtrziImp_FunPtr_static_info) #define Czh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Czh_con_info) #define Izh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Izh_con_info) #define Fzh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Fzh_con_info) @@ -130,9 +130,9 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); #define I32zh_con_info DLL_IMPORT_DATA_REF(base_GHCziInt_I32zh_con_info) #define I64zh_con_info DLL_IMPORT_DATA_REF(base_GHCziInt_I64zh_con_info) #define I64zh_con_info DLL_IMPORT_DATA_REF(base_GHCziInt_I64zh_con_info) -#define Ptr_con_info DLL_IMPORT_DATA_REF(base_GHCziPtr_Ptr_con_info) -#define FunPtr_con_info DLL_IMPORT_DATA_REF(base_GHCziPtr_FunPtr_con_info) -#define StablePtr_static_info DLL_IMPORT_DATA_REF(base_GHCziStable_StablePtr_static_info) -#define StablePtr_con_info DLL_IMPORT_DATA_REF(base_GHCziStable_StablePtr_con_info) +#define Ptr_con_info DLL_IMPORT_DATA_REF(base_GHCziPtrziImp_Ptr_con_info) +#define FunPtr_con_info DLL_IMPORT_DATA_REF(base_GHCziPtrziImp_FunPtr_con_info) +#define StablePtr_static_info DLL_IMPORT_DATA_REF(base_GHCziStableziImp_StablePtr_static_info) +#define StablePtr_con_info DLL_IMPORT_DATA_REF(base_GHCziStableziImp_StablePtr_con_info) #endif /* PRELUDE_H */ _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
