Changes for the new IO library, mainly base-package modules moving around

[ghc-hetmet.git] / rts / Prelude.h

diff --git a/rts/Prelude.h b/rts/Prelude.h
index f483650..b27fa27 100644 (file)
--- a/rts/Prelude.h
+++ b/rts/Prelude.h
@@ -35,19 +35,21 @@ 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_blockedOnDeadMVar_closure);
+PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitely_closure);
+PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure);
+PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure);
 
+PRELUDE_CLOSURE(base_GHCziConc_runSparks_closure);
 PRELUDE_CLOSURE(base_GHCziConc_ensureIOManagerIsRunning_closure);
+PRELUDE_CLOSURE(base_GHCziConc_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 +62,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);
@@ -85,18 +87,18 @@ 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 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 stackOverflow_closure     DLL_IMPORT_DATA_REF(base_GHCziIOziException_stackOverflow_closure)
+#define heapOverflow_closure      DLL_IMPORT_DATA_REF(base_GHCziIOziException_heapOverflow_closure)
+#define blockedOnDeadMVar_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedOnDeadMVar_closure)
+#define blockedIndefinitely_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedIndefinitely_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(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 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 +110,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)