summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Tennie <sven.tennie@gmail.com>2023-05-06 11:25:22 +0000
committerSven Tennie <sven.tennie@gmail.com>2023-05-06 11:25:22 +0000
commita661ec564e5bab4c0cadb1af9ba2566b9b610df3 (patch)
tree6f19c0fe8b1a8735085bdd2b23fa92693ba62bf9
parent31d6f67b093b1e2e34496e0dc71e12cfcce7efe5 (diff)
downloadhaskell-wip/decode-cloned-stack-save.tar.gz
Printer.c: Smaller diff + correct castwip/decode-cloned-stack-save
-rw-r--r--rts/Printer.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/rts/Printer.c b/rts/Printer.c
index c04993ca7e..e805902219 100644
--- a/rts/Printer.c
+++ b/rts/Printer.c
@@ -296,7 +296,20 @@ printClosure( const StgClosure *obj )
debugBelch(")\n");
break;
}
-
+
+ case ATOMICALLY_FRAME:
+ {
+ StgAtomicallyFrame* frame = (StgAtomicallyFrame*)obj;
+ debugBelch("ATOMICALLY_FRAME(");
+ printPtr((StgPtr)GET_INFO((StgClosure *)frame));
+ debugBelch(",");
+ printPtr((StgPtr)frame->code);
+ debugBelch(",");
+ printPtr((StgPtr)frame->result);
+ debugBelch(")\n");
+ break;
+ }
+
case CATCH_RETRY_FRAME:
{
StgCatchRetryFrame* frame = (StgCatchRetryFrame*)obj;
@@ -323,19 +336,6 @@ printClosure( const StgClosure *obj )
break;
}
- case ATOMICALLY_FRAME:
- {
- StgAtomicallyFrame* frame = (StgAtomicallyFrame*)obj;
- debugBelch("ATOMICALLY_FRAME(");
- printPtr((StgPtr)GET_INFO((StgClosure *)frame));
- debugBelch(",");
- printPtr((StgPtr)frame->code);
- debugBelch(",");
- printPtr((StgPtr)frame->result);
- debugBelch(")\n");
- break;
- }
-
case ARR_WORDS:
{
StgWord i;
@@ -715,17 +715,17 @@ printStackChunk( StgPtr sp, StgPtr spBottom )
debugBelch("RET_FUN (%p) (type=%d)\n", ret_fun->fun, (int)fun_info->f.fun_type);
switch (fun_info->f.fun_type) {
case ARG_GEN:
- printSmallBitmap(spBottom, &ret_fun->payload,
+ printSmallBitmap(spBottom, (StgPtr) &ret_fun->payload,
BITMAP_BITS(fun_info->f.b.bitmap),
BITMAP_SIZE(fun_info->f.b.bitmap));
break;
case ARG_GEN_BIG:
- printLargeBitmap(spBottom, &ret_fun->payload,
+ printLargeBitmap(spBottom, (StgPtr) &ret_fun->payload,
GET_FUN_LARGE_BITMAP(fun_info),
GET_FUN_LARGE_BITMAP(fun_info)->size);
break;
default:
- printSmallBitmap(spBottom, &ret_fun->payload,
+ printSmallBitmap(spBottom, (StgPtr) &ret_fun->payload,
BITMAP_BITS(stg_arg_bitmaps[fun_info->f.fun_type]),
BITMAP_SIZE(stg_arg_bitmaps[fun_info->f.fun_type]));
break;