From: simonmar <unknown>
Date: Wed, 26 Apr 2000 13:50:27 +0000 (+0000)
Subject: [project @ 2000-04-26 13:50:27 by simonmar]
X-Git-Tag: Approximately_9120_patches~4602
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5a315231a4085284ddbdd3f786960bcf2d65c13c;p=ghc-hetmet.git

[project @ 2000-04-26 13:50:27 by simonmar]
The return value was being lost in PROFILING mode, because the
STOP_FRAME is two words instead of one.
---

diff --git a/ghc/rts/StgStartup.hc b/ghc/rts/StgStartup.hc
index 147baa0..5949c86 100644
--- a/ghc/rts/StgStartup.hc
+++ b/ghc/rts/StgStartup.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgStartup.hc,v 1.12 2000/04/26 09:44:38 simonmar Exp $
+ * $Id: StgStartup.hc,v 1.13 2000/04/26 13:50:27 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -76,9 +76,10 @@ 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;