diff --git a/mps/code/arena.c b/mps/code/arena.c index 3f90ba55223..94c72dd336f 100644 --- a/mps/code/arena.c +++ b/mps/code/arena.c @@ -343,8 +343,13 @@ Res ArenaDescribe(Arena arena, mps_lib_FILE *stream) res = (*arena->class->describe)(arena, stream); if (res != ResOK) return res; + /* Do not call GlobalsDescribe: it makes too much output, thanks. + * RHSK 2007-04-27 + * res = GlobalsDescribe(ArenaGlobals(arena), stream); if (res != ResOK) return res; + * + */ res = WriteF(stream, "} Arena $P ($U)\n", (WriteFP)arena, diff --git a/mps/code/arenavm.c b/mps/code/arenavm.c index 1e1515150ee..3e0723ad3ac 100644 --- a/mps/code/arenavm.c +++ b/mps/code/arenavm.c @@ -214,10 +214,19 @@ static Res VMArenaDescribe(Arena arena, mps_lib_FILE *stream) * */ - res = WriteF(stream, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n", NULL); + AVER(3 < VMArenaGenCount); + res = WriteF(stream, + " blacklist: $B\n", (WriteFB)vmArena->blacklist, + " genZoneSet[0]: $B\n", (WriteFB)vmArena->genZoneSet[0], + " genZoneSet[1]: $B\n", (WriteFB)vmArena->genZoneSet[1], + " genZoneSet[2]: $B\n", (WriteFB)vmArena->genZoneSet[2], + " genZoneSet[3]: $B\n", (WriteFB)vmArena->genZoneSet[3], + " freeSet: $B\n", (WriteFB)vmArena->freeSet, + NULL + ); if (res != ResOK) return res; - /* @@@@ INCOMPLETE @@@@ */ + /* (incomplete: some fields are not Described) */ return ResOK; } @@ -294,7 +303,6 @@ static Res VMChunkCreate(Chunk *chunkReturn, VMArena vmArena, Size size) AVER(size > 0); DIAG_WRITEF(( DIAG_STREAM, "\n** VMChunkCreate $U\n", size, NULL )); - DIAG( ArenaDescribe(VMArena2Arena(vmArena), DIAG_STREAM); ); res = VMCreate(&vm, size);