From: daan <unknown>
Date: Mon, 9 Oct 2000 10:28:33 +0000 (+0000)
Subject: [project @ 2000-10-09 10:28:33 by daan]
X-Git-Tag: Approximately_9120_patches~3667
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7458bdc24aab51bcd904c8dd49710d619964805e;p=ghc-hetmet.git

[project @ 2000-10-09 10:28:33 by daan]
removed references to 'splim' in code for the INTERPRETER.
---

diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c
index d03f683..c7e91da 100644
--- a/ghc/rts/Evaluator.c
+++ b/ghc/rts/Evaluator.c
@@ -5,8 +5,8 @@
  * Copyright (c) 1994-1998.
  *
  * $RCSfile: Evaluator.c,v $
- * $Revision: 1.56 $
- * $Date: 2000/06/23 12:09:00 $
+ * $Revision: 1.57 $
+ * $Date: 2000/10/09 10:28:33 $
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
@@ -181,7 +181,6 @@ void      SloppifyIntegerEnd ( StgPtr );
 	   SSS;							\
            cap->rCurrentTSO->sp    = gSp;			\
            cap->rCurrentTSO->su    = gSu;			\
-           cap->rCurrentTSO->splim = gSpLim;			\
            return retVal;					\
         }
 
@@ -315,7 +314,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 )
 
     gSp    = cap->rCurrentTSO->sp;
     gSu    = cap->rCurrentTSO->su;
-    gSpLim = cap->rCurrentTSO->splim;
+    gSpLim = cap->rCurrentTSO->stack + RESERVED_STACK_WORDS;
 
 #ifdef DEBUG
     /* use the t values to check that Su/Sp/SpLim do not change unexpectedly */
@@ -374,7 +373,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 )
 	   cap->rCurrentTSO->why_blocked = BlockedOnDelay;
 	   ACQUIRE_LOCK(&sched_mutex);
 	   
-#if defined(HAVE_SETITIMER) || defined(mingw32_TARGET_OS)
+#if defined(HAVE_SETITIMER) /* || defined(mingw32_TARGET_OS) */
 	   cap->rCurrentTSO->block_info.delay
 	     = hugsBlock.delay + ticks_since_select;
 #else
@@ -1357,7 +1356,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 )
             Case(i_VAR_WORD_big):
             Case(i_RETADDR_big):
             Case(i_ALLOC_PAP):
-
+#ifndef XMLAMBDA
             Case(i_UNPACK_INJ):
             Case(i_UNPACK_ROW):
             Case(i_TEST_INJ_CONST):
@@ -1370,7 +1369,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 )
             Case(i_PACK_ROW):
             Case(i_ALLOC_ROW_big):
             Case(i_ALLOC_ROW):
-
+#endif
                     bciPtr--;
                     printf ( "\n\n" );
                     disInstr ( bco, PC );
diff --git a/ghc/rts/ForeignCall.c b/ghc/rts/ForeignCall.c
index 5b1a0c6..7dc5661 100644
--- a/ghc/rts/ForeignCall.c
+++ b/ghc/rts/ForeignCall.c
@@ -1,6 +1,6 @@
 
 /* -----------------------------------------------------------------------------
- * $Id: ForeignCall.c,v 1.18 2000/08/07 23:37:23 qrczak Exp $
+ * $Id: ForeignCall.c,v 1.19 2000/10/09 10:28:33 daan Exp $
  *
  * (c) The GHC Team 1994-1999.
  *
@@ -317,7 +317,6 @@ int ccall ( CFunDescriptor*  d,
    PushPtr((StgPtr)(*bco));
    cap->rCurrentTSO->sp    = MainRegTable.rSp;
    cap->rCurrentTSO->su    = MainRegTable.rSu;
-   cap->rCurrentTSO->splim = MainRegTable.rSpLim;
    token = suspendThread(cap);
 
 #if i386_TARGET_ARCH
@@ -336,7 +335,6 @@ int ccall ( CFunDescriptor*  d,
    cap = resumeThread(token);
    MainRegTable.rSp    = cap->rCurrentTSO->sp;
    MainRegTable.rSu    = cap->rCurrentTSO->su;
-   MainRegTable.rSpLim = cap->rCurrentTSO->splim;
    *bco=(StgBCO*)PopPtr();
 
    /* INT, WORD, ADDR, STABLE don't need to do a word-size check