/* -----------------------------------------------------------------------------
- * $Id: StgStartup.hc,v 1.2 1998/12/02 13:28:55 simonm Exp $
+ * $Id: StgStartup.hc,v 1.6 2000/03/08 17:48:24 simonmar Exp $
+ *
+ * (c) The GHC Team, 1998-1999
*
* Code for starting, stopping and restarting threads.
*
#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)
{
/* Move Su just off the end of the stack, we're about to spam the
* STOP_FRAME with the return value.
*/
- Su = stgCast(StgUpdateFrame*,Sp+1);
- *stgCast(StgClosure**,Sp) = R1.cl;
+ Su = (StgUpdateFrame *)(Sp+1);
+ Sp[0] = R1.w;
SaveThreadState(); /* inline! */
LoadThreadState();
CHECK_SENSIBLE_REGS();
Sp++;
- JMP_(Sp[-1]);
+ JMP_(ENTRY_CODE(Sp[-1]));
FE_
}
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();