From: simonmar <unknown>
Date: Mon, 13 Nov 2000 14:53:27 +0000 (+0000)
Subject: [project @ 2000-11-13 14:53:27 by simonmar]
X-Git-Tag: Approximately_9120_patches~3364
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=09ce0083f1d378b21e0fbb97931267d8ff2dfc52;p=ghc-hetmet.git

[project @ 2000-11-13 14:53:27 by simonmar]
merged from ghc-4-07-branch: don't save %i7 across the call.
---

diff --git a/ghc/rts/StgCRun.c b/ghc/rts/StgCRun.c
index d50bd67..129cd23 100644
--- a/ghc/rts/StgCRun.c
+++ b/ghc/rts/StgCRun.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgCRun.c,v 1.21 2000/11/13 14:40:37 simonmar Exp $
+ * $Id: StgCRun.c,v 1.22 2000/11/13 14:53:27 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -314,6 +314,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
    does the last paragraph above mean when it says "the top of the
    stack is used for globals"?  What globals?  --SDM
 
+   Updated info (GHC 4.08.2): not saving %i7 any more (see below).
    -------------------------------------------------------------------------- */
 	
 #ifdef sparc_TARGET_ARCH
@@ -321,11 +322,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
 StgThreadReturnCode
 StgRun(StgFunPtr f, StgRegTable *basereg) {
 
-    unsigned char space[RESERVED_C_STACK_BYTES];
-#if 0
-    register void *i7 __asm__("%i7");
-    ((void **)(space))[100] = i7;
-#endif
+    StgChar space[RESERVED_C_STACK_BYTES];
     f();
     __asm__ volatile (
 	    ".align 4\n"		
@@ -343,6 +340,11 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
      * assembler.
      */
 #if 0
+    /* updated 4.08.2: we don't save %i7 in the middle of the reserved
+     * space any more, since gcc tries to save its address across the
+     * call to f(), this gets clobbered in STG land and we end up
+     * dereferencing a bogus pointer in StgReturn.
+     */
     __asm__ volatile ("ld %1,%0" 
 		      : "=r" (i7) : "m" (((void **)(space))[100]));
 #endif