projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for building the libraries with cabal on Windows
[ghc-hetmet.git]
/
rts
/
Printer.c
diff --git
a/rts/Printer.c
b/rts/Printer.c
index
83afd48
..
6da32fc
100644
(file)
--- a/
rts/Printer.c
+++ b/
rts/Printer.c
@@
-15,7
+15,6
@@
#include "RtsFlags.h"
#include "MBlock.h"
#include "RtsFlags.h"
#include "MBlock.h"
-#include "Storage.h"
#include "Bytecodes.h" /* for InstrPtr */
#include "Disassembler.h"
#include "Apply.h"
#include "Bytecodes.h" /* for InstrPtr */
#include "Disassembler.h"
#include "Apply.h"
@@
-37,10
+36,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 );
@@
-262,9
+261,7
@@
printClosure( StgClosure *obj )
/* Cannot happen -- use default case.
case RET_BCO:
case RET_SMALL:
/* Cannot happen -- use default case.
case RET_BCO:
case RET_SMALL:
- case RET_VEC_SMALL:
case RET_BIG:
case RET_BIG:
- case RET_VEC_BIG:
case RET_DYN:
case RET_FUN:
*/
case RET_DYN:
case RET_FUN:
*/
@@
-577,7
+574,6
@@
printStackChunk( StgPtr sp, StgPtr spBottom )
}
case RET_SMALL:
}
case RET_SMALL:
- case RET_VEC_SMALL:
debugBelch("RET_SMALL (%p)\n", info);
bitmap = info->layout.bitmap;
printSmallBitmap(spBottom, sp+1,
debugBelch("RET_SMALL (%p)\n", info);
bitmap = info->layout.bitmap;
printSmallBitmap(spBottom, sp+1,
@@
-596,7
+592,6
@@
printStackChunk( StgPtr sp, StgPtr spBottom )
}
case RET_BIG:
}
case RET_BIG:
- case RET_VEC_BIG:
barf("todo");
case RET_FUN:
barf("todo");
case RET_FUN:
@@
-683,9
+678,7
@@
static char *closure_type_names[] = {
"IND_STATIC",
"RET_BCO",
"RET_SMALL",
"IND_STATIC",
"RET_BCO",
"RET_SMALL",
- "RET_VEC_SMALL",
"RET_BIG",
"RET_BIG",
- "RET_VEC_BIG",
"RET_DYN",
"RET_FUN",
"UPDATE_FRAME",
"RET_DYN",
"RET_FUN",
"UPDATE_FRAME",
@@
-714,7
+707,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",
@@
-751,7
+746,7
@@
info_hdr_type(StgClosure *closure, char *res){
* ------------------------------------------------------------------------*/
struct entry {
* ------------------------------------------------------------------------*/
struct entry {
- nat value;
+ StgWord value;
const char *name;
};
const char *name;
};
@@
-773,7
+768,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" );
@@
-785,9
+780,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) {
@@
-930,7
+925,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;