X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FPrinter.c;h=671d76fbf87d83463e1d4b280d25c1b943ba3122;hb=3cdb0ada5aecbcbe940bacf577c02c41bc65c629;hp=36fdf7bda4ba7831163e562144865fcc89ddeec7;hpb=f9e1c2af8fdd112019a657e66b0cd685d8df66f6;p=ghc-hetmet.git

diff --git a/rts/Printer.c b/rts/Printer.c
index 36fdf7b..671d76f 100644
--- a/rts/Printer.c
+++ b/rts/Printer.c
@@ -37,10 +37,10 @@ static void    printStdObjPayload( StgClosure *obj );
 #ifdef USING_LIBBFD
 static void    reset_table   ( int size );
 static void    prepare_table ( void );
-static void    insert        ( unsigned value, const char *name );
+static void    insert        ( StgWord value, const char *name );
 #endif
 #if 0 /* unused but might be useful sometime */
-static rtsBool lookup_name   ( char *name, unsigned *result );
+static rtsBool lookup_name   ( char *name, StgWord *result );
 static void    enZcode       ( char *in, char *out );
 #endif
 static char    unZcode       ( char ch );
@@ -133,8 +133,6 @@ printClosure( StgClosure *obj )
     case CONSTR:
     case CONSTR_1_0: case CONSTR_0_1:
     case CONSTR_1_1: case CONSTR_0_2: case CONSTR_2_0:
-    case CONSTR_INTLIKE:
-    case CONSTR_CHARLIKE:
     case CONSTR_STATIC:
     case CONSTR_NOCAF_STATIC:
         {
@@ -657,8 +655,6 @@ static char *closure_type_names[] = {
     "CONSTR_2",
     "CONSTR_1",
     "CONSTR_0",
-    "CONSTR_INTLIKE",
-    "CONSTR_CHARLIKE",
     "CONSTR_STATIC",
     "CONSTR_NOCAF_STATIC",
     "FUN",
@@ -718,7 +714,9 @@ static char *closure_type_names[] = {
     "RBH",
     "EVACUATED",
     "REMOTE_REF",
-    "TVAR_WAIT_QUEUE",
+    "TVAR_WATCH_QUEUE",
+    "INVARIANT_CHECK_QUEUE",
+    "ATOMIC_INVARIANT",
     "TVAR",
     "TREC_CHUNK",
     "TREC_HEADER",
@@ -755,7 +753,7 @@ info_hdr_type(StgClosure *closure, char *res){
  * ------------------------------------------------------------------------*/
 
 struct entry {
-    nat value;
+    StgWord value;
     const char *name;
 };
 
@@ -777,7 +775,7 @@ static void prepare_table( void )
     /* Could sort it...  */
 }
 
-static void insert( unsigned value, const char *name )
+static void insert( StgWord value, const char *name )
 {
     if ( table_size >= max_table_size ) {
         barf( "Symbol table overflow\n" );
@@ -789,9 +787,9 @@ static void insert( unsigned value, const char *name )
 #endif
 
 #if 0
-static rtsBool lookup_name( char *name, unsigned *result )
+static rtsBool lookup_name( char *name, StgWord *result )
 {
-    int i;
+    nat i;
     for( i = 0; i < table_size && strcmp(name,table[i].name) != 0; ++i ) {
     }
     if (i < table_size) {
@@ -934,7 +932,7 @@ static void enZcode( char *in, char *out )
 const char *lookupGHCName( void *addr )
 {
     nat i;
-    for( i = 0; i < table_size && table[i].value != (unsigned) addr; ++i ) {
+    for( i = 0; i < table_size && table[i].value != (StgWord) addr; ++i ) {
     }
     if (i < table_size) {
         return table[i].name;