X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrinter.c;h=ca9b00890cc5b654f3cbc3a7b478d9ab8a88ea1d;hb=03a9ff01812afc81eb5236fd3063cbec44cf469e;hp=67ca6721dcbc48af5eec0437eb5f9c9e93a76647;hpb=b61f70ce5ff947642c96b1ad980351691bb1e07a;p=ghc-hetmet.git

diff --git a/ghc/rts/Printer.c b/ghc/rts/Printer.c
index 67ca672..ca9b008 100644
--- a/ghc/rts/Printer.c
+++ b/ghc/rts/Printer.c
@@ -33,7 +33,6 @@ int fixed_hs = sizeof(StgHeader), itbl_sz = sizeofW(StgInfoTable),
  * local function decls
  * ------------------------------------------------------------------------*/
 
-static void    printStdObject( StgClosure *obj, char* tag );
 static void    printStdObjPayload( StgClosure *obj );
 #ifdef USING_LIBBFD
 static void    reset_table   ( int size );
@@ -97,10 +96,27 @@ printStdObjPayload( StgClosure *obj )
 }
 
 static void
-printStdObject( StgClosure *obj, char* tag )
+printThunkPayload( StgThunk *obj )
 {
-    printStdObjHdr( obj, tag );
-    printStdObjPayload( obj );
+    StgWord i, j;
+    const StgInfoTable* info;
+
+    info = get_itbl(obj);
+    for (i = 0; i < info->layout.payload.ptrs; ++i) {
+        debugBelch(", ");
+        printPtr((StgPtr)obj->payload[i]);
+    }
+    for (j = 0; j < info->layout.payload.nptrs; ++j) {
+        debugBelch(", %pd#",obj->payload[i+j]);
+    }
+    debugBelch(")\n");
+}
+
+static void
+printThunkObject( StgThunk *obj, char* tag )
+{
+    printStdObjHdr( (StgClosure *)obj, tag );
+    printThunkPayload( obj );
 }
 
 void
@@ -122,9 +138,6 @@ printClosure( StgClosure *obj )
     case CONSTR_STATIC:
     case CONSTR_NOCAF_STATIC:
         {
-            /* We can't use printStdObject because we want to print the
-             * tag as well.
-	     */
             StgWord i, j;
 #ifdef PROFILING
 	    debugBelch("%s(", info->prof.closure_desc);
@@ -163,9 +176,9 @@ printClosure( StgClosure *obj )
     case THUNK_STATIC:
             /* ToDo: will this work for THUNK_STATIC too? */
 #ifdef PROFILING
-	    printStdObject(obj,info->prof.closure_desc);
+	    printThunkObject((StgThunk *)obj,info->prof.closure_desc);
 #else
-            printStdObject(obj,"THUNK");
+            printThunkObject((StgThunk *)obj,"THUNK");
 #endif
             break;
 
@@ -180,7 +193,7 @@ printClosure( StgClosure *obj )
 
     case AP:
         {
-	    StgPAP* ap = stgCast(StgPAP*,obj);
+	    StgAP* ap = stgCast(StgAP*,obj);
             StgWord i;
             debugBelch("AP("); printPtr((StgPtr)ap->fun);
             for (i = 0; i < ap->n_args; ++i) {
@@ -290,21 +303,13 @@ printClosure( StgClosure *obj )
         }
 
     case CAF_BLACKHOLE:
-            debugBelch("CAF_BH("); 
-            printPtr((StgPtr)stgCast(StgBlockingQueue*,obj)->blocking_queue);
-            debugBelch(")\n"); 
+            debugBelch("CAF_BH"); 
             break;
 
     case BLACKHOLE:
             debugBelch("BH\n"); 
             break;
 
-    case BLACKHOLE_BQ:
-            debugBelch("BQ("); 
-            printPtr((StgPtr)stgCast(StgBlockingQueue*,obj)->blocking_queue);
-            debugBelch(")\n"); 
-            break;
-
     case SE_BLACKHOLE:
             debugBelch("SE_BH\n"); 
             break;
@@ -322,46 +327,30 @@ printClosure( StgClosure *obj )
                 putchar(arrWordsGetChar(obj,i));
 		} */
 	    for (i=0; i<((StgArrWords *)obj)->words; i++)
-	      debugBelch("%u", ((StgArrWords *)obj)->payload[i]);
+	      debugBelch("%lu", (lnat)((StgArrWords *)obj)->payload[i]);
             debugBelch("\")\n");
             break;
         }
 
     case MUT_ARR_PTRS:
-	debugBelch("MUT_ARR_PTRS(size=%d)\n", ((StgMutArrPtrs *)obj)->ptrs);
+	debugBelch("MUT_ARR_PTRS(size=%lu)\n", (lnat)((StgMutArrPtrs *)obj)->ptrs);
 	break;
 
     case MUT_ARR_PTRS_FROZEN:
-#if !defined(XMLAMBDA)
-	debugBelch("MUT_ARR_PTRS_FROZEN(size=%d)\n", ((StgMutArrPtrs *)obj)->ptrs);
+	debugBelch("MUT_ARR_PTRS_FROZEN(size=%lu)\n", (lnat)((StgMutArrPtrs *)obj)->ptrs);
 	break;
-#else
-          {
-            /* rows are mutarrays in xmlambda, maybe we should make a new type: ROW */
-            StgWord i;
-            StgMutArrPtrs* p = stgCast(StgMutArrPtrs*,obj);
-
-            debugBelch("Row<%i>(",p->ptrs);
-            for (i = 0; i < p->ptrs; ++i) {
-                if (i > 0) debugBelch(", ");
-                printPtr((StgPtr)(p->payload[i]));
-            }
-            debugBelch(")\n");
-            break;
-          }
-#endif  
 
     case MVAR:
         {
 	  StgMVar* mv = (StgMVar*)obj;
-	  debugBelch("MVAR(head=%p, link=%p, tail=%p, value=%p)\n", mv->head, mv->mut_link, mv->tail, mv->value);
+	  debugBelch("MVAR(head=%p, tail=%p, value=%p)\n", mv->head, mv->tail, mv->value);
           break;
         }
 
     case MUT_VAR:
         {
 	  StgMutVar* mv = (StgMutVar*)obj;
-	  debugBelch("MUT_VAR(var=%p, link=%p)\n", mv->var, mv->mut_link);
+	  debugBelch("MUT_VAR(var=%p)\n", mv->var);
           break;
         }
 
@@ -375,14 +364,8 @@ printClosure( StgClosure *obj )
 	    /* ToDo: chase 'link' ? */
             break;
 
-    case FOREIGN:
-            debugBelch("FOREIGN("); 
-            printPtr((StgPtr)( ((StgForeignObj*)obj)->data ));
-            debugBelch(")\n"); 
-            break;
-
     case STABLE_NAME:
-            debugBelch("STABLE_NAME(%d)\n", ((StgStableName*)obj)->sn); 
+            debugBelch("STABLE_NAME(%lu)\n", (lnat)((StgStableName*)obj)->sn); 
             break;
 
     case TSO:
@@ -499,12 +482,12 @@ printSmallBitmap( StgPtr spBottom, StgPtr payload, StgWord bitmap, nat size )
 
     p = payload;
     for(i = 0; i < size; i++, bitmap >>= 1 ) {
-	debugBelch("   stk[%d] (%p) = ", spBottom-(payload+i), payload+i);
+	debugBelch("   stk[%ld] (%p) = ", (long)(spBottom-(payload+i)), payload+i);
 	if ((bitmap & 1) == 0) {
 	    printPtr((P_)payload[i]);
 	    debugBelch("\n");
 	} else {
-	    debugBelch("Word# %d\n", payload[i]);
+	    debugBelch("Word# %lu\n", (lnat)payload[i]);
 	}
     }
 }
@@ -520,12 +503,12 @@ printLargeBitmap( StgPtr spBottom, StgPtr payload, StgLargeBitmap* large_bitmap,
 	StgWord bitmap = large_bitmap->bitmap[bmp];
 	j = 0;
 	for(; i < size && j < BITS_IN(W_); j++, i++, bitmap >>= 1 ) {
-	    debugBelch("   stk[%d] (%p) = ", spBottom-(payload+i), payload+i);
+	    debugBelch("   stk[%lu] (%p) = ", (lnat)(spBottom-(payload+i)), payload+i);
 	    if ((bitmap & 1) == 0) {
 		printPtr((P_)payload[i]);
 		debugBelch("\n");
 	    } else {
-		debugBelch("Word# %d\n", payload[i]);
+		debugBelch("Word# %lu\n", (lnat)payload[i]);
 	    }
 	}
     }
@@ -617,8 +600,8 @@ printStackChunk( StgPtr sp, StgPtr spBottom )
 	    switch (fun_info->f.fun_type) {
 	    case ARG_GEN:
 		printSmallBitmap(spBottom, sp+1,
-				 BITMAP_BITS(fun_info->f.bitmap),
-				 BITMAP_SIZE(fun_info->f.bitmap));
+				 BITMAP_BITS(fun_info->f.b.bitmap),
+				 BITMAP_SIZE(fun_info->f.b.bitmap));
 		break;
 	    case ARG_GEN_BIG:
 		printLargeBitmap(spBottom, sp+2,
@@ -1089,11 +1072,7 @@ findPtr(P_ p, int follow)
 
   for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
       for (s = 0; s < generations[g].n_steps; s++) {
-	  if (RtsFlags.GcFlags.generations == 1) {
-	      bd = generations[g].steps[s].to_blocks;
-	  } else {
-	      bd = generations[g].steps[s].blocks;
-	  }
+	  bd = generations[g].steps[s].blocks;
 	  for (; bd; bd = bd->link) {
 	      for (q = bd->start; q < bd->free; q++) {
 		  if (*q == (W_)p) {