X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FFrontPanel.c;h=a09c8cca1fe5ca28c9c20883110ca57adee0a8dc;hb=2909e6fb2223bd303e00b34d3a04466474c53f03;hp=8953711d0544afeb6cdac534608fb6588bf5d5dc;hpb=bfefff2cd373e5ef9983db1221ae0a1cf48b7f2d;p=ghc-hetmet.git

diff --git a/ghc/rts/FrontPanel.c b/ghc/rts/FrontPanel.c
index 8953711..a09c8cc 100644
--- a/ghc/rts/FrontPanel.c
+++ b/ghc/rts/FrontPanel.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: FrontPanel.c,v 1.7 2001/10/31 14:38:00 simonmar Exp $
  *
  * (c) The GHC Team 2000
  *
@@ -17,7 +16,6 @@
 #include "MBlock.h"
 #include "FrontPanel.h"
 #include "Storage.h"
-#include "StoragePriv.h"
 #include "Stats.h"
 #include "RtsFlags.h"
 #include "Schedule.h"
@@ -103,7 +101,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event STG_UNUSED,
 		      widget->allocation.width,
 		      widget->allocation.height);
 
-  fprintf(stderr, "configure!\n");
+  debugBelch("configure!\n");
   updateFrontPanel();
   return TRUE;
 }
@@ -397,11 +395,12 @@ updateFrontPanel( void )
 			    block_width, block_height, blocks_per_line );
 	    }
 	    
+#if 0 /* Segfaults because bd appears to be bogus but != NULL. stolz, 2003-06-24 */
 	    /* color each block */
 	    for (; a <= LAST_BLOCK(m); (char *)a += BLOCK_SIZE) {
 		bd = Bdescr((P_)a);
 		ASSERT(bd->start == a);
-		if (bd->free == (void *)-1) {
+                if (bd->flags & BF_FREE) {
 		    colorBlock( a, &free_color, 
 				block_width, block_height, blocks_per_line );
 		} else {
@@ -409,6 +408,7 @@ updateFrontPanel( void )
 				block_width, block_height, blocks_per_line );
 		}
 	    }
+#endif
 	}
 
 	
@@ -673,7 +673,7 @@ residencyCensus( void )
 			type = BlackHole;
 			break;
 
-		    case AP_UPD:
+		    case AP:
 			size = pap_sizeW((StgPAP *)p);
 			type = Thunk;
 			break;
@@ -700,7 +700,6 @@ residencyCensus( void )
 			break;
 			
 		    case WEAK:
-		    case FOREIGN:
 		    case STABLE_NAME:
 		    case MVAR:
 		    case MUT_VAR: