[project @ 2000-03-08 17:48:24 by simonmar]

[ghc-hetmet.git] / ghc / rts / StgStartup.hc

diff --git a/ghc/rts/StgStartup.hc b/ghc/rts/StgStartup.hc
index eae409b..631e991 100644 (file)
--- a/ghc/rts/StgStartup.hc
+++ b/ghc/rts/StgStartup.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgStartup.hc,v 1.4 1999/03/15 17:11:27 simonm Exp $
+ * $Id: StgStartup.hc,v 1.6 2000/03/08 17:48:24 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -60,7 +60,7 @@ EXTFUN(stg_stop_thread_entry);
 #define stg_stop_thread_6_entry stg_stop_thread_entry 
 #define stg_stop_thread_7_entry stg_stop_thread_entry 
 
-VEC_POLY_INFO_TABLE(stg_stop_thread,STOP_THREAD_BITMAP,0,0,0,STOP_FRAME);
+VEC_POLY_INFO_TABLE(stg_stop_thread,STOP_THREAD_BITMAP,0,0,0,STOP_FRAME,,EF_);
 
 STGFUN(stg_stop_thread_entry)
 {
@@ -105,7 +105,7 @@ STGFUN(stg_returnToStackTop)
   LoadThreadState();
   CHECK_SENSIBLE_REGS();
   Sp++;
-  JMP_(Sp[-1]);
+  JMP_(ENTRY_CODE(Sp[-1]));
   FE_
 }
 
@@ -131,29 +131,25 @@ STGFUN(stg_enterStackTop)
    Special STG entry points for module registration.
    -------------------------------------------------------------------------- */
 
-#ifdef PROFILING
-
-STGFUN(stg_register_ret)
+STGFUN(stg_init_ret)
 {
   FB_
   JMP_(StgReturn);
   FE_
 }
 
-STGFUN(stg_register)
+STGFUN(stg_init)
 {
-  EF_(_regMain);
-  EF_(_regPrelude);
+  EF_(__init_Main);
+  EF_(__init_Prelude);
   FB_
-  PUSH_REGISTER_STACK(stg_register_ret);
-  PUSH_REGISTER_STACK(_regPrelude);
-  JMP_(_regMain);
+  PUSH_INIT_STACK(stg_init_ret);
+  PUSH_INIT_STACK(__init_Prelude);
+  JMP_(__init_Main);
   FE_
 }
 
 /* PrelGHC doesn't really exist... */
 
-START_REGISTER_CCS(_regPrelGHC);
-END_REGISTER_CCS();
-
-#endif
+START_MOD_INIT(__init_PrelGHC);
+END_MOD_INIT();