projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a regular expression in banner_re
[ghc-hetmet.git]
/
rts
/
Printer.c
diff --git
a/rts/Printer.c
b/rts/Printer.c
index
8290d22
..
671d76f
100644
(file)
--- 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 );
#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 */
#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 );
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:
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:
{
case CONSTR_STATIC:
case CONSTR_NOCAF_STATIC:
{
@@
-381,7
+379,7
@@
printClosure( StgClosure *obj )
case TSO:
debugBelch("TSO(");
case TSO:
debugBelch("TSO(");
- debugBelch("%d (%p)",((StgTSO*)obj)->id, (StgTSO*)obj);
+ debugBelch("%lu (%p)",(unsigned long)(((StgTSO*)obj)->id), (StgTSO*)obj);
debugBelch(")\n");
break;
debugBelch(")\n");
break;
@@
-657,8
+655,6
@@
static char *closure_type_names[] = {
"CONSTR_2",
"CONSTR_1",
"CONSTR_0",
"CONSTR_2",
"CONSTR_1",
"CONSTR_0",
- "CONSTR_INTLIKE",
- "CONSTR_CHARLIKE",
"CONSTR_STATIC",
"CONSTR_NOCAF_STATIC",
"FUN",
"CONSTR_STATIC",
"CONSTR_NOCAF_STATIC",
"FUN",
@@
-718,7
+714,9
@@
static char *closure_type_names[] = {
"RBH",
"EVACUATED",
"REMOTE_REF",
"RBH",
"EVACUATED",
"REMOTE_REF",
- "TVAR_WAIT_QUEUE",
+ "TVAR_WATCH_QUEUE",
+ "INVARIANT_CHECK_QUEUE",
+ "ATOMIC_INVARIANT",
"TVAR",
"TREC_CHUNK",
"TREC_HEADER",
"TVAR",
"TREC_CHUNK",
"TREC_HEADER",
@@
-755,7
+753,7
@@
info_hdr_type(StgClosure *closure, char *res){
* ------------------------------------------------------------------------*/
struct entry {
* ------------------------------------------------------------------------*/
struct entry {
- nat value;
+ StgWord value;
const char *name;
};
const char *name;
};
@@
-777,7
+775,7
@@
static void prepare_table( void )
/* Could sort it... */
}
/* 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" );
{
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
#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) {
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;
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;
}
if (i < table_size) {
return table[i].name;