X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FFrontPanel.c;h=92ed071465eeda67c4592794d658833092015743;hb=dcf58a64367700d80dc7609b1b55ff6a8e8b97ee;hp=34cf5d8af69ab1b9bec4d8de9bb2ddc548fc32c5;hpb=1a4ea2e4eceee09855ae7059f7f27af6b04f2b32;p=ghc-hetmet.git

diff --git a/ghc/rts/FrontPanel.c b/ghc/rts/FrontPanel.c
index 34cf5d8..92ed071 100644
--- a/ghc/rts/FrontPanel.c
+++ b/ghc/rts/FrontPanel.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: FrontPanel.c,v 1.6 2001/08/16 05:30:27 chak Exp $
+ * $Id: FrontPanel.c,v 1.10 2004/09/03 15:28:20 simonmar Exp $
  *
  * (c) The GHC Team 2000
  *
@@ -17,7 +17,6 @@
 #include "MBlock.h"
 #include "FrontPanel.h"
 #include "Storage.h"
-#include "StoragePriv.h"
 #include "Stats.h"
 #include "RtsFlags.h"
 #include "Schedule.h"
@@ -103,7 +102,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,6 +396,7 @@ 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);
@@ -409,6 +409,7 @@ updateFrontPanel( void )
 				block_width, block_height, blocks_per_line );
 		}
 	    }
+#endif
 	}
 
 	
@@ -673,7 +674,7 @@ residencyCensus( void )
 			type = BlackHole;
 			break;
 
-		    case AP_UPD:
+		    case AP:
 			size = pap_sizeW((StgPAP *)p);
 			type = Thunk;
 			break;
@@ -704,6 +705,7 @@ residencyCensus( void )
 		    case STABLE_NAME:
 		    case MVAR:
 		    case MUT_VAR:
+		    case MUT_CONS:
 		    case IND_PERM:
 		    case IND_OLDGEN_PERM:
 			size = sizeW_fromITBL(info);