X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FPrelude.h;h=86bb6099fb6a0fa2962a69426f260c03f2d07575;hp=f483650e7c762223443c40fb7838bee3b2c0e1b2;hb=HEAD;hpb=aa9a4f1053d3c554629a2ec25955e7530c95b892

diff --git a/rts/Prelude.h b/rts/Prelude.h
index f483650..86bb609 100644
--- a/rts/Prelude.h
+++ b/rts/Prelude.h
@@ -24,8 +24,8 @@
  * modules these names are defined in.
  */
 
-PRELUDE_CLOSURE(ghczmprim_GHCziBool_True_closure);
-PRELUDE_CLOSURE(ghczmprim_GHCziBool_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_ControlziException_nonTermination_closure);
-PRELUDE_CLOSURE(base_ControlziException_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,24 +82,28 @@ PRELUDE_INFO(base_GHCziWord_W64zh_con_info);
 PRELUDE_INFO(base_GHCziStable_StablePtr_static_info);
 PRELUDE_INFO(base_GHCziStable_StablePtr_con_info);
 
-#define True_closure              DLL_IMPORT_DATA_REF(ghczmprim_GHCziBool_True_closure)
-#define False_closure             DLL_IMPORT_DATA_REF(ghczmprim_GHCziBool_False_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     DLL_IMPORT_DATA_REF(base_GHCziIOBase_stackOverflow_closure)
-#define heapOverflow_closure      DLL_IMPORT_DATA_REF(base_GHCziIOBase_heapOverflow_closure)
-#define BlockedOnDeadMVar_closure DLL_IMPORT_DATA_REF(base_GHCziIOBase_BlockedOnDeadMVar_closure)
-#define BlockedIndefinitely_closure DLL_IMPORT_DATA_REF(base_GHCziIOBase_BlockedIndefinitely_closure)
-#define nonTermination_closure    DLL_IMPORT_DATA_REF(base_ControlziException_nonTermination_closure)
-#define NestedAtomically_closure  DLL_IMPORT_DATA_REF(base_ControlziException_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           DLL_IMPORT_DATA_REF(base_GHCziBase_Czh_static_info)
-#define Fzh_static_info           DLL_IMPORT_DATA_REF(base_GHCziFloat_Fzh_static_info)
-#define Dzh_static_info           DLL_IMPORT_DATA_REF(base_GHCziFloat_Dzh_static_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(base_GHCziBase_Izh_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)
@@ -108,10 +115,10 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_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(base_GHCziBase_Czh_con_info)
-#define Izh_con_info              DLL_IMPORT_DATA_REF(base_GHCziBase_Izh_con_info)
-#define Fzh_con_info              DLL_IMPORT_DATA_REF(base_GHCziFloat_Fzh_con_info)
-#define Dzh_con_info              DLL_IMPORT_DATA_REF(base_GHCziFloat_Dzh_con_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)