X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FUpdates.hc;h=45e00debe90ecd9c17c274c000a963626be95c3e;hb=491f66f835964bbcfa8f7acf46bc2bd1443be679;hp=5c64e4d6a24ac2dfbb380d6fcb15720809370a1d;hpb=47a40c89ca2e588b62d986a58907e178bce1de4f;p=ghc-hetmet.git

diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc
index 5c64e4d..45e00de 100644
--- a/ghc/rts/Updates.hc
+++ b/ghc/rts/Updates.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Updates.hc,v 1.18 1999/07/06 16:40:28 sewardj Exp $
+ * $Id: Updates.hc,v 1.37 2001/11/28 14:29:33 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,12 +7,14 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "Stg.h"
 #include "Rts.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
-#include "HeapStackCheck.h"
 #include "Storage.h"
-#include "ProfRts.h"
+#if defined(GRAN) || defined(PAR)
+# include "FetchMe.h"
+#endif
 
 /*
   The update frame return address must be *polymorphic*, that means
@@ -46,19 +48,21 @@
    update code. 
    */
 
+#if defined(REG_Su)
 #define UPD_FRAME_ENTRY_TEMPLATE(label,ret)				\
         STGFUN(label);							\
 	STGFUN(label)							\
 	{								\
-          StgClosure *updatee;						\
 	  FB_								\
-	  /* tick - ToDo: check this is right */			\
-	  TICK_UPD_EXISTING();						\
 									\
-          updatee = ((StgUpdateFrame *)Sp)->updatee;			\
-						\
-	  /* update the updatee with an indirection to the return value */\
-	  UPD_IND(updatee,R1.p);					\
+          Su = (StgUpdateFrame *)((StgUpdateFrame *)Sp)->updatee;	\
+									\
+	  /* Tick - it must be a con, all the paps are handled		\
+	   * in stg_upd_PAP and PAP_entry below				\
+	   */								\
+	  TICK_UPD_CON_IN_NEW(sizeW_fromITBL(get_itbl(Su)));		\
+									\
+ 	  UPD_IND(Su,R1.p);						\
 									\
 	  /* reset Su to the next update frame */			\
 	  Su = ((StgUpdateFrame *)Sp)->link;				\
@@ -69,48 +73,52 @@
 	  JMP_(ret);							\
 	  FE_								\
 	}
+#else
 
-//UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_entry,ENTRY_CODE(Sp[0]));
-        STGFUN(Upd_frame_entry);							
-	STGFUN(Upd_frame_entry)							
-	{								
-          StgClosure *updatee;						
-	  FB_								
-	  /* tick - ToDo: check this is right */			
-	  TICK_UPD_EXISTING();						
-									
-          updatee = ((StgUpdateFrame *)Sp)->updatee;			
-						
-	  /* update the updatee with an indirection to the return value */
-	  UPD_IND(updatee,R1.p);					
-									
-	  /* reset Su to the next update frame */			
-	  Su = ((StgUpdateFrame *)Sp)->link;				
-									
-	  /* remove the update frame from the stack */			
-	  Sp += sizeofW(StgUpdateFrame);				
-									
-	  JMP_(ENTRY_CODE(Sp[0]));							
-	  FE_								
+#define UPD_FRAME_ENTRY_TEMPLATE(label,ret)				\
+        STGFUN(label);							\
+	STGFUN(label)							\
+	{								\
+          StgClosure *updatee;						\
+	  FB_								\
+									\
+          updatee = ((StgUpdateFrame *)Sp)->updatee;			\
+									\
+	  /* Tick - it must be a con, all the paps are handled		\
+	   * in stg_upd_PAP and PAP_entry below				\
+	   */								\
+	  TICK_UPD_CON_IN_NEW(sizeW_fromITBL(get_itbl(updatee)));	\
+									\
+	  UPD_IND(updatee, R1.cl);					\
+									\
+	  /* reset Su to the next update frame */			\
+	  Su = ((StgUpdateFrame *)Sp)->link;				\
+									\
+	  /* remove the update frame from the stack */			\
+	  Sp += sizeofW(StgUpdateFrame);				\
+									\
+	  JMP_(ret);							\
+	  FE_								\
 	}
+#endif
 
-
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_0_entry,RET_VEC(Sp[0],0));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_1_entry,RET_VEC(Sp[0],1));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_2_entry,RET_VEC(Sp[0],2));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_3_entry,RET_VEC(Sp[0],3));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_4_entry,RET_VEC(Sp[0],4));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_5_entry,RET_VEC(Sp[0],5));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_6_entry,RET_VEC(Sp[0],6));
-UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_7_entry,RET_VEC(Sp[0],7));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_entry,ENTRY_CODE(Sp[0]));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_0_entry,RET_VEC(Sp[0],0));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_1_entry,RET_VEC(Sp[0],1));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_2_entry,RET_VEC(Sp[0],2));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_3_entry,RET_VEC(Sp[0],3));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_4_entry,RET_VEC(Sp[0],4));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_5_entry,RET_VEC(Sp[0],5));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_6_entry,RET_VEC(Sp[0],6));
+UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_7_entry,RET_VEC(Sp[0],7));
 
 /*
   Make sure this table is big enough to handle the maximum vectored
   return size!
   */
 
-#ifdef PROFILING
-#define UPD_FRAME_BITMAP 3
+#if defined(PROFILING)
+#define UPD_FRAME_BITMAP 7
 #else
 #define UPD_FRAME_BITMAP 1
 #endif
@@ -120,7 +128,7 @@ UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_7_entry,RET_VEC(Sp[0],7));
  * there's a cost-centre-stack in there too).
  */
 
-VEC_POLY_INFO_TABLE(Upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, UPDATE_FRAME,, EF_);
+VEC_POLY_INFO_TABLE(stg_upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, UPDATE_FRAME,, EF_);
 
 /* -----------------------------------------------------------------------------
    Entry Code for a PAP.
@@ -134,8 +142,8 @@ VEC_POLY_INFO_TABLE(Upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*sr
    really an optimisation? --SDM)
    -------------------------------------------------------------------------- */
 
-INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,,EF_,0,0);
-STGFUN(PAP_entry)
+INFO_TABLE(stg_PAP_info,stg_PAP_entry,/*special layout*/0,0,PAP,,EF_,"PAP","PAP");
+STGFUN(stg_PAP_entry)
 {
   nat Words;
   P_ p;
@@ -199,6 +207,7 @@ STGFUN(PAP_entry)
   Sp -= Words;
 
   TICK_ENT_PAP(pap);
+  LDV_ENTER(pap);
 
   /* Enter PAP cost centre -- lexical scoping only */
   ENTER_CCS_PAP_CL(pap);
@@ -221,7 +230,7 @@ STGFUN(PAP_entry)
    This function is called whenever an argument satisfaction check fails.
    -------------------------------------------------------------------------- */
 
-EXTFUN(stg_update_PAP)
+EXTFUN(__stg_update_PAP)
 {
   nat Words, PapSize;
 #ifdef PROFILING
@@ -239,11 +248,6 @@ EXTFUN(stg_update_PAP)
      */
     Fun = R1.cl;
 
-#if defined(GRAN_COUNT)
-#error Fixme.
-      ++nPAPs;
-#endif
-
     /* Just copy the whole block of stack between the stack pointer
      * and the update frame pointer.
      */
@@ -283,26 +287,25 @@ EXTFUN(stg_update_PAP)
 	 * such as removing the update frame.
 	 */
 	if ((Hp += PapSize) > HpLim) {
+	  HpAlloc = PapSize;
 	  Sp -= 1;
 	  Sp[0] = (W_)Fun;	    
 	  JMP_(stg_gc_entertop);
 	}
 
 	TICK_ALLOC_UPD_PAP(1/*fun*/ + Words, 0);
-#ifdef PROFILING
 	CCS_ALLOC(CCS_pap, PapSize);
-#endif
 
 	PapClosure = (StgPAP *)(Hp + 1 - PapSize); /* The new PapClosure */
 
-	SET_HDR(PapClosure,&PAP_info,CCS_pap);
+	SET_HDR(PapClosure,&stg_PAP_info,CCS_pap);
 	PapClosure->n_args = Words;
 	PapClosure->fun = Fun;
 
 	/* Now fill in the closure fields */
 
 	p = Hp;
-        for (i = Words-1; i >= 0; i--) {
+        for (i = Words; --i >= 0; ) {
 	   *p-- = (W_) Sp[i];
 	}
     }
@@ -348,7 +351,7 @@ EXTFUN(stg_update_PAP)
       
       Updatee = Su->updatee; 
 
-#if defined(PROFILING)
+#if defined(PROFILING) 
       if (Words != 0) {
         UPD_IND(Updatee,PapClosure);
 	TICK_UPD_PAP_IN_NEW(Words+1);
@@ -380,7 +383,7 @@ EXTFUN(stg_update_PAP)
       /* 
        * Squeeze out update frame from stack.
        */
-      for (i = Words-1; i >= 0; i--) {
+      for (i = Words; --i >= 0; ) {
 	Sp[i+(sizeofW(StgUpdateFrame))] = Sp[i];
       }
       Sp += sizeofW(StgUpdateFrame);
@@ -410,8 +413,8 @@ EXTFUN(stg_update_PAP)
    -------------------------------------------------------------------------- */
 
 
-INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,0,0);
-STGFUN(AP_UPD_entry)
+INFO_TABLE(stg_AP_UPD_info,stg_AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,"AP_UPD","AP_UPD");
+STGFUN(stg_AP_UPD_entry)
 {
   nat Words;
   P_ p;
@@ -427,12 +430,13 @@ STGFUN(AP_UPD_entry)
   /* 
    * Check for stack overflow.
    */
-  STK_CHK(Words+sizeofW(StgUpdateFrame),AP_UPD_entry,R2.p,1,);
+  STK_CHK_GEN(Words+sizeofW(StgUpdateFrame), R1_PTR, stg_AP_UPD_entry, );
 
   PUSH_UPD_FRAME(R1.p, 0);
   Sp -= sizeofW(StgUpdateFrame) + Words;
 
   TICK_ENT_AP_UPD(ap);
+  LDV_ENTER(ap);
 
   /* Enter PAP cost centre -- lexical scoping only */
   ENTER_CCS_PAP_CL(ap);   /* ToDo: ENTER_CC_AP_UPD_CL */
@@ -475,17 +479,17 @@ STGFUN(AP_UPD_entry)
       FE_					\
    }
 
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_entry,  ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_0_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_1_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_2_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_3_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_4_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_5_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_6_entry,ENTRY_CODE(Sp[0]));
-SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_7_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_entry,  ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_0_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_1_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_2_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_3_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_4_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_5_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_6_entry,ENTRY_CODE(Sp[0]));
+SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_7_entry,ENTRY_CODE(Sp[0]));
 
-VEC_POLY_INFO_TABLE(seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FRAME,, EF_);
+VEC_POLY_INFO_TABLE(stg_seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FRAME,, EF_);
 
 /* -----------------------------------------------------------------------------
  * The seq infotable
@@ -498,179 +502,14 @@ VEC_POLY_INFO_TABLE(seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*s
  * It is used in deleteThread when reverting blackholes.
  * -------------------------------------------------------------------------- */
 
-INFO_TABLE(seq_info,seq_entry,1,0,FUN,,EF_,0,0);
-STGFUN(seq_entry)
+INFO_TABLE(stg_seq_info,stg_seq_entry,1,0,FUN,,EF_,0,0);
+STGFUN(stg_seq_entry)
 {
   FB_
-  STK_CHK_GEN(sizeofW(StgSeqFrame), NO_PTRS, seq_entry, );
+  STK_CHK_GEN(sizeofW(StgSeqFrame), NO_PTRS, stg_seq_entry, );
   Sp -= sizeofW(StgSeqFrame);
   PUSH_SEQ_FRAME(Sp);
   R1.cl = R1.cl->payload[0];
   JMP_(ENTRY_CODE(*R1.p));         
   FE_
 }
-
-
-/* -----------------------------------------------------------------------------
-   Exception Primitives
-   -------------------------------------------------------------------------- */
-
-FN_(catchzh_fast);
-FN_(raisezh_fast);
-
-#define CATCH_FRAME_ENTRY_TEMPLATE(label,ret) 	\
-   FN_(label);					\
-   FN_(label)					\
-   {						\
-      FB_					\
-      Su = ((StgCatchFrame *)Sp)->link;		\
-      Sp += sizeofW(StgCatchFrame);		\
-      JMP_(ret);				\
-      FE_					\
-   }
-
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_entry,ENTRY_CODE(Sp[0]));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_0_entry,RET_VEC(Sp[0],0));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_1_entry,RET_VEC(Sp[0],1));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_2_entry,RET_VEC(Sp[0],2));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_3_entry,RET_VEC(Sp[0],3));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_4_entry,RET_VEC(Sp[0],4));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_5_entry,RET_VEC(Sp[0],5));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_6_entry,RET_VEC(Sp[0],6));
-CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_7_entry,RET_VEC(Sp[0],7));
-
-#ifdef PROFILING
-#define CATCH_FRAME_BITMAP 3
-#else
-#define CATCH_FRAME_BITMAP 1
-#endif
-
-/* Catch frames are very similar to update frames, but when entering
- * one we just pop the frame off the stack and perform the correct
- * kind of return to the activation record underneath us on the stack.
- */
-
-VEC_POLY_INFO_TABLE(catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, CATCH_FRAME,, EF_);
-
-/* -----------------------------------------------------------------------------
- * The catch infotable
- *
- * This should be exactly the same as would be generated by this STG code
- *
- * catch = {x,h} \n {} -> catch#{x,h}
- *
- * It is used in deleteThread when reverting blackholes.
- * -------------------------------------------------------------------------- */
-
-INFO_TABLE(catch_info,catch_entry,2,0,FUN,,EF_,0,0);
-STGFUN(catch_entry)
-{
-  FB_
-  R2.cl = payloadCPtr(R1.cl,1); /* h */
-  R1.cl = payloadCPtr(R1.cl,0); /* x */
-  JMP_(catchzh_fast);
-  FE_
-}
-
-FN_(catchzh_fast)
-{
-  StgCatchFrame *fp;
-  FB_
-
-    /* args: R1 = m, R2 = k */
-    STK_CHK_GEN(sizeofW(StgCatchFrame), R1_PTR | R2_PTR, catchzh_fast, );
-    Sp -= sizeofW(StgCatchFrame);
-    fp = (StgCatchFrame *)Sp;
-    SET_HDR(fp,(StgInfoTable *)&catch_frame_info,CCCS);
-    fp -> handler = R2.cl;
-    fp -> link = Su;
-    Su = (StgUpdateFrame *)fp;
-    TICK_CATCHF_PUSHED();
-    TICK_ENT_VIA_NODE();
-    JMP_(ENTRY_CODE(*R1.p));         
-    
-  FE_
-}      
-
-/* -----------------------------------------------------------------------------
- * The raise infotable
- * 
- * This should be exactly the same as would be generated by this STG code
- *
- *   raise = {err} \n {} -> raise#{err}
- *
- * It is used in raisezh_fast to update thunks on the update list
- * -------------------------------------------------------------------------- */
-
-INFO_TABLE(raise_info,raise_entry,1,0,FUN,,EF_,0,0);
-STGFUN(raise_entry)
-{
-  FB_
-  R1.cl = R1.cl->payload[0];
-  JMP_(raisezh_fast);
-  FE_
-}
-
-FN_(raisezh_fast)
-{
-  StgClosure *handler;
-  StgUpdateFrame *p;
-  StgClosure *raise_closure;
-  FB_
-    /* args : R1 = error */
-
-    p = Su;
-
-    /* This closure represents the expression 'raise# E' where E
-     * is the exception raise.  It is used to overwrite all the
-     * thunks which are currently under evaluataion.
-     */
-    raise_closure = (StgClosure *)RET_STGCALL1(P_,allocate,
-					       sizeofW(StgClosure)+1);
-    raise_closure->header.info = &raise_info;
-    raise_closure->payload[0] = R1.cl;
-
-    while (1) {
-
-      switch (get_itbl(p)->type) {
-
-      case UPDATE_FRAME:
-	UPD_IND(p->updatee,raise_closure);
-	p = p->link;
-	continue;
-
-      case SEQ_FRAME:
-	p = ((StgSeqFrame *)p)->link;
-	continue;
-
-      case CATCH_FRAME:
-	/* found it! */
-	break;
-
-      case STOP_FRAME:
-	barf("raisezh_fast: STOP_FRAME");
-
-      default:
-	barf("raisezh_fast: weird activation record");
-      }
-      
-      break;
-
-    }
-    
-    /* Ok, p points to the enclosing CATCH_FRAME.  Pop everything down to
-     * and including this frame, update Su, push R1, and enter the handler.
-     */
-    Su = ((StgCatchFrame *)p)->link; 
-    handler = ((StgCatchFrame *)p)->handler;
-    
-    Sp = (P_)p + sizeofW(StgCatchFrame) - 1;
-    *Sp = R1.w;
-
-    TICK_ENT_VIA_NODE();
-    R1.cl = handler;
-    JMP_(ENTRY_CODE(handler->header.info));
-    
-  FE_
-}
-