X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FPrelude.h;h=86bb6099fb6a0fa2962a69426f260c03f2d07575;hp=2a6ca9158d685f3e021dc9a071620da0254b5240;hb=HEAD;hpb=80a766fdb6864eae613962e43ad9eb371e0ce80c diff --git a/rts/Prelude.h b/rts/Prelude.h index 2a6ca91..86bb609 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -16,16 +16,16 @@ #define PRELUDE_INFO(i) extern W_(i)[] #define PRELUDE_CLOSURE(i) extern W_(i)[] #else -#define PRELUDE_INFO(i) extern DLL_IMPORT const StgInfoTable i -#define PRELUDE_CLOSURE(i) extern DLL_IMPORT StgClosure i +#define PRELUDE_INFO(i) extern const StgInfoTable DLL_IMPORT_DATA_VARNAME(i) +#define PRELUDE_CLOSURE(i) extern StgClosure DLL_IMPORT_DATA_VARNAME(i) #endif /* Define canonical names so we can abstract away from the actual * modules these names are defined in. */ -PRELUDE_CLOSURE(base_GHCziBase_True_closure); -PRELUDE_CLOSURE(base_GHCziBase_False_closure); +PRELUDE_CLOSURE(ghczmprim_GHCziTypes_True_closure); +PRELUDE_CLOSURE(ghczmprim_GHCziTypes_False_closure); PRELUDE_CLOSURE(base_GHCziPack_unpackCString_closure); PRELUDE_CLOSURE(base_GHCziWeak_runFinalizzerBatch_closure); @@ -35,19 +35,22 @@ extern W_ ZCMain_main_closure[]; extern StgClosure ZCMain_main_closure; #endif -PRELUDE_CLOSURE(base_GHCziIOBase_stackOverflow_closure); -PRELUDE_CLOSURE(base_GHCziIOBase_heapOverflow_closure); -PRELUDE_CLOSURE(base_GHCziIOBase_BlockedOnDeadMVar_closure); -PRELUDE_CLOSURE(base_GHCziIOBase_BlockedIndefinitely_closure); -PRELUDE_CLOSURE(base_GHCziIOBase_NonTermination_closure); -PRELUDE_CLOSURE(base_GHCziIOBase_NestedAtomically_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_stackOverflow_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_heapOverflow_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitelyOnThrowTo_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitelyOnMVar_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitelyOnSTM_closure); +PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure); +PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure); -PRELUDE_CLOSURE(base_GHCziConc_ensureIOManagerIsRunning_closure); +PRELUDE_CLOSURE(base_GHCziConcziSync_runSparks_closure); +PRELUDE_CLOSURE(base_GHCziConcziIO_ensureIOManagerIsRunning_closure); +PRELUDE_CLOSURE(base_GHCziConcziSignal_runHandlers_closure); -PRELUDE_INFO(base_GHCziBase_Czh_static_info); -PRELUDE_INFO(base_GHCziBase_Izh_static_info); -PRELUDE_INFO(base_GHCziFloat_Fzh_static_info); -PRELUDE_INFO(base_GHCziFloat_Dzh_static_info); +PRELUDE_INFO(ghczmprim_GHCziTypes_Czh_static_info); +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); @@ -60,10 +63,10 @@ PRELUDE_INFO(base_GHCziWord_W8zh_static_info); PRELUDE_INFO(base_GHCziWord_W16zh_static_info); PRELUDE_INFO(base_GHCziWord_W32zh_static_info); PRELUDE_INFO(base_GHCziWord_W64zh_static_info); -PRELUDE_INFO(base_GHCziBase_Czh_con_info); -PRELUDE_INFO(base_GHCziBase_Izh_con_info); -PRELUDE_INFO(base_GHCziFloat_Fzh_con_info); -PRELUDE_INFO(base_GHCziFloat_Dzh_con_info); +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_Addr_Azh_con_info); @@ -79,53 +82,57 @@ PRELUDE_INFO(base_GHCziWord_W64zh_con_info); PRELUDE_INFO(base_GHCziStable_StablePtr_static_info); PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); -#define True_closure (&base_GHCziBase_True_closure) -#define False_closure (&base_GHCziBase_False_closure) -#define unpackCString_closure (&base_GHCziPack_unpackCString_closure) -#define runFinalizerBatch_closure (&base_GHCziWeak_runFinalizzerBatch_closure) +#define True_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_True_closure) +#define False_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_False_closure) +#define unpackCString_closure DLL_IMPORT_DATA_REF(base_GHCziPack_unpackCString_closure) +#define runFinalizerBatch_closure DLL_IMPORT_DATA_REF(base_GHCziWeak_runFinalizzerBatch_closure) #define mainIO_closure (&ZCMain_main_closure) -#define stackOverflow_closure (&base_GHCziIOBase_stackOverflow_closure) -#define heapOverflow_closure (&base_GHCziIOBase_heapOverflow_closure) -#define BlockedOnDeadMVar_closure (&base_GHCziIOBase_BlockedOnDeadMVar_closure) -#define BlockedIndefinitely_closure (&base_GHCziIOBase_BlockedIndefinitely_closure) -#define NonTermination_closure (&base_GHCziIOBase_NonTermination_closure) -#define NestedAtomically_closure (&base_GHCziIOBase_NestedAtomically_closure) +#define runSparks_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSync_runSparks_closure) +#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ensureIOManagerIsRunning_closure) +#define runHandlers_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSignal_runHandlers_closure) -#define Czh_static_info (&base_GHCziBase_Czh_static_info) -#define Fzh_static_info (&base_GHCziFloat_Fzh_static_info) -#define Dzh_static_info (&base_GHCziFloat_Dzh_static_info) -#define Azh_static_info (&base_Addr_Azh_static_info) -#define Izh_static_info (&base_GHCziBase_Izh_static_info) -#define I8zh_static_info (&base_GHCziInt_I8zh_static_info) -#define I16zh_static_info (&base_GHCziInt_I16zh_static_info) -#define I32zh_static_info (&base_GHCziInt_I32zh_static_info) -#define I64zh_static_info (&base_GHCziInt_I64zh_static_info) -#define Wzh_static_info (&base_GHCziWord_Wzh_static_info) -#define W8zh_static_info (&base_GHCziWord_W8zh_static_info) -#define W16zh_static_info (&base_GHCziWord_W16zh_static_info) -#define W32zh_static_info (&base_GHCziWord_W32zh_static_info) -#define W64zh_static_info (&base_GHCziWord_W64zh_static_info) -#define Ptr_static_info (&base_GHCziPtr_Ptr_static_info) -#define FunPtr_static_info (&base_GHCziPtr_FunPtr_static_info) -#define Czh_con_info (&base_GHCziBase_Czh_con_info) -#define Izh_con_info (&base_GHCziBase_Izh_con_info) -#define Fzh_con_info (&base_GHCziFloat_Fzh_con_info) -#define Dzh_con_info (&base_GHCziFloat_Dzh_con_info) -#define Azh_con_info (&base_Addr_Azh_con_info) -#define Wzh_con_info (&base_GHCziWord_Wzh_con_info) -#define W8zh_con_info (&base_GHCziWord_W8zh_con_info) -#define W16zh_con_info (&base_GHCziWord_W16zh_con_info) -#define W32zh_con_info (&base_GHCziWord_W32zh_con_info) -#define W64zh_con_info (&base_GHCziWord_W64zh_con_info) -#define I8zh_con_info (&base_GHCziInt_I8zh_con_info) -#define I16zh_con_info (&base_GHCziInt_I16zh_con_info) -#define I32zh_con_info (&base_GHCziInt_I32zh_con_info) -#define I64zh_con_info (&base_GHCziInt_I64zh_con_info) -#define I64zh_con_info (&base_GHCziInt_I64zh_con_info) -#define Ptr_con_info (&base_GHCziPtr_Ptr_con_info) -#define FunPtr_con_info (&base_GHCziPtr_FunPtr_con_info) -#define StablePtr_static_info (&base_GHCziStable_StablePtr_static_info) -#define StablePtr_con_info (&base_GHCziStable_StablePtr_con_info) +#define stackOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_stackOverflow_closure) +#define heapOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_heapOverflow_closure) +#define blockedIndefinitelyOnMVar_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedIndefinitelyOnMVar_closure) +#define blockedIndefinitelyOnSTM_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedIndefinitelyOnSTM_closure) +#define nonTermination_closure DLL_IMPORT_DATA_REF(base_ControlziExceptionziBase_nonTermination_closure) +#define nestedAtomically_closure DLL_IMPORT_DATA_REF(base_ControlziExceptionziBase_nestedAtomically_closure) + +#define Czh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Czh_static_info) +#define Fzh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Fzh_static_info) +#define Dzh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Dzh_static_info) +#define Azh_static_info DLL_IMPORT_DATA_REF(base_Addr_Azh_static_info) +#define Izh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Izh_static_info) +#define I8zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I8zh_static_info) +#define I16zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I16zh_static_info) +#define I32zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I32zh_static_info) +#define I64zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I64zh_static_info) +#define Wzh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_Wzh_static_info) +#define W8zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W8zh_static_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 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) +#define Dzh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Dzh_con_info) +#define Azh_con_info DLL_IMPORT_DATA_REF(base_Addr_Azh_con_info) +#define Wzh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_Wzh_con_info) +#define W8zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W8zh_con_info) +#define W16zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W16zh_con_info) +#define W32zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W32zh_con_info) +#define W64zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W64zh_con_info) +#define I8zh_con_info DLL_IMPORT_DATA_REF(base_GHCziInt_I8zh_con_info) +#define I16zh_con_info DLL_IMPORT_DATA_REF(base_GHCziInt_I16zh_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) #endif /* PRELUDE_H */