diff options
| author | Sven Tennie <sven.tennie@gmail.com> | 2020-09-23 14:54:25 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-25 21:13:19 -0400 |
| commit | 516062366ed1957e499f27dfc6b685a073a18400 (patch) | |
| tree | 2c49d8fe97a7768eb67e56dc0f22899f2a31aa8c | |
| parent | 4a1b89a40d553213c9722207608a07f8a4c07545 (diff) | |
| download | haskell-516062366ed1957e499f27dfc6b685a073a18400.tar.gz | |
Print RET_BIG stack closures
A RET_BIG closure has a large bitmap that describes it's payload and can
be printed with printLargeBitmap().
Additionally, the output for payload closures of small and big bitmaps is
changed: printObj() is used to print a bit more information about what's
on the stack.
| -rw-r--r-- | rts/Printer.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/rts/Printer.c b/rts/Printer.c index b0e583d3f2..ef9a52719b 100644 --- a/rts/Printer.c +++ b/rts/Printer.c @@ -476,7 +476,8 @@ printSmallBitmap( StgPtr spBottom, StgPtr payload, StgWord bitmap, debugBelch(" stk[%ld] (%p) = ", (long)(spBottom-(payload+i)), payload+i); if ((bitmap & 1) == 0) { printPtr((P_)payload[i]); - debugBelch("\n"); + debugBelch(" -- "); + printObj((StgClosure*) payload[i]); } else { debugBelch("Word# %" FMT_Word "\n", (W_)payload[i]); } @@ -498,7 +499,8 @@ printLargeBitmap( StgPtr spBottom, StgPtr payload, StgLargeBitmap* large_bitmap, debugBelch(" stk[%" FMT_Word "] (%p) = ", (W_)(spBottom-(payload+i)), payload+i); if ((bitmap & 1) == 0) { printPtr((P_)payload[i]); - debugBelch("\n"); + debugBelch(" -- "); + printObj((StgClosure*) payload[i]); } else { debugBelch("Word# %" FMT_Word "\n", (W_)payload[i]); } @@ -509,7 +511,6 @@ printLargeBitmap( StgPtr spBottom, StgPtr payload, StgLargeBitmap* large_bitmap, void printStackChunk( StgPtr sp, StgPtr spBottom ) { - StgWord bitmap; const StgInfoTable *info; ASSERT(sp <= spBottom); @@ -587,7 +588,7 @@ printStackChunk( StgPtr sp, StgPtr spBottom ) } else { debugBelch("RET_SMALL (%p)\n", info); } - bitmap = info->layout.bitmap; + StgWord bitmap = info->layout.bitmap; printSmallBitmap(spBottom, sp+1, BITMAP_BITS(bitmap), BITMAP_SIZE(bitmap)); continue; @@ -605,8 +606,13 @@ printStackChunk( StgPtr sp, StgPtr spBottom ) } case RET_BIG: - barf("todo"); - + debugBelch("RET_BIG (%p)\n", sp); + StgLargeBitmap* bitmap = GET_LARGE_BITMAP(info); + printLargeBitmap(spBottom, + (StgPtr)((StgClosure *) sp)->payload, + bitmap, + bitmap->size); + continue; case RET_FUN: { const StgFunInfoTable *fun_info; @@ -697,7 +703,7 @@ void printLargeAndPinnedObjects() for (uint32_t cap_idx = 0; cap_idx < n_capabilities; ++cap_idx) { Capability *cap = capabilities[cap_idx]; - debugBelch("Capability %d: Current pinned object block: %p\n", + debugBelch("Capability %d: Current pinned object block: %p\n", cap_idx, (void*)cap->pinned_object_block); for (bdescr *bd = cap->pinned_object_blocks; bd; bd = bd->link) { debugBelch("%p\n", (void*)bd); |