[project @ 1999-10-13 16:39:10 by simonmar]

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

diff --git a/ghc/rts/HeapStackCheck.hc b/ghc/rts/HeapStackCheck.hc
index 2861372..8f66e92 100644 (file)
--- a/ghc/rts/HeapStackCheck.hc
+++ b/ghc/rts/HeapStackCheck.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: HeapStackCheck.hc,v 1.5 1999/03/17 13:19:21 simonm Exp $
+ * $Id: HeapStackCheck.hc,v 1.9 1999/08/25 16:11:48 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -293,11 +293,28 @@ EXTFUN(stg_gc_seq_1)
    cases are covered below.
    -------------------------------------------------------------------------- */
 
-/*-- No regsiters live, return address already on the stack: ---------------- */
+/*-- No regsiters live (probably a void return) ----------------------------- */
+
+/* If we change the policy for thread startup to *not* remove the
+ * return address from the stack, we can get rid of this little
+ * function/info table...  
+ */
+INFO_TABLE_SRT_BITMAP(stg_gc_noregs_ret_info, stg_gc_noregs_ret, 0/*BITMAP*/, 
+                     0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
+                     RET_SMALL,, EF_, 0, 0);
+
+EXTFUN(stg_gc_noregs_ret)
+{
+  FB_
+  JMP_(ENTRY_CODE(Sp[0]));
+  FE_
+}
 
 EXTFUN(stg_gc_noregs)
 {
   FB_
+  Sp -= 1;
+  Sp[0] = (W_)&stg_gc_noregs_ret_info;
   GC_GENERIC
   FE_
 }
@@ -306,7 +323,7 @@ EXTFUN(stg_gc_noregs)
 
 INFO_TABLE_SRT_BITMAP(stg_gc_unpt_r1_info, stg_gc_unpt_r1_entry, 0/*BITMAP*/, 
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
+                     RET_SMALL,, EF_, 0, 0);
 
 EXTFUN(stg_gc_unpt_r1_entry)
 {
@@ -331,7 +348,7 @@ EXTFUN(stg_gc_unpt_r1)
 
 INFO_TABLE_SRT_BITMAP(stg_gc_unbx_r1_info, stg_gc_unbx_r1_entry, 1/*BITMAP*/,
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
+                     RET_SMALL,, EF_, 0, 0);
 /* the 1 is a bitmap - i.e. 1 non-pointer word on the stack. */
 
 EXTFUN(stg_gc_unbx_r1_entry)
@@ -357,7 +374,7 @@ EXTFUN(stg_gc_unbx_r1)
 
 INFO_TABLE_SRT_BITMAP(stg_gc_f1_info, stg_gc_f1_entry, 1/*BITMAP*/,
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
+                     RET_SMALL,, EF_, 0, 0);
 
 EXTFUN(stg_gc_f1_entry)
 {
@@ -390,7 +407,7 @@ EXTFUN(stg_gc_f1)
 
 INFO_TABLE_SRT_BITMAP(stg_gc_d1_info, stg_gc_d1_entry, DBL_BITMAP,
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
+                     RET_SMALL,, EF_, 0, 0);
 
 EXTFUN(stg_gc_d1_entry)
 {
@@ -443,14 +460,14 @@ EXTFUN(stg_gc_d1)
 
 INFO_TABLE_SRT_BITMAP(stg_gc_ut_1_0_info, stg_gc_ut_1_0_entry, 1/*BITMAP*/, 
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
+                     RET_SMALL,, EF_, 0, 0);
 
 EXTFUN(stg_gc_ut_1_0_entry)
 {
   FB_
   R1.w = Sp[1];
   Sp += 2;
-  JMP_(Sp[-2]);
+  JMP_(ENTRY_CODE(Sp[-2]));
   FE_
 }
 
@@ -469,14 +486,14 @@ EXTFUN(stg_gc_ut_1_0)
 
 INFO_TABLE_SRT_BITMAP(stg_gc_ut_0_1_info, stg_gc_ut_0_1_entry, 3/*BITMAP*/, 
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
+                     RET_SMALL,, EF_, 0, 0);
 
 EXTFUN(stg_gc_ut_0_1_entry)
 {
   FB_
   R1.w = Sp[1];
   Sp += 2;
-  JMP_(Sp[-2]);
+  JMP_(ENTRY_CODE(Sp[-2]));
   FE_
 }
 
@@ -764,7 +781,7 @@ EXTFUN(stg_chk_8)
 
 INFO_TABLE_SRT_BITMAP(stg_gen_chk_info, stg_gen_chk_ret, 0,
                      0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_DYN, const, EF_, 0, 0);
+                     RET_DYN,, EF_, 0, 0);
 
 /* bitmap in the above info table is unused, the real one is on the stack. 
  */
@@ -773,7 +790,7 @@ FN_(stg_gen_chk_ret)
 {
   FB_
   RESTORE_EVERYTHING;
-  JMP_(Sp[RET_OFFSET]);
+  JMP_(Sp[RET_OFFSET]); /* NO ENTRY_CODE() - this is a direct ret address */
   FE_
 }
 
@@ -810,22 +827,11 @@ FN_(stg_gen_yield)
   FE_
 }
 
-INFO_TABLE_SRT_BITMAP(stg_yield_noregs_info, stg_yield_noregs_ret, 0/*BITMAP*/, 
-                     0/*SRT*/, 0/*SRT_OFF*/, 0/*SRT_LEN*/, 
-                     RET_SMALL, const, EF_, 0, 0);
-
-FN_(stg_yield_noregs_ret)
-{
-  FB_
-  JMP_(ENTRY_CODE(Sp[0]))
-  FE_
-}
-
 FN_(stg_yield_noregs)
 {
   FB_
   Sp--;
-  Sp[0] = (W_)&stg_yield_noregs_info;
+  Sp[0] = (W_)&stg_gc_noregs_ret_info;
   YIELD_GENERIC;
   FE_
 }
@@ -850,6 +856,15 @@ FN_(stg_gen_block)
   FE_
 }
 
+FN_(stg_block_noregs)
+{
+  FB_
+  Sp--;
+  Sp[0] = (W_)&stg_gc_noregs_ret_info;
+  BLOCK_GENERIC;
+  FE_
+}
+
 FN_(stg_block_1)
 {
   FB_