X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FScav.c;h=00faff1d84cf88d36e1c752bcae89d6892eaa678;hb=0981e24e9980b8b26e6f20fc56bebc1c7416cc4f;hp=dce83ede026c7a74412cae1b63f329f06f918852;hpb=cb3cb473854e815784375ad23cc5081621a95ce8;p=ghc-hetmet.git

diff --git a/rts/sm/Scav.c b/rts/sm/Scav.c
index dce83ed..00faff1 100644
--- a/rts/sm/Scav.c
+++ b/rts/sm/Scav.c
@@ -4,6 +4,11 @@
  *
  * Generational garbage collector: scavenging functions
  *
+ * Documentation on the architecture of the Garbage Collector can be
+ * found in the online commentary:
+ * 
+ *   http://hackage.haskell.org/trac/ghc/wiki/Commentary/Rts/Storage/GC
+ *
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
@@ -72,7 +77,7 @@ scavenge_srt (StgClosure **srt, nat srt_bitmap)
 
   while (bitmap != 0) {
       if ((bitmap & 1) != 0) {
-#ifdef ENABLE_WIN32_DLL_SUPPORT
+#if defined(__PIC__) && defined(mingw32_TARGET_OS)
 	  // Special-case to handle references to closures hiding out in DLLs, since
 	  // double indirections required to get at those. The code generator knows
 	  // which is which when generating the SRT, so it stores the (indirect)
@@ -195,7 +200,7 @@ scavenge_PAP_payload (StgClosure *fun, StgClosure **payload, StgWord size)
     StgWord bitmap;
     StgFunInfoTable *fun_info;
     
-    fun_info = get_fun_itbl(fun);
+    fun_info = get_fun_itbl(UNTAG_CLOSURE(fun));
     ASSERT(fun_info->i.type != PAP);
     p = (StgPtr)payload;
 
@@ -406,7 +411,6 @@ scavenge(step *stp)
 	bco->instrs = (StgArrWords *)evacuate((StgClosure *)bco->instrs);
 	bco->literals = (StgArrWords *)evacuate((StgClosure *)bco->literals);
 	bco->ptrs = (StgMutArrPtrs *)evacuate((StgClosure *)bco->ptrs);
-	bco->itbls = (StgArrWords *)evacuate((StgClosure *)bco->itbls);
 	p += bco_sizeW(bco);
 	break;
     }
@@ -787,7 +791,6 @@ linear_scan:
 	    bco->instrs = (StgArrWords *)evacuate((StgClosure *)bco->instrs);
 	    bco->literals = (StgArrWords *)evacuate((StgClosure *)bco->literals);
 	    bco->ptrs = (StgMutArrPtrs *)evacuate((StgClosure *)bco->ptrs);
-	    bco->itbls = (StgArrWords *)evacuate((StgClosure *)bco->itbls);
 	    break;
 	}
 
@@ -1646,7 +1649,6 @@ scavenge_stack(StgPtr p, StgPtr stack_end)
     case STOP_FRAME:
     case CATCH_FRAME:
     case RET_SMALL:
-    case RET_VEC_SMALL:
 	bitmap = BITMAP_BITS(info->i.layout.bitmap);
 	size   = BITMAP_SIZE(info->i.layout.bitmap);
 	// NOTE: the payload starts immediately after the info-ptr, we
@@ -1675,7 +1677,6 @@ scavenge_stack(StgPtr p, StgPtr stack_end)
 
       // large bitmap (> 32 entries, or > 64 on a 64-bit machine) 
     case RET_BIG:
-    case RET_VEC_BIG:
     {
 	nat size;
 
@@ -1719,7 +1720,7 @@ scavenge_stack(StgPtr p, StgPtr stack_end)
 	StgFunInfoTable *fun_info;
 
 	ret_fun->fun = evacuate(ret_fun->fun);
- 	fun_info = get_fun_itbl(ret_fun->fun);
+ 	fun_info = get_fun_itbl(UNTAG_CLOSURE(ret_fun->fun));
 	p = scavenge_arg_block(fun_info, ret_fun->payload);
 	goto follow_srt;
     }