[project @ 2001-09-04 18:29:20 by ken]

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

diff --git a/ghc/rts/StgStartup.hc b/ghc/rts/StgStartup.hc
index c927de9..92dc701 100644 (file)
--- a/ghc/rts/StgStartup.hc
+++ b/ghc/rts/StgStartup.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgStartup.hc,v 1.11 2000/04/03 16:28:08 simonmar Exp $
+ * $Id: StgStartup.hc,v 1.16 2001/09/04 18:29:21 ken Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,6 +7,7 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "Stg.h"
 #include "Rts.h"
 #include "StgRun.h" /* StgReturn */
 #include "StgStartup.h"
@@ -76,12 +77,15 @@ STGFUN(stg_stop_thread_entry)
      * tidy up the registers and return to the scheduler.
     */
 
-    /* Move Su just off the end of the stack, we're about to spam the
-     * STOP_FRAME with the return value.
+    /* Move Sp to the last word on the stack, and Su to just past the end
+     * of the stack.  We then place the return value at the top of the stack.
      */
+    Sp += sizeofW(StgStopFrame) - 1;
     Su = (StgUpdateFrame *)(Sp+1);  
     Sp[0] = R1.w;
 
+    CurrentTSO->what_next = ThreadComplete;
+
     SaveThreadState(); /* inline! */
 
     /* R1 contains the return value of the thread */
@@ -131,12 +135,10 @@ STGFUN(stg_enterStackTop)
    Special STG entry points for module registration.
 
    This stuff is problematic for Hugs, because it introduces a
-   dependency between the RTS and the program (ie. __init_PrelMain).  So
+   dependency between the RTS and the program (ie. __stginit_PrelMain).  So
    we currently disable module initialisation for Hugs.
    -------------------------------------------------------------------------- */
 
-#ifndef INTERPRETER 
-
 extern F_ *init_stack;
 
 STGFUN(stg_init_ret)
@@ -148,7 +150,7 @@ STGFUN(stg_init_ret)
 
 /* On entry to stg_init:
  *    init_stack[0] = &stg_init_ret;
- *    init_stack[1] = __init_Something;
+ *    init_stack[1] = __stginit_Something;
  */
 STGFUN(stg_init)
 {
@@ -160,7 +162,5 @@ STGFUN(stg_init)
 
 /* PrelGHC doesn't really exist... */
 
-START_MOD_INIT(__init_PrelGHC);
+START_MOD_INIT(__stginit_PrelGHC);
 END_MOD_INIT();
-
-#endif /* !INTERPRETER */